From xen-changelog-bounces@lists.xen.org Thu Sep 05 04:44:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 04:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQO-0005Iy-AX; Thu, 05 Sep 2013 04:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQM-0005Iq-Gv for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:06 +0000 Received: from [193.109.254.147:13623] by server-16.bemta-14.messagelabs.com id 1C/23-06264-51C08225; Thu, 05 Sep 2013 04:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378356244!945561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29884 invoked from network); 5 Sep 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 04:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQJ-0000wG-Je for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHRQJ-00027e-Dn for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:03 +0000 Date: Thu, 05 Sep 2013 04:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48 Author: John Liu AuthorDate: Mon Jul 22 22:23:10 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 11:51:31 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fdd9983..8bd1047 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -45,6 +45,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -94,7 +98,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 32e2f2e..273fe4d 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index 85ab282..444069d 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -27,6 +27,7 @@ type t = interface: Xenmmap.mmap_interface; eventchn: Event.t; mutable port: Xeneventchn.t option; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -35,6 +36,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let string_of_port = function | None -> "None" | Some x -> string_of_int (Xeneventchn.to_int x) @@ -68,7 +72,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = None + port = None; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index a4ff741..89db56c 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -374,7 +374,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 4045aed..438ecb9 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -50,9 +50,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 04:44:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 04:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQO-0005Iy-AX; Thu, 05 Sep 2013 04:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQM-0005Iq-Gv for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:06 +0000 Received: from [193.109.254.147:13623] by server-16.bemta-14.messagelabs.com id 1C/23-06264-51C08225; Thu, 05 Sep 2013 04:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378356244!945561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29884 invoked from network); 5 Sep 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 04:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQJ-0000wG-Je for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHRQJ-00027e-Dn for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:03 +0000 Date: Thu, 05 Sep 2013 04:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48 Author: John Liu AuthorDate: Mon Jul 22 22:23:10 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 11:51:31 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fdd9983..8bd1047 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -45,6 +45,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -94,7 +98,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 32e2f2e..273fe4d 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index 85ab282..444069d 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -27,6 +27,7 @@ type t = interface: Xenmmap.mmap_interface; eventchn: Event.t; mutable port: Xeneventchn.t option; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -35,6 +36,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let string_of_port = function | None -> "None" | Some x -> string_of_int (Xeneventchn.to_int x) @@ -68,7 +72,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = None + port = None; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index a4ff741..89db56c 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -374,7 +374,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 4045aed..438ecb9 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -50,9 +50,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 04:44:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 04:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQX-0005JS-Dm; Thu, 05 Sep 2013 04:44:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQW-0005JL-Pb for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:16 +0000 Received: from [193.109.254.147:13900] by server-13.bemta-14.messagelabs.com id B8/AA-01215-02C08225; Thu, 05 Sep 2013 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378356254!967284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27657 invoked from network); 5 Sep 2013 04:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 04:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQT-0000wJ-TQ for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHRQT-00028I-Nt for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:13 +0000 Date: Thu, 05 Sep 2013 04:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: add Debian extlinux.conf 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 30f53a4cc56d45a86ef025a0fd8e90e4c5cefe1c Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:35:36 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index eedfdb2..bcdd602 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 04:44:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 04:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQX-0005JS-Dm; Thu, 05 Sep 2013 04:44:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQW-0005JL-Pb for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:16 +0000 Received: from [193.109.254.147:13900] by server-13.bemta-14.messagelabs.com id B8/AA-01215-02C08225; Thu, 05 Sep 2013 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378356254!967284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27657 invoked from network); 5 Sep 2013 04:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 04:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHRQT-0000wJ-TQ for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHRQT-00028I-Nt for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 04:44:13 +0000 Date: Thu, 05 Sep 2013 04:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] pygrub: add Debian extlinux.conf 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 30f53a4cc56d45a86ef025a0fd8e90e4c5cefe1c Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:35:36 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index eedfdb2..bcdd602 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 17:44:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17: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 1VHdbE-0002Iv-VE; Thu, 05 Sep 2013 17:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbE-0002Io-1R for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:08 +0000 Received: from [193.109.254.147:29056] by server-10.bemta-14.messagelabs.com id A9/DE-26557-7E2C8225; Thu, 05 Sep 2013 17:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378403045!1088135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2408 invoked from network); 5 Sep 2013 17:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdb9-000234-EI for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdb9-0007og-AJ for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:03 +0000 Date: Thu, 05 Sep 2013 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f93027afd796a98d7b92898f4ccc772796a4874 Author: Ian Jackson AuthorDate: Tue Sep 3 11:55:48 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 11:55:48 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) (cherry picked from commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48) Conflicts: tools/ocaml/xenstored/domain.ml Signed-off-by: Ian Jackson --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fdd9983..8bd1047 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -45,6 +45,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -94,7 +98,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 32e2f2e..273fe4d 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index c17f567..2c80f13 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -26,6 +26,7 @@ type t = interface: Xenmmap.mmap_interface; eventchn: Event.t; mutable port: int; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -34,6 +35,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let dump d chan = fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.port @@ -56,7 +60,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = -1 + port = -1; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index a4ff741..89db56c 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -374,7 +374,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 64cc106..2742e83 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -50,9 +50,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- 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 Sep 05 17:44:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17: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 1VHdbE-0002Iv-VE; Thu, 05 Sep 2013 17:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbE-0002Io-1R for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:08 +0000 Received: from [193.109.254.147:29056] by server-10.bemta-14.messagelabs.com id A9/DE-26557-7E2C8225; Thu, 05 Sep 2013 17:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378403045!1088135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2408 invoked from network); 5 Sep 2013 17:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdb9-000234-EI for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdb9-0007og-AJ for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:03 +0000 Date: Thu, 05 Sep 2013 17:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f93027afd796a98d7b92898f4ccc772796a4874 Author: Ian Jackson AuthorDate: Tue Sep 3 11:55:48 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 11:55:48 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) (cherry picked from commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48) Conflicts: tools/ocaml/xenstored/domain.ml Signed-off-by: Ian Jackson --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index fdd9983..8bd1047 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -45,6 +45,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -94,7 +98,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 32e2f2e..273fe4d 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index c17f567..2c80f13 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -26,6 +26,7 @@ type t = interface: Xenmmap.mmap_interface; eventchn: Event.t; mutable port: int; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -34,6 +35,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let dump d chan = fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.port @@ -56,7 +60,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = -1 + port = -1; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index a4ff741..89db56c 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -374,7 +374,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 64cc106..2742e83 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -50,9 +50,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- 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 Sep 05 17:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbP-0002Jo-27; Thu, 05 Sep 2013 17:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbO-0002Jf-Iz for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:18 +0000 Received: from [85.158.137.68:44772] by server-11.bemta-3.messagelabs.com id AF/E8-16607-1F2C8225; Thu, 05 Sep 2013 17:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378403055!366366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31506 invoked from network); 5 Sep 2013 17:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbL-00023B-Oo for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbL-0007p4-JS for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:15 +0000 Date: Thu, 05 Sep 2013 17:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] pygrub: add Debian extlinux.conf 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 51167aac2cb2c5bc390808d5c772fe7d1288a97f Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:42:44 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 295fde0..ca9b000 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- 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 Sep 05 17:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbP-0002Jo-27; Thu, 05 Sep 2013 17:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbO-0002Jf-Iz for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:18 +0000 Received: from [85.158.137.68:44772] by server-11.bemta-3.messagelabs.com id AF/E8-16607-1F2C8225; Thu, 05 Sep 2013 17:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378403055!366366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31506 invoked from network); 5 Sep 2013 17:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbL-00023B-Oo for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbL-0007p4-JS for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:15 +0000 Date: Thu, 05 Sep 2013 17:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] pygrub: add Debian extlinux.conf 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 51167aac2cb2c5bc390808d5c772fe7d1288a97f Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:42:44 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 295fde0..ca9b000 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- 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 Sep 05 17:44:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbc-0002Kv-5N; Thu, 05 Sep 2013 17:44:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdba-0002Ki-OW for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:30 +0000 Received: from [85.158.143.35:12614] by server-1.bemta-4.messagelabs.com id 5F/45-16125-EF2C8225; Thu, 05 Sep 2013 17:44:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378403068!1687188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24926 invoked from network); 5 Sep 2013 17:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbX-00023K-M4 for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbX-0007q2-Jn for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:27 +0000 Date: Thu, 05 Sep 2013 17:44:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 070ab4c505934951f86f42dd8403cf62bc5822f0 Author: Ian Jackson AuthorDate: Tue Sep 3 11:55:48 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 12:03:39 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) (cherry picked from commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48) Conflicts: tools/ocaml/xenstored/domain.ml Signed-off-by: Ian Jackson (cherry picked from commit 9f93027afd796a98d7b92898f4ccc772796a4874) --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index 37649df..eddeec3 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -49,6 +49,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -98,7 +102,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 70cdbbf..c15595b 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index 258d172..b41b00c 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -26,6 +26,7 @@ type t = interface: Mmap.mmap_interface; eventchn: Event.t; mutable port: int; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -34,6 +35,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let dump d chan = fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.port @@ -56,7 +60,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = -1 + port = -1; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 1549774..bd87646 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -368,7 +368,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 91cde8d..d004ad2 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -49,9 +49,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 17:44:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbc-0002Kv-5N; Thu, 05 Sep 2013 17:44:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdba-0002Ki-OW for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:30 +0000 Received: from [85.158.143.35:12614] by server-1.bemta-4.messagelabs.com id 5F/45-16125-EF2C8225; Thu, 05 Sep 2013 17:44:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378403068!1687188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24926 invoked from network); 5 Sep 2013 17:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbX-00023K-M4 for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbX-0007q2-Jn for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:27 +0000 Date: Thu, 05 Sep 2013 17:44:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] oxenstored: Protect oxenstored from malicious domains. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 070ab4c505934951f86f42dd8403cf62bc5822f0 Author: Ian Jackson AuthorDate: Tue Sep 3 11:55:48 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 12:03:39 2013 +0100 oxenstored: Protect oxenstored from malicious domains. add check logic when read from IO ring, and if error happens, then mark the reading connection as "bad", Unless vm reboot, oxenstored will not handle message from this connection any more. xs_ring_stubs.c: add a more strict check on ring reading connection.ml, domain.ml: add getter and setter for bad flag process.ml: if exception raised when reading from domain's ring, mark this domain as "bad" xenstored.ml: if a domain is marked as "bad", do not handle it. Signed-off-by: John Liu Acked-by: David Scott (cherry picked from commit 704302ce9404c73cfb687d31adcf67094ab5bb53) (cherry picked from commit a978634bee4db6c5e0ceeb66adcc5114f3f9bc48) Conflicts: tools/ocaml/xenstored/domain.ml Signed-off-by: Ian Jackson (cherry picked from commit 9f93027afd796a98d7b92898f4ccc772796a4874) --- tools/ocaml/libs/xb/xs_ring_stubs.c | 6 +++++- tools/ocaml/xenstored/connection.ml | 5 +++++ tools/ocaml/xenstored/domain.ml | 7 ++++++- tools/ocaml/xenstored/process.ml | 12 +++++++++++- tools/ocaml/xenstored/xenstored.ml | 7 ++++--- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index 37649df..eddeec3 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -49,6 +49,10 @@ static int xs_ring_read(struct mmap_interface *interface, cons = *(volatile uint32*)&intf->req_cons; prod = *(volatile uint32*)&intf->req_prod; xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) + return -1; + if (prod == cons) return 0; cons = MASK_XENSTORE_IDX(cons); @@ -98,7 +102,7 @@ CAMLprim value ml_interface_read(value interface, value buffer, value len) res = xs_ring_read(GET_C_STRUCT(interface), String_val(buffer), Int_val(len)); if (res == -1) - caml_failwith("huh"); + caml_failwith("bad connection"); result = Val_int(res); CAMLreturn(result); } diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 70cdbbf..c15595b 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -38,6 +38,11 @@ and t = { mutable perm: Perms.Connection.t; } +let mark_as_bad con = + match con.dom with + |None -> () + | Some domain -> Domain.mark_as_bad domain + let get_path con = Printf.sprintf "/local/domain/%i/" (match con.dom with None -> 0 | Some d -> Domain.get_id d) diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index 258d172..b41b00c 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -26,6 +26,7 @@ type t = interface: Mmap.mmap_interface; eventchn: Event.t; mutable port: int; + mutable bad_client: bool; } let get_path dom = "/local/domain/" ^ (sprintf "%u" dom.id) @@ -34,6 +35,9 @@ let get_interface d = d.interface let get_mfn d = d.mfn let get_remote_port d = d.remote_port +let is_bad_domain domain = domain.bad_client +let mark_as_bad domain = domain.bad_client <- true + let dump d chan = fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.port @@ -56,7 +60,8 @@ let make id mfn remote_port interface eventchn = { remote_port = remote_port; interface = interface; eventchn = eventchn; - port = -1 + port = -1; + bad_client = false } let is_dom0 d = d.id = 0 diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index 1549774..bd87646 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -368,7 +368,17 @@ let write_answer_log ~ty ~tid ~con ~data = Logging.xb_answer ~ty ~tid ~con:(Connection.get_domstr con) data let do_input store cons doms con = - if Connection.do_input con then ( + let newpacket = + try + Connection.do_input con + with Failure exp -> + error "caught exception %s" exp; + error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Connection.mark_as_bad con; + false + in + + if newpacket then ( let packet = Connection.pop_in con in let tid, rid, ty, data = Xb.Packet.unpack packet in (* As we don't log IO, do not call an unnecessary sanitize_data diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 91cde8d..d004ad2 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -49,9 +49,10 @@ let process_connection_fds store cons domains rset wset = let process_domains store cons domains = let do_io_domain domain = - let con = Connections.find_domain cons (Domain.get_id domain) in - Process.do_input store cons domains con; - Process.do_output store cons domains con in + if not (Domain.is_bad_domain domain) then + let con = Connections.find_domain cons (Domain.get_id domain) in + Process.do_input store cons domains con; + Process.do_output store cons domains con in Domains.iter domains do_io_domain let sigusr1_handler store = -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 17:44:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44: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 1VHdbl-0002M7-8b; Thu, 05 Sep 2013 17: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 1VHdbk-0002Lu-HD for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:40 +0000 Received: from [85.158.139.211:37460] by server-8.bemta-5.messagelabs.com id 47/78-17437-703C8225; Thu, 05 Sep 2013 17:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378403078!891844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14390 invoked from network); 5 Sep 2013 17:44:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbh-00023P-Ts for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbh-0007qW-Pu for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:37 +0000 Date: Thu, 05 Sep 2013 17:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] pygrub: add Debian extlinux.conf 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 f02ec246e8323d63951880d221eea8d05af13c20 Author: Ian Jackson AuthorDate: Tue Sep 3 15:45:11 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:45:11 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index f65f22c..0759d33 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -403,6 +403,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) if not fs: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 05 17:44:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Sep 2013 17:44: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 1VHdbl-0002M7-8b; Thu, 05 Sep 2013 17: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 1VHdbk-0002Lu-HD for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:40 +0000 Received: from [85.158.139.211:37460] by server-8.bemta-5.messagelabs.com id 47/78-17437-703C8225; Thu, 05 Sep 2013 17:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378403078!891844!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14390 invoked from network); 5 Sep 2013 17:44:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Sep 2013 17:44:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VHdbh-00023P-Ts for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VHdbh-0007qW-Pu for xen-changelog@lists.xensource.com; Thu, 05 Sep 2013 17:44:37 +0000 Date: Thu, 05 Sep 2013 17:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] pygrub: add Debian extlinux.conf 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 f02ec246e8323d63951880d221eea8d05af13c20 Author: Ian Jackson AuthorDate: Tue Sep 3 15:45:11 2013 +0100 Commit: Ian Jackson CommitDate: Tue Sep 3 15:45:11 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 258d27a1d9fb33a490bef1381f52d522225c3dca) Conflicts: tools/pygrub/src/pygrub Signed-off-by: Ian Jackson --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index f65f22c..0759d33 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -403,6 +403,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) if not fs: -- 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 Sep 07 18:11:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyR-0001vT-KK; Sat, 07 Sep 2013 18:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyQ-0001vK-1b for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:06 +0000 Received: from [85.158.143.35:24774] by server-1.bemta-4.messagelabs.com id 25/A3-16125-93C6B225; Sat, 07 Sep 2013 18:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378577463!2075124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4956 invoked from network); 7 Sep 2013 18:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyN-0007CO-Fu for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyN-000410-15 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:03 +0000 Date: Sat, 07 Sep 2013 18:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d: warn about Compatibility Format Interrupts being enabled by firmware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22ab16cefc04d4e8a0fc72dfff4edd00cc6841da Author: Jan Beulich AuthorDate: Fri Sep 6 14:43:51 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:43:51 2013 +0200 VT-d: warn about Compatibility Format Interrupts being enabled by firmware ... as being insecure. Also drop the second (redundant) read DMAR_GSTS_REG from enable_intremap(). Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: c9c6abab583d27fdca1d979a7f1d18ae30f54e9b master date: 2013-08-21 16:44:58 +0200 --- xen/drivers/passthrough/vtd/intremap.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index b6a4f95..8687311 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -695,8 +695,8 @@ int enable_intremap(struct iommu *iommu, int eim) if ( !platform_supports_intremap() ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Platform firmware does not support interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Platform firmware does not support interrupt remapping\n"); return -EINVAL; } @@ -707,15 +707,19 @@ int enable_intremap(struct iommu *iommu, int eim) if ( (sts & DMA_GSTS_IRES) && ir_ctrl->iremap_maddr ) return 0; - sts = dmar_readl(iommu->reg, DMAR_GSTS_REG); if ( !(sts & DMA_GSTS_QIES) ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Queued invalidation is not enabled, should not enable " - "interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Queued invalidation is not enabled on IOMMU #%u:" + " Should not enable interrupt remapping\n", iommu->index); return -EINVAL; } + if ( !eim && (sts & DMA_GSTS_CFIS) ) + printk(XENLOG_WARNING VTDPREFIX + " Compatibility Format Interrupts permitted on IOMMU #%u:" + " Device pass-through will be insecure\n", iommu->index); + if ( ir_ctrl->iremap_maddr == 0 ) { drhd = iommu_to_drhd(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 Sat Sep 07 18:11:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyR-0001vT-KK; Sat, 07 Sep 2013 18:11:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyQ-0001vK-1b for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:06 +0000 Received: from [85.158.143.35:24774] by server-1.bemta-4.messagelabs.com id 25/A3-16125-93C6B225; Sat, 07 Sep 2013 18:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378577463!2075124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4956 invoked from network); 7 Sep 2013 18:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyN-0007CO-Fu for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyN-000410-15 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:03 +0000 Date: Sat, 07 Sep 2013 18:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d: warn about Compatibility Format Interrupts being enabled by firmware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22ab16cefc04d4e8a0fc72dfff4edd00cc6841da Author: Jan Beulich AuthorDate: Fri Sep 6 14:43:51 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:43:51 2013 +0200 VT-d: warn about Compatibility Format Interrupts being enabled by firmware ... as being insecure. Also drop the second (redundant) read DMAR_GSTS_REG from enable_intremap(). Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: c9c6abab583d27fdca1d979a7f1d18ae30f54e9b master date: 2013-08-21 16:44:58 +0200 --- xen/drivers/passthrough/vtd/intremap.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index b6a4f95..8687311 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -695,8 +695,8 @@ int enable_intremap(struct iommu *iommu, int eim) if ( !platform_supports_intremap() ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Platform firmware does not support interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Platform firmware does not support interrupt remapping\n"); return -EINVAL; } @@ -707,15 +707,19 @@ int enable_intremap(struct iommu *iommu, int eim) if ( (sts & DMA_GSTS_IRES) && ir_ctrl->iremap_maddr ) return 0; - sts = dmar_readl(iommu->reg, DMAR_GSTS_REG); if ( !(sts & DMA_GSTS_QIES) ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Queued invalidation is not enabled, should not enable " - "interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Queued invalidation is not enabled on IOMMU #%u:" + " Should not enable interrupt remapping\n", iommu->index); return -EINVAL; } + if ( !eim && (sts & DMA_GSTS_CFIS) ) + printk(XENLOG_WARNING VTDPREFIX + " Compatibility Format Interrupts permitted on IOMMU #%u:" + " Device pass-through will be insecure\n", iommu->index); + if ( ir_ctrl->iremap_maddr == 0 ) { drhd = iommu_to_drhd(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 Sat Sep 07 18:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMyb-0001w8-N7; Sat, 07 Sep 2013 18:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMya-0001vn-1F for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:16 +0000 Received: from [85.158.143.35:3034] by server-3.bemta-4.messagelabs.com id 0D/E5-08835-34C6B225; Sat, 07 Sep 2013 18:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378577473!2089093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10820 invoked from network); 7 Sep 2013 18:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyX-0007CR-M2 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyX-00041U-JF for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:13 +0000 Date: Sat, 07 Sep 2013 18:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/Intel: add further support for Ivy Bridge CPU 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 334b5924569c6e391d78268b1481b96aa4293b0a Author: Jan Beulich AuthorDate: Fri Sep 6 14:47:37 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:47:37 2013 +0200 x86/Intel: add further support for Ivy Bridge CPU models And some initial Haswell ones at once. Signed-off-by: Jan Beulich Acked-by: "Nakajima, Jun" --- xen/arch/x86/acpi/cpu_idle.c | 8 ++++++-- xen/arch/x86/hvm/vmx/vmx.c | 4 +++- xen/arch/x86/hvm/vmx/vpmu_core2.c | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f9d74d6..71f74ab 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -105,11 +105,15 @@ static void do_get_hw_residencies(void *arg) switch ( c->x86_model ) { - /* Ivy bridge */ - case 0x3A: /* Sandy bridge */ case 0x2A: case 0x2D: + /* Ivy bridge */ + case 0x3A: + case 0x3E: + /* Haswell */ + case 0x3C: + case 0x45: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a1077b6..afcd760 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1807,7 +1807,9 @@ static const struct lbr_info *last_branch_msr_get(void) /* Sandy Bridge */ case 42: case 45: /* Ivy Bridge */ - case 58: + case 58: case 62: + /* Haswell */ + case 60: case 69: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index c79103e..01dc518 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -747,6 +747,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 46: case 47: case 58: + case 62: 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#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 Sep 07 18:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMyb-0001w8-N7; Sat, 07 Sep 2013 18:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMya-0001vn-1F for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:16 +0000 Received: from [85.158.143.35:3034] by server-3.bemta-4.messagelabs.com id 0D/E5-08835-34C6B225; Sat, 07 Sep 2013 18:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378577473!2089093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10820 invoked from network); 7 Sep 2013 18:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyX-0007CR-M2 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyX-00041U-JF for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:13 +0000 Date: Sat, 07 Sep 2013 18:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/Intel: add further support for Ivy Bridge CPU 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 334b5924569c6e391d78268b1481b96aa4293b0a Author: Jan Beulich AuthorDate: Fri Sep 6 14:47:37 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:47:37 2013 +0200 x86/Intel: add further support for Ivy Bridge CPU models And some initial Haswell ones at once. Signed-off-by: Jan Beulich Acked-by: "Nakajima, Jun" --- xen/arch/x86/acpi/cpu_idle.c | 8 ++++++-- xen/arch/x86/hvm/vmx/vmx.c | 4 +++- xen/arch/x86/hvm/vmx/vpmu_core2.c | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f9d74d6..71f74ab 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -105,11 +105,15 @@ static void do_get_hw_residencies(void *arg) switch ( c->x86_model ) { - /* Ivy bridge */ - case 0x3A: /* Sandy bridge */ case 0x2A: case 0x2D: + /* Ivy bridge */ + case 0x3A: + case 0x3E: + /* Haswell */ + case 0x3C: + case 0x45: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a1077b6..afcd760 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1807,7 +1807,9 @@ static const struct lbr_info *last_branch_msr_get(void) /* Sandy Bridge */ case 42: case 45: /* Ivy Bridge */ - case 58: + case 58: case 62: + /* Haswell */ + case 60: case 69: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index c79103e..01dc518 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -747,6 +747,7 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 46: case 47: case 58: + case 62: 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#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 Sep 07 18:11:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMym-0001xK-Pi; Sat, 07 Sep 2013 18:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyk-0001x3-PK for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:26 +0000 Received: from [85.158.143.35:25381] by server-3.bemta-4.messagelabs.com id D6/F5-08835-E4C6B225; Sat, 07 Sep 2013 18:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378577484!2075157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5310 invoked from network); 7 Sep 2013 18:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyi-0007CX-4x for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyh-00041q-QO for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:23 +0000 Date: Sat, 07 Sep 2013 18:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/Intel: add support for Haswell CPU 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 22143eb77de49ab265f6a00e6413580d0d452594 Author: Jan Beulich AuthorDate: Fri Sep 6 14:48:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:48:00 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3e787021fb2420851c7bdc3911ea53c728ba5ac0 master date: 2013-08-27 11:15:15 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 71f74ab..c5c34df 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -113,7 +113,9 @@ static void do_get_hw_residencies(void *arg) case 0x3E: /* Haswell */ case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index afcd760..fa43971 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1809,7 +1809,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 01dc518..290fd9f 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -747,7 +747,11 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 46: case 47: case 58: + case 60: case 62: + case 63: + case 69: + case 70: 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#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 Sep 07 18:11:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMym-0001xK-Pi; Sat, 07 Sep 2013 18:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyk-0001x3-PK for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:26 +0000 Received: from [85.158.143.35:25381] by server-3.bemta-4.messagelabs.com id D6/F5-08835-E4C6B225; Sat, 07 Sep 2013 18:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378577484!2075157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5310 invoked from network); 7 Sep 2013 18:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyi-0007CX-4x for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMyh-00041q-QO for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:23 +0000 Date: Sat, 07 Sep 2013 18:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/Intel: add support for Haswell CPU 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 22143eb77de49ab265f6a00e6413580d0d452594 Author: Jan Beulich AuthorDate: Fri Sep 6 14:48:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:48:00 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3e787021fb2420851c7bdc3911ea53c728ba5ac0 master date: 2013-08-27 11:15:15 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 71f74ab..c5c34df 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -113,7 +113,9 @@ static void do_get_hw_residencies(void *arg) case 0x3E: /* Haswell */ case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index afcd760..fa43971 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1809,7 +1809,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 01dc518..290fd9f 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -747,7 +747,11 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 46: case 47: case 58: + case 60: case 62: + case 63: + case 69: + case 70: 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#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 Sep 07 18:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyw-0001ym-SW; Sat, 07 Sep 2013 18:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyu-0001yP-UJ for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:37 +0000 Received: from [85.158.143.35:3554] by server-3.bemta-4.messagelabs.com id FE/F5-08835-85C6B225; Sat, 07 Sep 2013 18:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378577494!2089120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11239 invoked from network); 7 Sep 2013 18:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMys-0007Cf-Do for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMys-00042z-7d for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:34 +0000 Date: Sat, 07 Sep 2013 18:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4917ef594512e1f3b481bfbef83cc5ed743a465c Author: Tomasz Wroblewski AuthorDate: Fri Sep 6 14:48:49 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:48:49 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 9e2c5938246546a5b3f698b7421640d85602b994 master date: 2013-08-28 10:18:39 +0200 --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 12c5f84..342982c 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -125,6 +125,8 @@ static struct ns16550 { #define RESUME_DELAY MILLISECS(10) #define RESUME_RETRIES 100 +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -306,6 +308,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -392,7 +395,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 18:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyw-0001ym-SW; Sat, 07 Sep 2013 18:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMyu-0001yP-UJ for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:37 +0000 Received: from [85.158.143.35:3554] by server-3.bemta-4.messagelabs.com id FE/F5-08835-85C6B225; Sat, 07 Sep 2013 18:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378577494!2089120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11239 invoked from network); 7 Sep 2013 18:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMys-0007Cf-Do for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMys-00042z-7d for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:34 +0000 Date: Sat, 07 Sep 2013 18:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4917ef594512e1f3b481bfbef83cc5ed743a465c Author: Tomasz Wroblewski AuthorDate: Fri Sep 6 14:48:49 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:48:49 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 9e2c5938246546a5b3f698b7421640d85602b994 master date: 2013-08-28 10:18:39 +0200 --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 12c5f84..342982c 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -125,6 +125,8 @@ static struct ns16550 { #define RESUME_DELAY MILLISECS(10) #define RESUME_RETRIES 100 +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -306,6 +308,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -392,7 +395,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 18:11:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMz9-00020z-Vr; Sat, 07 Sep 2013 18:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMz7-00020c-NH for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:49 +0000 Received: from [85.158.139.211:37548] by server-9.bemta-5.messagelabs.com id B7/55-24493-46C6B225; Sat, 07 Sep 2013 18:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378577504!1231941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20107 invoked from network); 7 Sep 2013 18:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMz2-0007Cm-Ns for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMz2-00043L-GS for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:44 +0000 Date: Sat, 07 Sep 2013 18:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b5ca240edb5300fedc0a29c1b839984bdbbc89c Author: Jan Beulich AuthorDate: Fri Sep 6 14:49:38 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:49:38 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 2b52ea9..2c23646 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -677,6 +677,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_setup ) { if ( ioapic_sbdf[special->handle].bdf == bdf && -- 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 Sep 07 18:11:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 18:11: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 1VIMz9-00020z-Vr; Sat, 07 Sep 2013 18:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMz7-00020c-NH for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:49 +0000 Received: from [85.158.139.211:37548] by server-9.bemta-5.messagelabs.com id B7/55-24493-46C6B225; Sat, 07 Sep 2013 18:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378577504!1231941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20107 invoked from network); 7 Sep 2013 18:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2013 18:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIMz2-0007Cm-Ns for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIMz2-00043L-GS for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 18:11:44 +0000 Date: Sat, 07 Sep 2013 18:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b5ca240edb5300fedc0a29c1b839984bdbbc89c Author: Jan Beulich AuthorDate: Fri Sep 6 14:49:38 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:49:38 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 2b52ea9..2c23646 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -677,6 +677,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_setup ) { if ( ioapic_sbdf[special->handle].bdf == bdf && -- 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 Sep 07 19:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuU-0002O0-EI; Sat, 07 Sep 2013 19:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuT-0002Nv-V9 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:06 +0000 Received: from [193.109.254.147:30131] by server-12.bemta-14.messagelabs.com id 0F/A9-27329-94A7B225; Sat, 07 Sep 2013 19:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378581063!1418225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24544 invoked from network); 7 Sep 2013 19:11:04 -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; 7 Sep 2013 19:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuR-0007op-4C for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINuQ-0005aZ-Rv for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:02 +0000 Date: Sat, 07 Sep 2013 19:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/Intel: add support for Haswell CPU 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 3e84eb6381260bb50080fa2ad2d7770eb863aff1 Author: Jan Beulich AuthorDate: Fri Sep 6 14:02:09 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:02:09 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3e787021fb2420851c7bdc3911ea53c728ba5ac0 master date: 2013-08-27 11:15:15 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 4 +++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index dfc38f3..870fab8 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -135,8 +135,10 @@ static void do_get_hw_residencies(void *arg) case 0x3A: case 0x3E: /* Haswell */ - case 0x3c: + case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa9e79e..a99f65b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1801,7 +1801,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 15b2036..3a0d2ee 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -878,7 +878,12 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ - case 0x3c: /* Haswell */ + + /* Haswell: */ + case 0x3c: + case 0x3f: + case 0x45: + case 0x46: 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#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 19:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuU-0002O0-EI; Sat, 07 Sep 2013 19:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuT-0002Nv-V9 for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:06 +0000 Received: from [193.109.254.147:30131] by server-12.bemta-14.messagelabs.com id 0F/A9-27329-94A7B225; Sat, 07 Sep 2013 19:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378581063!1418225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24544 invoked from network); 7 Sep 2013 19:11:04 -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; 7 Sep 2013 19:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuR-0007op-4C for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINuQ-0005aZ-Rv for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:02 +0000 Date: Sat, 07 Sep 2013 19:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/Intel: add support for Haswell CPU 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 3e84eb6381260bb50080fa2ad2d7770eb863aff1 Author: Jan Beulich AuthorDate: Fri Sep 6 14:02:09 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:02:09 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3e787021fb2420851c7bdc3911ea53c728ba5ac0 master date: 2013-08-27 11:15:15 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 4 +++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index dfc38f3..870fab8 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -135,8 +135,10 @@ static void do_get_hw_residencies(void *arg) case 0x3A: case 0x3E: /* Haswell */ - case 0x3c: + case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa9e79e..a99f65b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1801,7 +1801,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 15b2036..3a0d2ee 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -878,7 +878,12 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ - case 0x3c: /* Haswell */ + + /* Haswell: */ + case 0x3c: + case 0x3f: + case 0x45: + case 0x46: 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#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 19:11:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11: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 1VINue-0002Oh-Gz; Sat, 07 Sep 2013 19:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINue-0002Oa-2X for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:16 +0000 Received: from [85.158.139.211:64006] by server-2.bemta-5.messagelabs.com id 8E/2C-26841-35A7B225; Sat, 07 Sep 2013 19:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1378581073!1227272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28112 invoked from network); 7 Sep 2013 19:11:14 -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; 7 Sep 2013 19:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINub-0007os-CW for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINub-0005ay-7S for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:13 +0000 Date: Sat, 07 Sep 2013 19:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecee70df563cef959b8ec01c331f1081f7014550 Author: Tomasz Wroblewski AuthorDate: Fri Sep 6 14:03:40 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:03:40 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 9e2c5938246546a5b3f698b7421640d85602b994 master date: 2013-08-28 10:18:39 +0200 --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e0c87bb..c34b64a 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -128,6 +128,8 @@ static struct ns16550 { #define RESUME_DELAY MILLISECS(10) #define RESUME_RETRIES 100 +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -323,6 +325,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -413,7 +416,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 19:11:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11: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 1VINue-0002Oh-Gz; Sat, 07 Sep 2013 19:11:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINue-0002Oa-2X for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:16 +0000 Received: from [85.158.139.211:64006] by server-2.bemta-5.messagelabs.com id 8E/2C-26841-35A7B225; Sat, 07 Sep 2013 19:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1378581073!1227272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28112 invoked from network); 7 Sep 2013 19:11:14 -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; 7 Sep 2013 19:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINub-0007os-CW for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINub-0005ay-7S for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:13 +0000 Date: Sat, 07 Sep 2013 19:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecee70df563cef959b8ec01c331f1081f7014550 Author: Tomasz Wroblewski AuthorDate: Fri Sep 6 14:03:40 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:03:40 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 9e2c5938246546a5b3f698b7421640d85602b994 master date: 2013-08-28 10:18:39 +0200 --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e0c87bb..c34b64a 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -128,6 +128,8 @@ static struct ns16550 { #define RESUME_DELAY MILLISECS(10) #define RESUME_RETRIES 100 +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -323,6 +325,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -413,7 +416,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 19:11:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuo-0002Pd-Ji; Sat, 07 Sep 2013 19: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 1VINuo-0002PW-1w for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:26 +0000 Received: from [85.158.139.211:45100] by server-11.bemta-5.messagelabs.com id 52/0B-10409-D5A7B225; Sat, 07 Sep 2013 19:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1378581083!1238648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18082 invoked from network); 7 Sep 2013 19:11:24 -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; 7 Sep 2013 19:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINul-0007oy-HH for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINul-0005bL-FZ for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:23 +0000 Date: Sat, 07 Sep 2013 19:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25ec2ee4122167d85c847f51834c787767b96ba1 Author: Jan Beulich AuthorDate: Fri Sep 6 14:07:54 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:07:54 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 6a2cbb6..330e74f 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -671,6 +671,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_setup ) { if ( ioapic_sbdf[special->handle].bdf == bdf && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 07 19:11:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 07 Sep 2013 19:11:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINuo-0002Pd-Ji; Sat, 07 Sep 2013 19: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 1VINuo-0002PW-1w for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:26 +0000 Received: from [85.158.139.211:45100] by server-11.bemta-5.messagelabs.com id 52/0B-10409-D5A7B225; Sat, 07 Sep 2013 19:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1378581083!1238648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18082 invoked from network); 7 Sep 2013 19:11:24 -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; 7 Sep 2013 19:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VINul-0007oy-HH for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VINul-0005bL-FZ for xen-changelog@lists.xensource.com; Sat, 07 Sep 2013 19:11:23 +0000 Date: Sat, 07 Sep 2013 19:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25ec2ee4122167d85c847f51834c787767b96ba1 Author: Jan Beulich AuthorDate: Fri Sep 6 14:07:54 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 14:07:54 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 6a2cbb6..330e74f 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -671,6 +671,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_setup ) { if ( ioapic_sbdf[special->handle].bdf == bdf && -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoR-0006DO-Iu; Sun, 08 Sep 2013 15:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoR-0006DE-2L for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:07 +0000 Received: from [85.158.143.35:61335] by server-2.bemta-4.messagelabs.com id 4A/7C-26052-E169C225; Sun, 08 Sep 2013 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378653724!2186173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24867 invoked from network); 8 Sep 2013 15:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoO-000325-Do for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoN-0004ec-Ow for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:03 +0000 Date: Sun, 08 Sep 2013 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 850188e1278cecd1dfb9b936024bee2d8dfdcc18 Author: Jan Beulich AuthorDate: Tue Aug 27 11:11:38 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:11:38 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03fe845..8365f32 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1122,6 +1122,10 @@ int __init construct_dom0( if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoR-0006DO-Iu; Sun, 08 Sep 2013 15:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoR-0006DE-2L for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:07 +0000 Received: from [85.158.143.35:61335] by server-2.bemta-4.messagelabs.com id 4A/7C-26052-E169C225; Sun, 08 Sep 2013 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378653724!2186173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24867 invoked from network); 8 Sep 2013 15:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoO-000325-Do for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoN-0004ec-Ow for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:03 +0000 Date: Sun, 08 Sep 2013 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 850188e1278cecd1dfb9b936024bee2d8dfdcc18 Author: Jan Beulich AuthorDate: Tue Aug 27 11:11:38 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:11:38 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03fe845..8365f32 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1122,6 +1122,10 @@ int __init construct_dom0( if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgoc-0006EA-Ln; Sun, 08 Sep 2013 15:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgob-0006Dm-9k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:17 +0000 Received: from [193.109.254.147:2781] by server-5.bemta-14.messagelabs.com id C0/0C-04931-8269C225; Sun, 08 Sep 2013 15:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1378653734!860164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20668 invoked from network); 8 Sep 2013 15:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoY-00032B-Nl for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoY-0004fh-I7 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:14 +0000 Date: Sun, 08 Sep 2013 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow Dom0 access to the HT address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d838ac2539cf1987bea6e15662fd6a80a58fe26d Author: Jan Beulich AuthorDate: Tue Aug 27 11:12:12 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:12:12 2013 +0200 x86: don't allow Dom0 access to the HT address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 8365f32..232adf8 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1126,6 +1126,10 @@ int __init construct_dom0( rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), paddr_to_pfn(MSI_ADDR_BASE_LO + MSI_ADDR_DEST_ID_MASK)); + /* HyperTransport range. */ + if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + rc |= iomem_deny_access(dom0, paddr_to_pfn(0xfdULL << 32), + paddr_to_pfn((1ULL << 40) - 1)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgoc-0006EA-Ln; Sun, 08 Sep 2013 15:22:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgob-0006Dm-9k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:17 +0000 Received: from [193.109.254.147:2781] by server-5.bemta-14.messagelabs.com id C0/0C-04931-8269C225; Sun, 08 Sep 2013 15:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1378653734!860164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20668 invoked from network); 8 Sep 2013 15:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoY-00032B-Nl for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoY-0004fh-I7 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:14 +0000 Date: Sun, 08 Sep 2013 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow Dom0 access to the HT address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d838ac2539cf1987bea6e15662fd6a80a58fe26d Author: Jan Beulich AuthorDate: Tue Aug 27 11:12:12 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:12:12 2013 +0200 x86: don't allow Dom0 access to the HT address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 8365f32..232adf8 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1126,6 +1126,10 @@ int __init construct_dom0( rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), paddr_to_pfn(MSI_ADDR_BASE_LO + MSI_ADDR_DEST_ID_MASK)); + /* HyperTransport range. */ + if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + rc |= iomem_deny_access(dom0, paddr_to_pfn(0xfdULL << 32), + paddr_to_pfn((1ULL << 40) - 1)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgom-0006FQ-Oe; Sun, 08 Sep 2013 15:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgol-0006FG-OD for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:28 +0000 Received: from [85.158.143.35:63881] by server-1.bemta-4.messagelabs.com id 02/A1-16125-3369C225; Sun, 08 Sep 2013 15:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378653745!2185435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20655 invoked from network); 8 Sep 2013 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoi-00032H-TC for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoi-0004gC-Qy for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:24 +0000 Date: Sun, 08 Sep 2013 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: convert EOI exit bitmap to a proper bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 784ce3fd05476ffe46bf54579f3927c777eb2c3b Author: Jan Beulich AuthorDate: Tue Aug 27 11:13:50 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:13:50 2013 +0200 VMX: convert EOI exit bitmap to a proper bitmap ... allowing bitmap operations to be used on it, making things consistent with struct pi_desc's pir field, and shrinking overall source code size. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/intr.c | 16 ++++++++-------- xen/arch/x86/hvm/vmx/vmcs.c | 35 +++++++++++------------------------ xen/include/asm-x86/hvm/vmx/vmcs.h | 12 +++--------- 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 45942ab..e6d5b46 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -285,6 +285,7 @@ void vmx_intr_assist(void) intack.source != hvm_intsrc_vector ) { unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned int i, n; /* * Set eoi_exit_bitmap for periodic timer interrup to cause EOI-induced VM @@ -299,14 +300,13 @@ void vmx_intr_assist(void) status |= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK & intack.vector; __vmwrite(GUEST_INTR_STATUS, status); - if (v->arch.hvm_vmx.eoi_exitmap_changed) { -#define UPDATE_EOI_EXITMAP(v, e) { \ - if (test_and_clear_bit(e, &v->arch.hvm_vmx.eoi_exitmap_changed)) { \ - __vmwrite(EOI_EXIT_BITMAP##e, v->arch.hvm_vmx.eoi_exit_bitmap[e]);}} - UPDATE_EOI_EXITMAP(v, 0); - UPDATE_EOI_EXITMAP(v, 1); - UPDATE_EOI_EXITMAP(v, 2); - UPDATE_EOI_EXITMAP(v, 3); + + n = ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); + while ( (i = find_first_bit(&v->arch.hvm_vmx.eoi_exitmap_changed, + n)) < n ) + { + clear_bit(i, &v->arch.hvm_vmx.eoi_exitmap_changed); + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); } pt_intr_post(v, intack); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 79efb3f..31347bb 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -915,15 +915,12 @@ static int construct_vmcs(struct vcpu *v) if ( cpu_has_vmx_virtual_intr_delivery ) { + unsigned int i; + /* EOI-exit bitmap */ - v->arch.hvm_vmx.eoi_exit_bitmap[0] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP0, v->arch.hvm_vmx.eoi_exit_bitmap[0]); - v->arch.hvm_vmx.eoi_exit_bitmap[1] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP1, v->arch.hvm_vmx.eoi_exit_bitmap[1]); - v->arch.hvm_vmx.eoi_exit_bitmap[2] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP2, v->arch.hvm_vmx.eoi_exit_bitmap[2]); - v->arch.hvm_vmx.eoi_exit_bitmap[3] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP3, v->arch.hvm_vmx.eoi_exit_bitmap[3]); + bitmap_zero(v->arch.hvm_vmx.eoi_exit_bitmap, NR_VECTORS); + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), 0); /* Initialise Guest Interrupt Status (RVI and SVI) to 0 */ __vmwrite(GUEST_INTR_STATUS, 0); @@ -1171,26 +1168,16 @@ int vmx_add_host_load_msr(u32 msr) void vmx_set_eoi_exit_bitmap(struct vcpu *v, u8 vector) { - int index, offset, changed; - - index = vector >> 6; - offset = vector & 63; - changed = !test_and_set_bit(offset, - (uint64_t *)&v->arch.hvm_vmx.eoi_exit_bitmap[index]); - if (changed) - set_bit(index, &v->arch.hvm_vmx.eoi_exitmap_changed); + if ( !test_and_set_bit(vector, v->arch.hvm_vmx.eoi_exit_bitmap) ) + set_bit(vector / BITS_PER_LONG, + &v->arch.hvm_vmx.eoi_exitmap_changed); } void vmx_clear_eoi_exit_bitmap(struct vcpu *v, u8 vector) { - int index, offset, changed; - - index = vector >> 6; - offset = vector & 63; - changed = test_and_clear_bit(offset, - (uint64_t *)&v->arch.hvm_vmx.eoi_exit_bitmap[index]); - if (changed) - set_bit(index, &v->arch.hvm_vmx.eoi_exitmap_changed); + if ( test_and_clear_bit(vector, v->arch.hvm_vmx.eoi_exit_bitmap) ) + set_bit(vector / BITS_PER_LONG, + &v->arch.hvm_vmx.eoi_exitmap_changed); } int vmx_create_vmcs(struct vcpu *v) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index f30e5ac..38c2494 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -118,8 +118,8 @@ struct arch_vmx_struct { unsigned int host_msr_count; struct vmx_msr_entry *host_msr_area; - uint32_t eoi_exitmap_changed; - uint64_t eoi_exit_bitmap[4]; + unsigned long eoi_exitmap_changed; + DECLARE_BITMAP(eoi_exit_bitmap, NR_VECTORS); struct pi_desc pi_desc; unsigned long host_cr0; @@ -331,13 +331,7 @@ enum vmcs_field { EPT_POINTER = 0x0000201a, EPT_POINTER_HIGH = 0x0000201b, EOI_EXIT_BITMAP0 = 0x0000201c, - EOI_EXIT_BITMAP0_HIGH = 0x0000201d, - EOI_EXIT_BITMAP1 = 0x0000201e, - EOI_EXIT_BITMAP1_HIGH = 0x0000201f, - EOI_EXIT_BITMAP2 = 0x00002020, - EOI_EXIT_BITMAP2_HIGH = 0x00002021, - EOI_EXIT_BITMAP3 = 0x00002022, - EOI_EXIT_BITMAP3_HIGH = 0x00002023, +#define EOI_EXIT_BITMAP(n) (EOI_EXIT_BITMAP0 + (n) * 2) /* n = 0...3 */ VMREAD_BITMAP = 0x00002026, VMREAD_BITMAP_HIGH = 0x00002027, VMWRITE_BITMAP = 0x00002028, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgom-0006FQ-Oe; Sun, 08 Sep 2013 15:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgol-0006FG-OD for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:28 +0000 Received: from [85.158.143.35:63881] by server-1.bemta-4.messagelabs.com id 02/A1-16125-3369C225; Sun, 08 Sep 2013 15:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378653745!2185435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20655 invoked from network); 8 Sep 2013 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgoi-00032H-TC for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgoi-0004gC-Qy for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:24 +0000 Date: Sun, 08 Sep 2013 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: convert EOI exit bitmap to a proper bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 784ce3fd05476ffe46bf54579f3927c777eb2c3b Author: Jan Beulich AuthorDate: Tue Aug 27 11:13:50 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:13:50 2013 +0200 VMX: convert EOI exit bitmap to a proper bitmap ... allowing bitmap operations to be used on it, making things consistent with struct pi_desc's pir field, and shrinking overall source code size. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/intr.c | 16 ++++++++-------- xen/arch/x86/hvm/vmx/vmcs.c | 35 +++++++++++------------------------ xen/include/asm-x86/hvm/vmx/vmcs.h | 12 +++--------- 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 45942ab..e6d5b46 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -285,6 +285,7 @@ void vmx_intr_assist(void) intack.source != hvm_intsrc_vector ) { unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned int i, n; /* * Set eoi_exit_bitmap for periodic timer interrup to cause EOI-induced VM @@ -299,14 +300,13 @@ void vmx_intr_assist(void) status |= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK & intack.vector; __vmwrite(GUEST_INTR_STATUS, status); - if (v->arch.hvm_vmx.eoi_exitmap_changed) { -#define UPDATE_EOI_EXITMAP(v, e) { \ - if (test_and_clear_bit(e, &v->arch.hvm_vmx.eoi_exitmap_changed)) { \ - __vmwrite(EOI_EXIT_BITMAP##e, v->arch.hvm_vmx.eoi_exit_bitmap[e]);}} - UPDATE_EOI_EXITMAP(v, 0); - UPDATE_EOI_EXITMAP(v, 1); - UPDATE_EOI_EXITMAP(v, 2); - UPDATE_EOI_EXITMAP(v, 3); + + n = ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); + while ( (i = find_first_bit(&v->arch.hvm_vmx.eoi_exitmap_changed, + n)) < n ) + { + clear_bit(i, &v->arch.hvm_vmx.eoi_exitmap_changed); + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); } pt_intr_post(v, intack); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 79efb3f..31347bb 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -915,15 +915,12 @@ static int construct_vmcs(struct vcpu *v) if ( cpu_has_vmx_virtual_intr_delivery ) { + unsigned int i; + /* EOI-exit bitmap */ - v->arch.hvm_vmx.eoi_exit_bitmap[0] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP0, v->arch.hvm_vmx.eoi_exit_bitmap[0]); - v->arch.hvm_vmx.eoi_exit_bitmap[1] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP1, v->arch.hvm_vmx.eoi_exit_bitmap[1]); - v->arch.hvm_vmx.eoi_exit_bitmap[2] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP2, v->arch.hvm_vmx.eoi_exit_bitmap[2]); - v->arch.hvm_vmx.eoi_exit_bitmap[3] = (uint64_t)0; - __vmwrite(EOI_EXIT_BITMAP3, v->arch.hvm_vmx.eoi_exit_bitmap[3]); + bitmap_zero(v->arch.hvm_vmx.eoi_exit_bitmap, NR_VECTORS); + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), 0); /* Initialise Guest Interrupt Status (RVI and SVI) to 0 */ __vmwrite(GUEST_INTR_STATUS, 0); @@ -1171,26 +1168,16 @@ int vmx_add_host_load_msr(u32 msr) void vmx_set_eoi_exit_bitmap(struct vcpu *v, u8 vector) { - int index, offset, changed; - - index = vector >> 6; - offset = vector & 63; - changed = !test_and_set_bit(offset, - (uint64_t *)&v->arch.hvm_vmx.eoi_exit_bitmap[index]); - if (changed) - set_bit(index, &v->arch.hvm_vmx.eoi_exitmap_changed); + if ( !test_and_set_bit(vector, v->arch.hvm_vmx.eoi_exit_bitmap) ) + set_bit(vector / BITS_PER_LONG, + &v->arch.hvm_vmx.eoi_exitmap_changed); } void vmx_clear_eoi_exit_bitmap(struct vcpu *v, u8 vector) { - int index, offset, changed; - - index = vector >> 6; - offset = vector & 63; - changed = test_and_clear_bit(offset, - (uint64_t *)&v->arch.hvm_vmx.eoi_exit_bitmap[index]); - if (changed) - set_bit(index, &v->arch.hvm_vmx.eoi_exitmap_changed); + if ( test_and_clear_bit(vector, v->arch.hvm_vmx.eoi_exit_bitmap) ) + set_bit(vector / BITS_PER_LONG, + &v->arch.hvm_vmx.eoi_exitmap_changed); } int vmx_create_vmcs(struct vcpu *v) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index f30e5ac..38c2494 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -118,8 +118,8 @@ struct arch_vmx_struct { unsigned int host_msr_count; struct vmx_msr_entry *host_msr_area; - uint32_t eoi_exitmap_changed; - uint64_t eoi_exit_bitmap[4]; + unsigned long eoi_exitmap_changed; + DECLARE_BITMAP(eoi_exit_bitmap, NR_VECTORS); struct pi_desc pi_desc; unsigned long host_cr0; @@ -331,13 +331,7 @@ enum vmcs_field { EPT_POINTER = 0x0000201a, EPT_POINTER_HIGH = 0x0000201b, EOI_EXIT_BITMAP0 = 0x0000201c, - EOI_EXIT_BITMAP0_HIGH = 0x0000201d, - EOI_EXIT_BITMAP1 = 0x0000201e, - EOI_EXIT_BITMAP1_HIGH = 0x0000201f, - EOI_EXIT_BITMAP2 = 0x00002020, - EOI_EXIT_BITMAP2_HIGH = 0x00002021, - EOI_EXIT_BITMAP3 = 0x00002022, - EOI_EXIT_BITMAP3_HIGH = 0x00002023, +#define EOI_EXIT_BITMAP(n) (EOI_EXIT_BITMAP0 + (n) * 2) /* n = 0...3 */ VMREAD_BITMAP = 0x00002026, VMREAD_BITMAP_HIGH = 0x00002027, VMWRITE_BITMAP = 0x00002028, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgow-0006Gr-Rj; Sun, 08 Sep 2013 15:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgov-0006Ge-Uj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:38 +0000 Received: from [85.158.139.211:55582] by server-14.bemta-5.messagelabs.com id 08/BC-12040-D369C225; Sun, 08 Sep 2013 15:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378653755!1317298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30462 invoked from network); 8 Sep 2013 15:22:36 -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; 8 Sep 2013 15:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgot-00032Q-5m for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgot-0004gc-0F for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:35 +0000 Date: Sun, 08 Sep 2013 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: add support for Haswell CPU 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 3e787021fb2420851c7bdc3911ea53c728ba5ac0 Author: Jan Beulich AuthorDate: Tue Aug 27 11:15:15 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:15:15 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/cpu_idle.c | 4 +++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index dfc38f3..870fab8 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -135,8 +135,10 @@ static void do_get_hw_residencies(void *arg) case 0x3A: case 0x3E: /* Haswell */ - case 0x3c: + case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 011a817..782f8de 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1815,7 +1815,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 41a326b..8c556c7 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -909,7 +909,12 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ - case 0x3c: /* Haswell */ + + /* Haswell: */ + case 0x3c: + case 0x3f: + case 0x45: + case 0x46: 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 Sun Sep 08 15:22:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgow-0006Gr-Rj; Sun, 08 Sep 2013 15:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgov-0006Ge-Uj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:38 +0000 Received: from [85.158.139.211:55582] by server-14.bemta-5.messagelabs.com id 08/BC-12040-D369C225; Sun, 08 Sep 2013 15:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378653755!1317298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30462 invoked from network); 8 Sep 2013 15:22:36 -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; 8 Sep 2013 15:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgot-00032Q-5m for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgot-0004gc-0F for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:35 +0000 Date: Sun, 08 Sep 2013 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: add support for Haswell CPU 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 3e787021fb2420851c7bdc3911ea53c728ba5ac0 Author: Jan Beulich AuthorDate: Tue Aug 27 11:15:15 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:15:15 2013 +0200 x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/cpu_idle.c | 4 +++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index dfc38f3..870fab8 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -135,8 +135,10 @@ static void do_get_hw_residencies(void *arg) case 0x3A: case 0x3E: /* Haswell */ - case 0x3c: + case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 011a817..782f8de 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1815,7 +1815,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 41a326b..8c556c7 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -909,7 +909,12 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x3a: /* IvyBridge */ case 0x3e: /* IvyBridge EP */ - case 0x3c: /* Haswell */ + + /* Haswell: */ + case 0x3c: + case 0x3f: + case 0x45: + case 0x46: 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 Sun Sep 08 15:22:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgp7-0006Ie-Uj; Sun, 08 Sep 2013 15:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgp6-0006IJ-Bg for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:48 +0000 Received: from [193.109.254.147:4159] by server-11.bemta-14.messagelabs.com id F0/AE-23511-7469C225; Sun, 08 Sep 2013 15:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1378653765!860203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21995 invoked from network); 8 Sep 2013 15:22:46 -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; 8 Sep 2013 15:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgp3-00032Y-AW for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgp3-0004gy-9S for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:45 +0000 Date: Sun, 08 Sep 2013 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove Summit support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8e2fd7edced5ef28ff57524f8f744c042e57c59 Author: Matt Wilson AuthorDate: Tue Aug 27 11:20:17 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:20:17 2013 +0200 x86/apic: remove Summit support IBM's Summit chipset was only used for 32-bit only Intel ccNUMA and IA-64 machines, neither of which are supported by Xen anymore. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/genapic/Makefile | 1 - xen/arch/x86/genapic/probe.c | 2 - xen/arch/x86/genapic/summit.c | 27 ------ xen/include/asm-x86/mach-default/mach_mpspec.h | 2 +- xen/include/asm-x86/mach-summit/mach_mpparse.h | 108 ------------------------ 6 files changed, 2 insertions(+), 140 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 202d800..428e097 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -132,7 +132,7 @@ domain 0 command line Permit Xen to use superpages when performing memory management. ### apic -> `= summit | bigsmp | default` +> `= bigsmp | default` Override Xen's logic for choosing the APIC driver. By default, if there are more than 8 CPUs, Xen will switch to `bigsmp` over diff --git a/xen/arch/x86/genapic/Makefile b/xen/arch/x86/genapic/Makefile index d6a8717..de72b5d 100644 --- a/xen/arch/x86/genapic/Makefile +++ b/xen/arch/x86/genapic/Makefile @@ -3,4 +3,3 @@ obj-y += x2apic.o obj-y += default.o obj-y += delivery.o obj-y += probe.o -obj-y += summit.o diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 1a29490..a5f2a24 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -16,13 +16,11 @@ #include #include -extern const struct genapic apic_summit; extern const struct genapic apic_bigsmp; const struct genapic *__read_mostly genapic; const struct genapic *apic_probe[] __initdata = { - &apic_summit, &apic_bigsmp, &apic_default, /* must be last */ NULL, diff --git a/xen/arch/x86/genapic/summit.c b/xen/arch/x86/genapic/summit.c deleted file mode 100644 index c84f14e..0000000 --- a/xen/arch/x86/genapic/summit.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * APIC driver for the IBM "Summit" chipset. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static __init int probe_summit(void) -{ - /* probed later in mptable/ACPI hooks */ - return 0; -} - -const struct genapic apic_summit = { - APIC_INIT("summit", probe_summit), - GENAPIC_PHYS -}; diff --git a/xen/include/asm-x86/mach-default/mach_mpspec.h b/xen/include/asm-x86/mach-default/mach_mpspec.h index 9ef0b94..1a4e3f8 100644 --- a/xen/include/asm-x86/mach-default/mach_mpspec.h +++ b/xen/include/asm-x86/mach-default/mach_mpspec.h @@ -3,7 +3,7 @@ #define MAX_IRQ_SOURCES 256 -/* Summit or generic (i.e. installer) kernels need lots of bus entries. */ +/* Generic (i.e. installer) kernels need lots of bus entries. */ /* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ #define MAX_MP_BUSSES 260 diff --git a/xen/include/asm-x86/mach-summit/mach_mpparse.h b/xen/include/asm-x86/mach-summit/mach_mpparse.h deleted file mode 100644 index b57a3c4..0000000 --- a/xen/include/asm-x86/mach-summit/mach_mpparse.h +++ /dev/null @@ -1,108 +0,0 @@ -#ifndef __ASM_MACH_MPPARSE_H -#define __ASM_MACH_MPPARSE_H - -extern bool_t use_cyclone; - -#ifdef CONFIG_X86_SUMMIT_NUMA -extern void setup_summit(void); -#else -#define setup_summit() {} -#endif - -extern int usb_early_handoff; -static inline int __init mps_oem_check(struct mp_config_table *mpc, char *oem, - char *productid) -{ - if (!strncmp(oem, "IBM ENSW", 8) && - (!strncmp(productid, "VIGIL SMP", 9) - || !strncmp(productid, "EXA", 3) - || !strncmp(productid, "RUTHLESS SMP", 12))){ - use_cyclone = 1; /*enable cyclone-timer*/ - setup_summit(); - /*usb_early_handoff = 1;*/ - return 1; - } - return 0; -} - -/* Hook from generic ACPI tables.c */ -static inline int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) -{ - if (!strncmp(oem_id, "IBM", 3) && - (!strncmp(oem_table_id, "SERVIGIL", 8) - || !strncmp(oem_table_id, "EXA", 3))){ - use_cyclone = 1; /*enable cyclone-timer*/ - setup_summit(); - /*usb_early_handoff = 1;*/ - return 1; - } - return 0; -} - -struct rio_table_hdr { - unsigned char version; /* Version number of this data structure */ - /* Version 3 adds chassis_num & WP_index */ - unsigned char num_scal_dev; /* # of Scalability devices (Twisters for Vigil) */ - unsigned char num_rio_dev; /* # of RIO I/O devices (Cyclones and Winnipegs) */ -} __attribute__((packed)); - -struct scal_detail { - unsigned char node_id; /* Scalability Node ID */ - unsigned long CBAR; /* Address of 1MB register space */ - unsigned char port0node; /* Node ID port connected to: 0xFF=None */ - unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port1node; /* Node ID port connected to: 0xFF = None */ - unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port2node; /* Node ID port connected to: 0xFF = None */ - unsigned char port2port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char chassis_num; /* 1 based Chassis number (1 = boot node) */ -} __attribute__((packed)); - -struct rio_detail { - unsigned char node_id; /* RIO Node ID */ - unsigned long BBAR; /* Address of 1MB register space */ - unsigned char type; /* Type of device */ - unsigned char owner_id; /* For WPEG: Node ID of Cyclone that owns this WPEG*/ - /* For CYC: Node ID of Twister that owns this CYC */ - unsigned char port0node; /* Node ID port connected to: 0xFF=None */ - unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port1node; /* Node ID port connected to: 0xFF=None */ - unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char first_slot; /* For WPEG: Lowest slot number below this WPEG */ - /* For CYC: 0 */ - unsigned char status; /* For WPEG: Bit 0 = 1 : the XAPIC is used */ - /* = 0 : the XAPIC is not used, ie:*/ - /* ints fwded to another XAPIC */ - /* Bits1:7 Reserved */ - /* For CYC: Bits0:7 Reserved */ - unsigned char WP_index; /* For WPEG: WPEG instance index - lower ones have */ - /* lower slot numbers/PCI bus numbers */ - /* For CYC: No meaning */ - unsigned char chassis_num; /* 1 based Chassis number */ - /* For LookOut WPEGs this field indicates the */ - /* Expansion Chassis #, enumerated from Boot */ - /* Node WPEG external port, then Boot Node CYC */ - /* external port, then Next Vigil chassis WPEG */ - /* external port, etc. */ - /* Shared Lookouts have only 1 chassis number (the */ - /* first one assigned) */ -} __attribute__((packed)); - - -typedef enum { - CompatTwister = 0, /* Compatibility Twister */ - AltTwister = 1, /* Alternate Twister of internal 8-way */ - CompatCyclone = 2, /* Compatibility Cyclone */ - AltCyclone = 3, /* Alternate Cyclone of internal 8-way */ - CompatWPEG = 4, /* Compatibility WPEG */ - AltWPEG = 5, /* Second Planar WPEG */ - LookOutAWPEG = 6, /* LookOut WPEG */ - LookOutBWPEG = 7, /* LookOut WPEG */ -} node_type; - -static inline int is_WPEG(struct rio_detail *rio){ - return (rio->type == CompatWPEG || rio->type == AltWPEG || - rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); -} - -#endif /* __ASM_MACH_MPPARSE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:22:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:22: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 1VIgp7-0006Ie-Uj; Sun, 08 Sep 2013 15:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgp6-0006IJ-Bg for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:48 +0000 Received: from [193.109.254.147:4159] by server-11.bemta-14.messagelabs.com id F0/AE-23511-7469C225; Sun, 08 Sep 2013 15:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1378653765!860203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21995 invoked from network); 8 Sep 2013 15:22:46 -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; 8 Sep 2013 15:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgp3-00032Y-AW for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgp3-0004gy-9S for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:45 +0000 Date: Sun, 08 Sep 2013 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove Summit support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8e2fd7edced5ef28ff57524f8f744c042e57c59 Author: Matt Wilson AuthorDate: Tue Aug 27 11:20:17 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:20:17 2013 +0200 x86/apic: remove Summit support IBM's Summit chipset was only used for 32-bit only Intel ccNUMA and IA-64 machines, neither of which are supported by Xen anymore. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/genapic/Makefile | 1 - xen/arch/x86/genapic/probe.c | 2 - xen/arch/x86/genapic/summit.c | 27 ------ xen/include/asm-x86/mach-default/mach_mpspec.h | 2 +- xen/include/asm-x86/mach-summit/mach_mpparse.h | 108 ------------------------ 6 files changed, 2 insertions(+), 140 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 202d800..428e097 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -132,7 +132,7 @@ domain 0 command line Permit Xen to use superpages when performing memory management. ### apic -> `= summit | bigsmp | default` +> `= bigsmp | default` Override Xen's logic for choosing the APIC driver. By default, if there are more than 8 CPUs, Xen will switch to `bigsmp` over diff --git a/xen/arch/x86/genapic/Makefile b/xen/arch/x86/genapic/Makefile index d6a8717..de72b5d 100644 --- a/xen/arch/x86/genapic/Makefile +++ b/xen/arch/x86/genapic/Makefile @@ -3,4 +3,3 @@ obj-y += x2apic.o obj-y += default.o obj-y += delivery.o obj-y += probe.o -obj-y += summit.o diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 1a29490..a5f2a24 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -16,13 +16,11 @@ #include #include -extern const struct genapic apic_summit; extern const struct genapic apic_bigsmp; const struct genapic *__read_mostly genapic; const struct genapic *apic_probe[] __initdata = { - &apic_summit, &apic_bigsmp, &apic_default, /* must be last */ NULL, diff --git a/xen/arch/x86/genapic/summit.c b/xen/arch/x86/genapic/summit.c deleted file mode 100644 index c84f14e..0000000 --- a/xen/arch/x86/genapic/summit.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * APIC driver for the IBM "Summit" chipset. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static __init int probe_summit(void) -{ - /* probed later in mptable/ACPI hooks */ - return 0; -} - -const struct genapic apic_summit = { - APIC_INIT("summit", probe_summit), - GENAPIC_PHYS -}; diff --git a/xen/include/asm-x86/mach-default/mach_mpspec.h b/xen/include/asm-x86/mach-default/mach_mpspec.h index 9ef0b94..1a4e3f8 100644 --- a/xen/include/asm-x86/mach-default/mach_mpspec.h +++ b/xen/include/asm-x86/mach-default/mach_mpspec.h @@ -3,7 +3,7 @@ #define MAX_IRQ_SOURCES 256 -/* Summit or generic (i.e. installer) kernels need lots of bus entries. */ +/* Generic (i.e. installer) kernels need lots of bus entries. */ /* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ #define MAX_MP_BUSSES 260 diff --git a/xen/include/asm-x86/mach-summit/mach_mpparse.h b/xen/include/asm-x86/mach-summit/mach_mpparse.h deleted file mode 100644 index b57a3c4..0000000 --- a/xen/include/asm-x86/mach-summit/mach_mpparse.h +++ /dev/null @@ -1,108 +0,0 @@ -#ifndef __ASM_MACH_MPPARSE_H -#define __ASM_MACH_MPPARSE_H - -extern bool_t use_cyclone; - -#ifdef CONFIG_X86_SUMMIT_NUMA -extern void setup_summit(void); -#else -#define setup_summit() {} -#endif - -extern int usb_early_handoff; -static inline int __init mps_oem_check(struct mp_config_table *mpc, char *oem, - char *productid) -{ - if (!strncmp(oem, "IBM ENSW", 8) && - (!strncmp(productid, "VIGIL SMP", 9) - || !strncmp(productid, "EXA", 3) - || !strncmp(productid, "RUTHLESS SMP", 12))){ - use_cyclone = 1; /*enable cyclone-timer*/ - setup_summit(); - /*usb_early_handoff = 1;*/ - return 1; - } - return 0; -} - -/* Hook from generic ACPI tables.c */ -static inline int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) -{ - if (!strncmp(oem_id, "IBM", 3) && - (!strncmp(oem_table_id, "SERVIGIL", 8) - || !strncmp(oem_table_id, "EXA", 3))){ - use_cyclone = 1; /*enable cyclone-timer*/ - setup_summit(); - /*usb_early_handoff = 1;*/ - return 1; - } - return 0; -} - -struct rio_table_hdr { - unsigned char version; /* Version number of this data structure */ - /* Version 3 adds chassis_num & WP_index */ - unsigned char num_scal_dev; /* # of Scalability devices (Twisters for Vigil) */ - unsigned char num_rio_dev; /* # of RIO I/O devices (Cyclones and Winnipegs) */ -} __attribute__((packed)); - -struct scal_detail { - unsigned char node_id; /* Scalability Node ID */ - unsigned long CBAR; /* Address of 1MB register space */ - unsigned char port0node; /* Node ID port connected to: 0xFF=None */ - unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port1node; /* Node ID port connected to: 0xFF = None */ - unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port2node; /* Node ID port connected to: 0xFF = None */ - unsigned char port2port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char chassis_num; /* 1 based Chassis number (1 = boot node) */ -} __attribute__((packed)); - -struct rio_detail { - unsigned char node_id; /* RIO Node ID */ - unsigned long BBAR; /* Address of 1MB register space */ - unsigned char type; /* Type of device */ - unsigned char owner_id; /* For WPEG: Node ID of Cyclone that owns this WPEG*/ - /* For CYC: Node ID of Twister that owns this CYC */ - unsigned char port0node; /* Node ID port connected to: 0xFF=None */ - unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char port1node; /* Node ID port connected to: 0xFF=None */ - unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ - unsigned char first_slot; /* For WPEG: Lowest slot number below this WPEG */ - /* For CYC: 0 */ - unsigned char status; /* For WPEG: Bit 0 = 1 : the XAPIC is used */ - /* = 0 : the XAPIC is not used, ie:*/ - /* ints fwded to another XAPIC */ - /* Bits1:7 Reserved */ - /* For CYC: Bits0:7 Reserved */ - unsigned char WP_index; /* For WPEG: WPEG instance index - lower ones have */ - /* lower slot numbers/PCI bus numbers */ - /* For CYC: No meaning */ - unsigned char chassis_num; /* 1 based Chassis number */ - /* For LookOut WPEGs this field indicates the */ - /* Expansion Chassis #, enumerated from Boot */ - /* Node WPEG external port, then Boot Node CYC */ - /* external port, then Next Vigil chassis WPEG */ - /* external port, etc. */ - /* Shared Lookouts have only 1 chassis number (the */ - /* first one assigned) */ -} __attribute__((packed)); - - -typedef enum { - CompatTwister = 0, /* Compatibility Twister */ - AltTwister = 1, /* Alternate Twister of internal 8-way */ - CompatCyclone = 2, /* Compatibility Cyclone */ - AltCyclone = 3, /* Alternate Cyclone of internal 8-way */ - CompatWPEG = 4, /* Compatibility WPEG */ - AltWPEG = 5, /* Second Planar WPEG */ - LookOutAWPEG = 6, /* LookOut WPEG */ - LookOutBWPEG = 7, /* LookOut WPEG */ -} node_type; - -static inline int is_WPEG(struct rio_detail *rio){ - return (rio->type == CompatWPEG || rio->type == AltWPEG || - rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); -} - -#endif /* __ASM_MACH_MPPARSE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15: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 1VIgpI-0006Kp-4W; Sun, 08 Sep 2013 15:23:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpG-0006KR-9o for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:58 +0000 Received: from [193.109.254.147:4368] by server-13.bemta-14.messagelabs.com id D0/33-01215-1569C225; Sun, 08 Sep 2013 15:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653775!246441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4331 invoked from network); 8 Sep 2013 15:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpD-00032f-Ij for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpD-0004hL-Db for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:55 +0000 Date: Sun, 08 Sep 2013 15:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: remove Cyclone as a platform timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 483814219bc4d47db8a56116290ec7878b794c09 Author: Matt Wilson AuthorDate: Tue Aug 27 11:23:09 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:23:09 2013 +0200 x86/time: remove Cyclone as a platform timer The Cyclone time source was part of IBM's Summit chipset, which was only used for 32-bit only ccNUMA and IA-64 machines. Neither of these are supported by Xen anymore. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/time.c | 71 +--------------------------------- xen/include/asm-x86/fixmap.h | 1 - 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 428e097..13c0306 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -194,7 +194,7 @@ and reboots. If set, override Xen's calculation of the level 2 cache line size. ### clocksource -> `= pit | hpet | cyclone | acpi` +> `= pit | hpet | acpi` If set, override Xen's default choice for the platform timer. diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c31029c..c1bbd50 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -39,7 +39,7 @@ #include /* for early_time_init */ #include -/* opt_clocksource: Force clocksource to one of: pit, hpet, cyclone, acpi. */ +/* opt_clocksource: Force clocksource to one of: pit, hpet, acpi. */ static char __initdata opt_clocksource[10]; string_param("clocksource", opt_clocksource); @@ -378,72 +378,7 @@ static struct platform_timesource __initdata plt_hpet = }; /************************************************************ - * PLATFORM TIMER 3: IBM 'CYCLONE' TIMER - */ - -bool_t __initdata use_cyclone; - -/* - * Although the counter is read via a 64-bit register, I believe it is actually - * a 40-bit counter. Since this will wrap, I read only the low 32 bits and - * periodically fold into a 64-bit software counter, just as for PIT and HPET. - */ -#define CYCLONE_CBAR_ADDR 0xFEB00CD0 -#define CYCLONE_PMCC_OFFSET 0x51A0 -#define CYCLONE_MPMC_OFFSET 0x51D0 -#define CYCLONE_MPCS_OFFSET 0x51A8 -#define CYCLONE_TIMER_FREQ 100000000 - -/* Cyclone MPMC0 register. */ -static volatile u32 *__read_mostly cyclone_timer; - -static u64 read_cyclone_count(void) -{ - return *cyclone_timer; -} - -static volatile u32 *__init map_cyclone_reg(unsigned long regaddr) -{ - unsigned long pageaddr = regaddr & PAGE_MASK; - unsigned long offset = regaddr & ~PAGE_MASK; - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - return (volatile u32 *)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); -} - -static int __init init_cyclone(struct platform_timesource *pts) -{ - u32 base; - - if ( !use_cyclone ) - return 0; - - /* Find base address. */ - base = *(map_cyclone_reg(CYCLONE_CBAR_ADDR)); - if ( base == 0 ) - { - printk(KERN_ERR "Cyclone: Could not find valid CBAR value.\n"); - return 0; - } - - /* Enable timer and map the counter register. */ - *(map_cyclone_reg(base + CYCLONE_PMCC_OFFSET)) = 1; - *(map_cyclone_reg(base + CYCLONE_MPCS_OFFSET)) = 1; - cyclone_timer = map_cyclone_reg(base + CYCLONE_MPMC_OFFSET); - return 1; -} - -static struct platform_timesource __initdata plt_cyclone = -{ - .id = "cyclone", - .name = "IBM Cyclone", - .frequency = CYCLONE_TIMER_FREQ, - .read_counter = read_cyclone_count, - .counter_bits = 32, - .init = init_cyclone -}; - -/************************************************************ - * PLATFORM TIMER 4: ACPI PM TIMER + * PLATFORM TIMER 3: ACPI PM TIMER */ u32 __read_mostly pmtmr_ioport; @@ -600,7 +535,7 @@ static void resume_platform_timer(void) static void __init init_platform_timer(void) { static struct platform_timesource * __initdata plt_timers[] = { - &plt_cyclone, &plt_hpet, &plt_pmtimer, &plt_pit + &plt_hpet, &plt_pmtimer, &plt_pit }; struct platform_timesource *pts = NULL; diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 029dc3e..d850be4 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -56,7 +56,6 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, FIX_HPET_BASE, - FIX_CYCLONE_TIMER, FIX_KEXEC_BASE_0, FIX_KEXEC_BASE_END = FIX_KEXEC_BASE_0 \ + ((KEXEC_XEN_NO_PAGES >> 1) * KEXEC_IMAGE_NR) - 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 Sun Sep 08 15:23:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15: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 1VIgpI-0006Kp-4W; Sun, 08 Sep 2013 15:23:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpG-0006KR-9o for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:58 +0000 Received: from [193.109.254.147:4368] by server-13.bemta-14.messagelabs.com id D0/33-01215-1569C225; Sun, 08 Sep 2013 15:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653775!246441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4331 invoked from network); 8 Sep 2013 15:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpD-00032f-Ij for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpD-0004hL-Db for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:22:55 +0000 Date: Sun, 08 Sep 2013 15:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: remove Cyclone as a platform timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 483814219bc4d47db8a56116290ec7878b794c09 Author: Matt Wilson AuthorDate: Tue Aug 27 11:23:09 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:23:09 2013 +0200 x86/time: remove Cyclone as a platform timer The Cyclone time source was part of IBM's Summit chipset, which was only used for 32-bit only ccNUMA and IA-64 machines. Neither of these are supported by Xen anymore. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/time.c | 71 +--------------------------------- xen/include/asm-x86/fixmap.h | 1 - 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 428e097..13c0306 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -194,7 +194,7 @@ and reboots. If set, override Xen's calculation of the level 2 cache line size. ### clocksource -> `= pit | hpet | cyclone | acpi` +> `= pit | hpet | acpi` If set, override Xen's default choice for the platform timer. diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c31029c..c1bbd50 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -39,7 +39,7 @@ #include /* for early_time_init */ #include -/* opt_clocksource: Force clocksource to one of: pit, hpet, cyclone, acpi. */ +/* opt_clocksource: Force clocksource to one of: pit, hpet, acpi. */ static char __initdata opt_clocksource[10]; string_param("clocksource", opt_clocksource); @@ -378,72 +378,7 @@ static struct platform_timesource __initdata plt_hpet = }; /************************************************************ - * PLATFORM TIMER 3: IBM 'CYCLONE' TIMER - */ - -bool_t __initdata use_cyclone; - -/* - * Although the counter is read via a 64-bit register, I believe it is actually - * a 40-bit counter. Since this will wrap, I read only the low 32 bits and - * periodically fold into a 64-bit software counter, just as for PIT and HPET. - */ -#define CYCLONE_CBAR_ADDR 0xFEB00CD0 -#define CYCLONE_PMCC_OFFSET 0x51A0 -#define CYCLONE_MPMC_OFFSET 0x51D0 -#define CYCLONE_MPCS_OFFSET 0x51A8 -#define CYCLONE_TIMER_FREQ 100000000 - -/* Cyclone MPMC0 register. */ -static volatile u32 *__read_mostly cyclone_timer; - -static u64 read_cyclone_count(void) -{ - return *cyclone_timer; -} - -static volatile u32 *__init map_cyclone_reg(unsigned long regaddr) -{ - unsigned long pageaddr = regaddr & PAGE_MASK; - unsigned long offset = regaddr & ~PAGE_MASK; - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - return (volatile u32 *)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); -} - -static int __init init_cyclone(struct platform_timesource *pts) -{ - u32 base; - - if ( !use_cyclone ) - return 0; - - /* Find base address. */ - base = *(map_cyclone_reg(CYCLONE_CBAR_ADDR)); - if ( base == 0 ) - { - printk(KERN_ERR "Cyclone: Could not find valid CBAR value.\n"); - return 0; - } - - /* Enable timer and map the counter register. */ - *(map_cyclone_reg(base + CYCLONE_PMCC_OFFSET)) = 1; - *(map_cyclone_reg(base + CYCLONE_MPCS_OFFSET)) = 1; - cyclone_timer = map_cyclone_reg(base + CYCLONE_MPMC_OFFSET); - return 1; -} - -static struct platform_timesource __initdata plt_cyclone = -{ - .id = "cyclone", - .name = "IBM Cyclone", - .frequency = CYCLONE_TIMER_FREQ, - .read_counter = read_cyclone_count, - .counter_bits = 32, - .init = init_cyclone -}; - -/************************************************************ - * PLATFORM TIMER 4: ACPI PM TIMER + * PLATFORM TIMER 3: ACPI PM TIMER */ u32 __read_mostly pmtmr_ioport; @@ -600,7 +535,7 @@ static void resume_platform_timer(void) static void __init init_platform_timer(void) { static struct platform_timesource * __initdata plt_timers[] = { - &plt_cyclone, &plt_hpet, &plt_pmtimer, &plt_pit + &plt_hpet, &plt_pmtimer, &plt_pit }; struct platform_timesource *pts = NULL; diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 029dc3e..d850be4 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -56,7 +56,6 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, FIX_HPET_BASE, - FIX_CYCLONE_TIMER, FIX_KEXEC_BASE_0, FIX_KEXEC_BASE_END = FIX_KEXEC_BASE_0 \ + ((KEXEC_XEN_NO_PAGES >> 1) * KEXEC_IMAGE_NR) - 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 Sun Sep 08 15:23:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpS-0006Ms-7W; Sun, 08 Sep 2013 15:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpQ-0006MN-BN for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:08 +0000 Received: from [193.109.254.147:3865] by server-16.bemta-14.messagelabs.com id 61/39-06264-B569C225; Sun, 08 Sep 2013 15:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378653786!1501738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28115 invoked from network); 8 Sep 2013 15:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpN-00033E-RA for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpN-0004hu-ME for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:05 +0000 Date: Sun, 08 Sep 2013 15:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/boot: Explicitly clean pcpu stacks in debug builds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a3c4acc9907cfec9aae9f1bc251fbf50af6828e Author: Andrew Cooper AuthorDate: Tue Aug 27 11:28:26 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:28:26 2013 +0200 x86/boot: Explicitly clean pcpu stacks in debug builds This reduces confusion when looking at a hexdump of the pcpu stacks and wondering were on earth some of the junk was coming from. Also leave some grep fodder for finding where the BSP switches stack (because it took me far longer to find than I care to admit to). Signed-off-by: Andrew Cooper --- xen/arch/x86/boot/x86_64.S | 9 +++++++++ xen/arch/x86/smpboot.c | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index ed3888d..399541d 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -13,6 +13,15 @@ mov mmu_cr4_features(%rip),%rcx mov %rcx,%cr4 +#ifndef NDEBUG + /* Clean stack. */ + mov stack_start(%rip),%rdi + mov $(STACK_SIZE / 8),%rcx + xor %eax,%eax + rep stosq +#endif + + /* Switch to cpu0_stack. */ mov stack_start(%rip),%rsp or $(STACK_SIZE-CPUINFO_sizeof),%rsp diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 9f81c7b..8bfa151 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -659,6 +659,10 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, 0); if ( stack_base[cpu] == NULL ) goto oom; +#ifndef NDEBUG + for ( order = 0 ; order < (1< Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpS-0006Ms-7W; Sun, 08 Sep 2013 15:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpQ-0006MN-BN for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:08 +0000 Received: from [193.109.254.147:3865] by server-16.bemta-14.messagelabs.com id 61/39-06264-B569C225; Sun, 08 Sep 2013 15:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378653786!1501738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28115 invoked from network); 8 Sep 2013 15:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpN-00033E-RA for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpN-0004hu-ME for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:05 +0000 Date: Sun, 08 Sep 2013 15:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/boot: Explicitly clean pcpu stacks in debug builds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a3c4acc9907cfec9aae9f1bc251fbf50af6828e Author: Andrew Cooper AuthorDate: Tue Aug 27 11:28:26 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:28:26 2013 +0200 x86/boot: Explicitly clean pcpu stacks in debug builds This reduces confusion when looking at a hexdump of the pcpu stacks and wondering were on earth some of the junk was coming from. Also leave some grep fodder for finding where the BSP switches stack (because it took me far longer to find than I care to admit to). Signed-off-by: Andrew Cooper --- xen/arch/x86/boot/x86_64.S | 9 +++++++++ xen/arch/x86/smpboot.c | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index ed3888d..399541d 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -13,6 +13,15 @@ mov mmu_cr4_features(%rip),%rcx mov %rcx,%cr4 +#ifndef NDEBUG + /* Clean stack. */ + mov stack_start(%rip),%rdi + mov $(STACK_SIZE / 8),%rcx + xor %eax,%eax + rep stosq +#endif + + /* Switch to cpu0_stack. */ mov stack_start(%rip),%rsp or $(STACK_SIZE-CPUINFO_sizeof),%rsp diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 9f81c7b..8bfa151 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -659,6 +659,10 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, 0); if ( stack_base[cpu] == NULL ) goto oom; +#ifndef NDEBUG + for ( order = 0 ; order < (1< Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpc-0006Ow-An; Sun, 08 Sep 2013 15:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpa-0006Oa-O9 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:18 +0000 Received: from [193.109.254.147:38482] by server-15.bemta-14.messagelabs.com id 11/3E-10716-5669C225; Sun, 08 Sep 2013 15:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1378653796!1496470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1184 invoked from network); 8 Sep 2013 15:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpY-00033M-BP for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpX-0004jA-Up for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:16 +0000 Date: Sun, 08 Sep 2013 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix gdbstub build c/s c8177e691f X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44db24103ff1c53a13afebf4d72ad853cee07786 Author: Andrew Cooper AuthorDate: Tue Aug 27 11:29:03 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:29:03 2013 +0200 fix gdbstub build c/s c8177e691f That changeset moved the watchdog functions from nmi.h to their own watchdog.h. I thought I had updated all relevant header files and the compiler was happy as well. However, gdbstub is not even compiled by default, and I accidentally missed it. Signed-off-by: Andrew Cooper --- xen/common/gdbstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c index 2baa91a..67ff726 100644 --- a/xen/common/gdbstub.c +++ b/xen/common/gdbstub.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpc-0006Ow-An; Sun, 08 Sep 2013 15:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpa-0006Oa-O9 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:18 +0000 Received: from [193.109.254.147:38482] by server-15.bemta-14.messagelabs.com id 11/3E-10716-5669C225; Sun, 08 Sep 2013 15:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1378653796!1496470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1184 invoked from network); 8 Sep 2013 15:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpY-00033M-BP for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpX-0004jA-Up for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:16 +0000 Date: Sun, 08 Sep 2013 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix gdbstub build c/s c8177e691f X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44db24103ff1c53a13afebf4d72ad853cee07786 Author: Andrew Cooper AuthorDate: Tue Aug 27 11:29:03 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 11:29:03 2013 +0200 fix gdbstub build c/s c8177e691f That changeset moved the watchdog functions from nmi.h to their own watchdog.h. I thought I had updated all relevant header files and the compiler was happy as well. However, gdbstub is not even compiled by default, and I accidentally missed it. Signed-off-by: Andrew Cooper --- xen/common/gdbstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c index 2baa91a..67ff726 100644 --- a/xen/common/gdbstub.c +++ b/xen/common/gdbstub.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpm-0006Qx-Df; Sun, 08 Sep 2013 15:23:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpl-0006Qi-0k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:29 +0000 Received: from [85.158.143.35:14648] by server-3.bemta-4.messagelabs.com id DF/55-08835-0769C225; Sun, 08 Sep 2013 15:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378653806!2196754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10370 invoked from network); 8 Sep 2013 15:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpi-00033S-Hs for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpi-0004jW-EQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:26 +0000 Date: Sun, 08 Sep 2013 15:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: add Debian extlinux.conf 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 258d27a1d9fb33a490bef1381f52d522225c3dca Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Aug 27 12:13:00 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 363fbc7..ee4e741 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpm-0006Qx-Df; Sun, 08 Sep 2013 15:23:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpl-0006Qi-0k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:29 +0000 Received: from [85.158.143.35:14648] by server-3.bemta-4.messagelabs.com id DF/55-08835-0769C225; Sun, 08 Sep 2013 15:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378653806!2196754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10370 invoked from network); 8 Sep 2013 15:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpi-00033S-Hs for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgpi-0004jW-EQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:26 +0000 Date: Sun, 08 Sep 2013 15:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: add Debian extlinux.conf 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 258d27a1d9fb33a490bef1381f52d522225c3dca Author: Ian Campbell AuthorDate: Fri Aug 16 15:21:05 2013 +0100 Commit: Ian Jackson CommitDate: Tue Aug 27 12:13:00 2013 +0100 pygrub: add Debian extlinux.conf path This is Debian bug #697407. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697407 Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/pygrub/src/pygrub | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 363fbc7..ee4e741 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -430,6 +430,7 @@ class Grub: "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), ["/boot/isolinux/isolinux.cfg", + "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf"]) + \ map(lambda x: (x,grub.GrubConf.GrubConfigFile), ["/boot/grub/menu.lst", "/boot/grub/grub.conf", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpw-0006Sw-Gg; Sun, 08 Sep 2013 15:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpv-0006Si-7s for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:39 +0000 Received: from [85.158.143.35:6350] by server-1.bemta-4.messagelabs.com id 91/E1-16125-A769C225; Sun, 08 Sep 2013 15:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378653817!2186295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31348 invoked from network); 8 Sep 2013 15:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgps-00033a-Qg for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgps-0004jx-L8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:36 +0000 Date: Sun, 08 Sep 2013 15:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/boot: Explicitly clean pcpu stacks in debug builds" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e15c09f90c6629ef36bf6b4d5534dfc3b0b3de01 Author: Jan Beulich AuthorDate: Tue Aug 27 15:13:20 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 15:13:20 2013 +0200 Revert "x86/boot: Explicitly clean pcpu stacks in debug builds" This reverts commit 8a3c4acc9907cfec9aae9f1bc251fbf50af6828e. It's reportedly broken. --- xen/arch/x86/boot/x86_64.S | 9 --------- xen/arch/x86/smpboot.c | 4 ---- 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 399541d..ed3888d 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -13,15 +13,6 @@ mov mmu_cr4_features(%rip),%rcx mov %rcx,%cr4 -#ifndef NDEBUG - /* Clean stack. */ - mov stack_start(%rip),%rdi - mov $(STACK_SIZE / 8),%rcx - xor %eax,%eax - rep stosq -#endif - - /* Switch to cpu0_stack. */ mov stack_start(%rip),%rsp or $(STACK_SIZE-CPUINFO_sizeof),%rsp diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 8bfa151..9f81c7b 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -659,10 +659,6 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, 0); if ( stack_base[cpu] == NULL ) goto oom; -#ifndef NDEBUG - for ( order = 0 ; order < (1< Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpw-0006Sw-Gg; Sun, 08 Sep 2013 15:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgpv-0006Si-7s for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:39 +0000 Received: from [85.158.143.35:6350] by server-1.bemta-4.messagelabs.com id 91/E1-16125-A769C225; Sun, 08 Sep 2013 15:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378653817!2186295!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31348 invoked from network); 8 Sep 2013 15:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgps-00033a-Qg for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgps-0004jx-L8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:36 +0000 Date: Sun, 08 Sep 2013 15:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/boot: Explicitly clean pcpu stacks in debug builds" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e15c09f90c6629ef36bf6b4d5534dfc3b0b3de01 Author: Jan Beulich AuthorDate: Tue Aug 27 15:13:20 2013 +0200 Commit: Jan Beulich CommitDate: Tue Aug 27 15:13:20 2013 +0200 Revert "x86/boot: Explicitly clean pcpu stacks in debug builds" This reverts commit 8a3c4acc9907cfec9aae9f1bc251fbf50af6828e. It's reportedly broken. --- xen/arch/x86/boot/x86_64.S | 9 --------- xen/arch/x86/smpboot.c | 4 ---- 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 399541d..ed3888d 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -13,15 +13,6 @@ mov mmu_cr4_features(%rip),%rcx mov %rcx,%cr4 -#ifndef NDEBUG - /* Clean stack. */ - mov stack_start(%rip),%rdi - mov $(STACK_SIZE / 8),%rcx - xor %eax,%eax - rep stosq -#endif - - /* Switch to cpu0_stack. */ mov stack_start(%rip),%rsp or $(STACK_SIZE-CPUINFO_sizeof),%rsp diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 8bfa151..9f81c7b 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -659,10 +659,6 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, 0); if ( stack_base[cpu] == NULL ) goto oom; -#ifndef NDEBUG - for ( order = 0 ; order < (1< Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq7-0006V2-Jp; Sun, 08 Sep 2013 15:23:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq5-0006Uc-HK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:49 +0000 Received: from [85.158.139.211:56771] by server-8.bemta-5.messagelabs.com id A5/BF-17437-4869C225; Sun, 08 Sep 2013 15:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378653827!1303241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3496 invoked from network); 8 Sep 2013 15:23:48 -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 Sep 2013 15:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq3-00033g-1d for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgq2-0004kJ-UL for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:46 +0000 Date: Sun, 08 Sep 2013 15:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drivers/char: pl011: Enable receive timeout interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c413bf7f2ff372e00d2d78a8904a0ade2420f0a Author: Julien Grall AuthorDate: Tue Aug 27 13:13:35 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:25:43 2013 +0100 drivers/char: pl011: Enable receive timeout interrupt The commit 874f76a "PL011: fix reverse logic for interrupt mask register" introduced regression on the Versatile Express. The board didn't receive correctly input. The timeout interrupt may be asserted when the FIFO is not empty, and no futher data is received over a 32-bit period. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/char/pl011.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 0e1eb64..e4bd702 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -140,7 +140,7 @@ static void __init pl011_init_postirq(struct serial_port *port) pl011_write(uart, ICR, OEI|BEI|PEI|FEI); /* Unmask interrupts */ - pl011_write(uart, IMSC, OEI|BEI|PEI|FEI|TXI|RXI); + pl011_write(uart, IMSC, RTI|OEI|BEI|PEI|FEI|TXI|RXI); } static void pl011_suspend(struct serial_port *port) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:23:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:23:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq7-0006V2-Jp; Sun, 08 Sep 2013 15:23:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq5-0006Uc-HK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:49 +0000 Received: from [85.158.139.211:56771] by server-8.bemta-5.messagelabs.com id A5/BF-17437-4869C225; Sun, 08 Sep 2013 15:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378653827!1303241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3496 invoked from network); 8 Sep 2013 15:23:48 -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 Sep 2013 15:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgq3-00033g-1d for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgq2-0004kJ-UL for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:46 +0000 Date: Sun, 08 Sep 2013 15:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drivers/char: pl011: Enable receive timeout interrupt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c413bf7f2ff372e00d2d78a8904a0ade2420f0a Author: Julien Grall AuthorDate: Tue Aug 27 13:13:35 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:25:43 2013 +0100 drivers/char: pl011: Enable receive timeout interrupt The commit 874f76a "PL011: fix reverse logic for interrupt mask register" introduced regression on the Versatile Express. The board didn't receive correctly input. The timeout interrupt may be asserted when the FIFO is not empty, and no futher data is received over a 32-bit period. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/char/pl011.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 0e1eb64..e4bd702 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -140,7 +140,7 @@ static void __init pl011_init_postirq(struct serial_port *port) pl011_write(uart, ICR, OEI|BEI|PEI|FEI); /* Unmask interrupts */ - pl011_write(uart, IMSC, OEI|BEI|PEI|FEI|TXI|RXI); + pl011_write(uart, IMSC, RTI|OEI|BEI|PEI|FEI|TXI|RXI); } static void pl011_suspend(struct serial_port *port) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24: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 1VIgqI-0006X5-Dd; Sun, 08 Sep 2013 15:24:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqF-0006Wp-VM for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:00 +0000 Received: from [85.158.143.35:6826] by server-2.bemta-4.messagelabs.com id 0F/DC-26052-F869C225; Sun, 08 Sep 2013 15:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1378653837!2180695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18441 invoked from network); 8 Sep 2013 15:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqD-00033p-8O for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqD-0004kg-5J for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:57 +0000 Date: Sun, 08 Sep 2013 15:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce and use GLOBAL() in asm code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 604ab14cde7aef3bcdd7bc3bc398e7d1705dc631 Author: Andrew Cooper AuthorDate: Mon Aug 26 20:18:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:26:31 2013 +0100 xen/arm: Introduce and use GLOBAL() in asm code. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/arm/arm32/debug.S | 6 ++---- xen/arch/arm/arm32/entry.S | 3 +-- xen/arch/arm/arm32/mode_switch.S | 7 ++----- xen/arch/arm/arm32/proc-v7.S | 3 +-- xen/arch/arm/arm64/debug.S | 6 ++---- xen/arch/arm/arm64/mode_switch.S | 4 +--- xen/include/asm-arm/config.h | 3 +++ 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S index 92f5724..ec774cd 100644 --- a/xen/arch/arm/arm32/debug.S +++ b/xen/arch/arm/arm32/debug.S @@ -23,18 +23,16 @@ #include EARLY_PRINTK_INC #endif -.globl early_putch /* Print a character on the UART - this function is called by C * r0: character to print */ -early_putch: +GLOBAL(early_putch) ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ early_uart_ready r1, r2 early_uart_transmit r1, r0 mov pc, lr -.globl early_flush /* Flush the UART - this function is called by C */ -early_flush: +GLOBAL(early_flush) ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ early_uart_ready r1, r2 mov pc, lr diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index 81d5990..774e7c6 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -65,9 +65,8 @@ trap_##trap: \ bic sp, #7; /* Align the stack pointer (noop on guest trap) */ \ b do_trap_##trap -.globl hyp_traps_vector .align 5 -hyp_traps_vector: +GLOBAL(hyp_traps_vector) .word 0 /* 0x00 - Reset */ b trap_undefined_instruction /* 0x04 - Undefined Instruction */ b trap_supervisor_call /* 0x08 - Supervisor Call */ diff --git a/xen/arch/arm/arm32/mode_switch.S b/xen/arch/arm/arm32/mode_switch.S index 3500eb0..2cd5888 100644 --- a/xen/arch/arm/arm32/mode_switch.S +++ b/xen/arch/arm/arm32/mode_switch.S @@ -29,8 +29,7 @@ * TODO: Move this code either later (via platform specific desc) or in a bootwrapper * r5: Machine ID * Clobber r0 r2 */ -.globl kick_cpus -kick_cpus: +GLOBAL(kick_cpus) ldr r0, =MACH_TYPE_SMDK5250 teq r5, r0 /* Are we running on the arndale? */ beq kick_cpus_arndale @@ -79,9 +78,7 @@ kick_cpus_sgi: * integration with the bootloader/firmware so that Xen always starts * in Hyp mode. * Clobber r0 - r4 */ - -.globl enter_hyp_mode -enter_hyp_mode: +GLOBAL(enter_hyp_mode) mov r3, lr /* Put return address in non-banked reg */ cpsid aif, #0x16 /* Enter Monitor mode */ mrc CP32(r0, SCR) diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 0ab3845..e38d5a4 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -20,8 +20,7 @@ #include #include -.globl v7_init -v7_init: +GLOBAL(v7_init) /* Set up the SMP bit in ACTLR */ mrc CP32(r0, ACTLR) orr r0, r0, #(ACTLR_V7_SMP) /* enable SMP bit */ diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index c7b5e6c..472c157 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -23,18 +23,16 @@ #include EARLY_PRINTK_INC #endif -.globl early_putch /* Print a character on the UART - this function is called by C * x0: character to print */ -early_putch: +GLOBAL(early_putch) ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) early_uart_ready x15, 1 early_uart_transmit x15, w0 ret -.globl early_flush /* Flush the UART - this function is called by C */ -early_flush: +GLOBAL(early_flush) ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* x15 := VA UART base address */ early_uart_ready x15, 1 ret diff --git a/xen/arch/arm/arm64/mode_switch.S b/xen/arch/arm/arm64/mode_switch.S index 4125ac4..ea64f22 100644 --- a/xen/arch/arm/arm64/mode_switch.S +++ b/xen/arch/arm/arm64/mode_switch.S @@ -34,9 +34,7 @@ * integration with the bootloader/firmware so that Xen always starts * at EL2. */ - -.globl enter_el2_mode -enter_el2_mode: +GLOBAL(enter_el2_mode) mov x0, #0x30 // RES1 orr x0, x0, #(1 << 0) // Non-secure EL1 orr x0, x0, #(1 << 8) // HVC enable diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 259d4c6..604088e 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -63,6 +63,9 @@ .globl name; \ ALIGN; \ name: +#define GLOBAL(name) \ + .globl name; \ + name: #define END(name) \ .size name, .-name #define ENDPROC(name) \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24: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 1VIgqI-0006X5-Dd; Sun, 08 Sep 2013 15:24:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqF-0006Wp-VM for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:00 +0000 Received: from [85.158.143.35:6826] by server-2.bemta-4.messagelabs.com id 0F/DC-26052-F869C225; Sun, 08 Sep 2013 15:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1378653837!2180695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18441 invoked from network); 8 Sep 2013 15:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqD-00033p-8O for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqD-0004kg-5J for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:23:57 +0000 Date: Sun, 08 Sep 2013 15:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce and use GLOBAL() in asm code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 604ab14cde7aef3bcdd7bc3bc398e7d1705dc631 Author: Andrew Cooper AuthorDate: Mon Aug 26 20:18:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:26:31 2013 +0100 xen/arm: Introduce and use GLOBAL() in asm code. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/arm/arm32/debug.S | 6 ++---- xen/arch/arm/arm32/entry.S | 3 +-- xen/arch/arm/arm32/mode_switch.S | 7 ++----- xen/arch/arm/arm32/proc-v7.S | 3 +-- xen/arch/arm/arm64/debug.S | 6 ++---- xen/arch/arm/arm64/mode_switch.S | 4 +--- xen/include/asm-arm/config.h | 3 +++ 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S index 92f5724..ec774cd 100644 --- a/xen/arch/arm/arm32/debug.S +++ b/xen/arch/arm/arm32/debug.S @@ -23,18 +23,16 @@ #include EARLY_PRINTK_INC #endif -.globl early_putch /* Print a character on the UART - this function is called by C * r0: character to print */ -early_putch: +GLOBAL(early_putch) ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ early_uart_ready r1, r2 early_uart_transmit r1, r0 mov pc, lr -.globl early_flush /* Flush the UART - this function is called by C */ -early_flush: +GLOBAL(early_flush) ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ early_uart_ready r1, r2 mov pc, lr diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index 81d5990..774e7c6 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -65,9 +65,8 @@ trap_##trap: \ bic sp, #7; /* Align the stack pointer (noop on guest trap) */ \ b do_trap_##trap -.globl hyp_traps_vector .align 5 -hyp_traps_vector: +GLOBAL(hyp_traps_vector) .word 0 /* 0x00 - Reset */ b trap_undefined_instruction /* 0x04 - Undefined Instruction */ b trap_supervisor_call /* 0x08 - Supervisor Call */ diff --git a/xen/arch/arm/arm32/mode_switch.S b/xen/arch/arm/arm32/mode_switch.S index 3500eb0..2cd5888 100644 --- a/xen/arch/arm/arm32/mode_switch.S +++ b/xen/arch/arm/arm32/mode_switch.S @@ -29,8 +29,7 @@ * TODO: Move this code either later (via platform specific desc) or in a bootwrapper * r5: Machine ID * Clobber r0 r2 */ -.globl kick_cpus -kick_cpus: +GLOBAL(kick_cpus) ldr r0, =MACH_TYPE_SMDK5250 teq r5, r0 /* Are we running on the arndale? */ beq kick_cpus_arndale @@ -79,9 +78,7 @@ kick_cpus_sgi: * integration with the bootloader/firmware so that Xen always starts * in Hyp mode. * Clobber r0 - r4 */ - -.globl enter_hyp_mode -enter_hyp_mode: +GLOBAL(enter_hyp_mode) mov r3, lr /* Put return address in non-banked reg */ cpsid aif, #0x16 /* Enter Monitor mode */ mrc CP32(r0, SCR) diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 0ab3845..e38d5a4 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -20,8 +20,7 @@ #include #include -.globl v7_init -v7_init: +GLOBAL(v7_init) /* Set up the SMP bit in ACTLR */ mrc CP32(r0, ACTLR) orr r0, r0, #(ACTLR_V7_SMP) /* enable SMP bit */ diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index c7b5e6c..472c157 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -23,18 +23,16 @@ #include EARLY_PRINTK_INC #endif -.globl early_putch /* Print a character on the UART - this function is called by C * x0: character to print */ -early_putch: +GLOBAL(early_putch) ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) early_uart_ready x15, 1 early_uart_transmit x15, w0 ret -.globl early_flush /* Flush the UART - this function is called by C */ -early_flush: +GLOBAL(early_flush) ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* x15 := VA UART base address */ early_uart_ready x15, 1 ret diff --git a/xen/arch/arm/arm64/mode_switch.S b/xen/arch/arm/arm64/mode_switch.S index 4125ac4..ea64f22 100644 --- a/xen/arch/arm/arm64/mode_switch.S +++ b/xen/arch/arm/arm64/mode_switch.S @@ -34,9 +34,7 @@ * integration with the bootloader/firmware so that Xen always starts * at EL2. */ - -.globl enter_el2_mode -enter_el2_mode: +GLOBAL(enter_el2_mode) mov x0, #0x30 // RES1 orr x0, x0, #(1 << 0) // Non-secure EL1 orr x0, x0, #(1 << 8) // HVC enable diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 259d4c6..604088e 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -63,6 +63,9 @@ .globl name; \ ALIGN; \ name: +#define GLOBAL(name) \ + .globl name; \ + name: #define END(name) \ .size name, .-name #define ENDPROC(name) \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqR-0006ZC-MP; Sun, 08 Sep 2013 15:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqQ-0006Yr-5i for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:10 +0000 Received: from [85.158.137.68:9671] by server-1.bemta-3.messagelabs.com id CB/80-17041-9969C225; Sun, 08 Sep 2013 15:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378653847!812201!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23601 invoked from network); 8 Sep 2013 15:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqN-00034c-Ek for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqN-0004lC-Da for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:07 +0000 Date: Sun, 08 Sep 2013 15:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add lower-bound check in mfn_valid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceb93c72d2046bffecd57fcbebd04aa0801414a2 Author: Jaeyong Yoo AuthorDate: Fri Aug 23 18:08:41 2013 +0900 Commit: Ian Campbell CommitDate: Tue Aug 27 14:27:26 2013 +0100 xen/arm: add lower-bound check in mfn_valid mfn_valid only checks the upper-bound of mfn (max_page). Add the lower-bound check of mfn (frametable_base_mfn). Signed-off-by: Jaeyong Yoo Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/mm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 27284d0..97c2ee0 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -190,7 +190,7 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define mfn_valid(mfn) ({ \ unsigned long __m_f_n = (mfn); \ - likely(__m_f_n < max_page); \ + likely(__m_f_n >= frametable_base_mfn && __m_f_n < max_page); \ }) #define max_pdx max_page -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqR-0006ZC-MP; Sun, 08 Sep 2013 15:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqQ-0006Yr-5i for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:10 +0000 Received: from [85.158.137.68:9671] by server-1.bemta-3.messagelabs.com id CB/80-17041-9969C225; Sun, 08 Sep 2013 15:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378653847!812201!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23601 invoked from network); 8 Sep 2013 15:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqN-00034c-Ek for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqN-0004lC-Da for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:07 +0000 Date: Sun, 08 Sep 2013 15:24:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add lower-bound check in mfn_valid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceb93c72d2046bffecd57fcbebd04aa0801414a2 Author: Jaeyong Yoo AuthorDate: Fri Aug 23 18:08:41 2013 +0900 Commit: Ian Campbell CommitDate: Tue Aug 27 14:27:26 2013 +0100 xen/arm: add lower-bound check in mfn_valid mfn_valid only checks the upper-bound of mfn (max_page). Add the lower-bound check of mfn (frametable_base_mfn). Signed-off-by: Jaeyong Yoo Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/mm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 27284d0..97c2ee0 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -190,7 +190,7 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define mfn_valid(mfn) ({ \ unsigned long __m_f_n = (mfn); \ - likely(__m_f_n < max_page); \ + likely(__m_f_n >= frametable_base_mfn && __m_f_n < max_page); \ }) #define max_pdx max_page -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24: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 1VIgqb-0006bR-PR; Sun, 08 Sep 2013 15:24:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqa-0006b7-3V for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:20 +0000 Received: from [193.109.254.147:39751] by server-3.bemta-14.messagelabs.com id 9F/6B-11293-3A69C225; Sun, 08 Sep 2013 15:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378653857!1502795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7793 invoked from network); 8 Sep 2013 15:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqX-00034i-Lu for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqX-0004m6-Hd for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:17 +0000 Date: Sun, 08 Sep 2013 15:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pl011: early_panic if baud rate not set in hardware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2050ad703c65ed997f1328af702054d1960fb168 Author: Ian Campbell AuthorDate: Thu Aug 22 17:01:59 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:35:44 2013 +0100 pl011: early_panic if baud rate not set in hardware Now that the driver defaults to BAUD_AUTO this can happen if the early uart != console or if early printk isn't in use. The following division by zero causes a trap but that uses regular printk and not early_printk, so it is never seen. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/drivers/char/pl011.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index e4bd702..3ea0d41 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -104,6 +104,8 @@ static void __init pl011_init_preirq(struct serial_port *port) { /* Baud rate already set: read it out from the divisor latch. */ divisor = (pl011_read(uart, IBRD) << 6) | (pl011_read(uart, FBRD)); + if (!divisor) + early_panic("pl011: No Baud rate configured\n"); uart->baud = (uart->clock_hz << 2) / divisor; } /* This write must follow FBRD and IBRD writes. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24: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 1VIgqb-0006bR-PR; Sun, 08 Sep 2013 15:24:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqa-0006b7-3V for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:20 +0000 Received: from [193.109.254.147:39751] by server-3.bemta-14.messagelabs.com id 9F/6B-11293-3A69C225; Sun, 08 Sep 2013 15:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378653857!1502795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7793 invoked from network); 8 Sep 2013 15:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqX-00034i-Lu for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqX-0004m6-Hd for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:17 +0000 Date: Sun, 08 Sep 2013 15:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pl011: early_panic if baud rate not set in hardware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2050ad703c65ed997f1328af702054d1960fb168 Author: Ian Campbell AuthorDate: Thu Aug 22 17:01:59 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:35:44 2013 +0100 pl011: early_panic if baud rate not set in hardware Now that the driver defaults to BAUD_AUTO this can happen if the early uart != console or if early printk isn't in use. The following division by zero causes a trap but that uses regular printk and not early_printk, so it is never seen. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/drivers/char/pl011.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index e4bd702..3ea0d41 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -104,6 +104,8 @@ static void __init pl011_init_preirq(struct serial_port *port) { /* Baud rate already set: read it out from the divisor latch. */ divisor = (pl011_read(uart, IBRD) << 6) | (pl011_read(uart, FBRD)); + if (!divisor) + early_panic("pl011: No Baud rate configured\n"); uart->baud = (uart->clock_hz << 2) / divisor; } /* This write must follow FBRD and IBRD writes. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgql-0006dF-SH; Sun, 08 Sep 2013 15:24:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqk-0006d2-NS for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:30 +0000 Received: from [85.158.139.211:58869] by server-17.bemta-5.messagelabs.com id 0A/52-19396-DA69C225; Sun, 08 Sep 2013 15:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1378653868!1313358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24470 invoked from network); 8 Sep 2013 15:24:29 -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; 8 Sep 2013 15:24:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqi-00034q-0Z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqh-0004mS-R1 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:27 +0000 Date: Sun, 08 Sep 2013 15:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: indicate when we have early paniced X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca617a664aed71503695b6a9498963a5e9dddb24 Author: Ian Campbell AuthorDate: Thu Aug 22 17:01:57 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:36:07 2013 +0100 xen: arm: indicate when we have early paniced Otherwise the hypervisor simply appears to stop after a message which may or may not look all that severe. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/early_printk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index ca151a5..058d044 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -61,5 +61,7 @@ early_panic(const char *fmt, ...) early_vprintk(fmt, args); va_end(args); + early_printk("\nEarly Panic: Stopping\n"); + while(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 Sun Sep 08 15:24:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgql-0006dF-SH; Sun, 08 Sep 2013 15:24:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqk-0006d2-NS for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:30 +0000 Received: from [85.158.139.211:58869] by server-17.bemta-5.messagelabs.com id 0A/52-19396-DA69C225; Sun, 08 Sep 2013 15:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1378653868!1313358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24470 invoked from network); 8 Sep 2013 15:24:29 -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; 8 Sep 2013 15:24:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqi-00034q-0Z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqh-0004mS-R1 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:27 +0000 Date: Sun, 08 Sep 2013 15:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: indicate when we have early paniced X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca617a664aed71503695b6a9498963a5e9dddb24 Author: Ian Campbell AuthorDate: Thu Aug 22 17:01:57 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:36:07 2013 +0100 xen: arm: indicate when we have early paniced Otherwise the hypervisor simply appears to stop after a message which may or may not look all that severe. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/early_printk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index ca151a5..058d044 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -61,5 +61,7 @@ early_panic(const char *fmt, ...) early_vprintk(fmt, args); va_end(args); + early_printk("\nEarly Panic: Stopping\n"); + while(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 Sun Sep 08 15:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqv-0006fA-Vh; Sun, 08 Sep 2013 15:24:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqu-0006el-Vp for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:41 +0000 Received: from [85.158.143.35:20583] by server-3.bemta-4.messagelabs.com id 64/A5-08835-8B69C225; Sun, 08 Sep 2013 15:24:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1378653878!2186551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4074 invoked from network); 8 Sep 2013 15:24:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqs-00034w-8z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqs-0004mt-3k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:38 +0000 Date: Sun, 08 Sep 2013 15:24:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use defines for boot module indexes instead of open coded numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac87d5e2096e4c33c0a5e24a1b4746b1a81a773 Author: Ian Campbell AuthorDate: Thu Aug 22 16:24:46 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:36:31 2013 +0100 xen/arm: use defines for boot module indexes instead of open coded numbers Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 10 +++++----- xen/arch/arm/setup.c | 7 +++---- xen/common/device_tree.c | 4 ++-- xen/include/xen/device_tree.h | 10 ++++++++-- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 01492bb..9ca663a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -142,9 +142,9 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, const char *bootargs = NULL; int prop; - if ( early_info.modules.nr_mods >= 1 && - early_info.modules.module[1].cmdline[0] ) - bootargs = &early_info.modules.module[1].cmdline[0]; + if ( early_info.modules.nr_mods >= MOD_KERNEL && + early_info.modules.module[MOD_KERNEL].cmdline[0] ) + bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; for ( prop = fdt_first_property_offset(fdt, node); prop >= 0; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1417429..f12f895 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -307,10 +307,10 @@ int kernel_prepare(struct kernel_info *info) paddr_t start, size; - if ( early_info.modules.nr_mods > 1 ) + if ( early_info.modules.nr_mods > MOD_INITRD ) panic("Cannot handle dom0 initrd yet\n"); - if ( early_info.modules.nr_mods < 1 ) + if ( early_info.modules.nr_mods < MOD_KERNEL ) { printk("No boot modules found, trying flash\n"); start = KERNEL_FLASH_ADDRESS; @@ -319,9 +319,9 @@ int kernel_prepare(struct kernel_info *info) } else { - printk("Loading kernel from boot module 1\n"); - start = early_info.modules.module[1].start; - size = early_info.modules.module[1].size; + printk("Loading kernel from boot module %d\n", MOD_KERNEL); + start = early_info.modules.module[MOD_KERNEL].start; + size = early_info.modules.module[MOD_KERNEL].size; info->load_attr = BUFFERABLE; } diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index f8a3d04..4b31623 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -152,7 +152,7 @@ void __init discard_initial_modules(void) struct dt_module_info *mi = &early_info.modules; int i; - for ( i = 1; i <= mi->nr_mods; i++ ) + for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) { paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); @@ -271,9 +271,8 @@ static paddr_t __init get_xen_paddr(void) early_printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - /* Xen is module 0 */ - early_info.modules.module[0].start = paddr; - early_info.modules.module[0].size = min_size; + early_info.modules.module[MOD_XEN].start = paddr; + early_info.modules.module[MOD_XEN].size = min_size; return paddr; } diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 1249985..3a3c99c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -445,9 +445,9 @@ static void __init process_multiboot_node(const void *fdt, int node, int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) - nr = 1; + nr = MOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) - nr = 2; + nr = MOD_INITRD; else early_panic("%s not a known xen multiboot type\n", name); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index faf727f..402cef2 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -19,7 +19,13 @@ #define DEVICE_TREE_MAX_DEPTH 16 #define NR_MEM_BANKS 8 -#define NR_MODULES 2 + +#define MOD_XEN 0 +#define MOD_KERNEL 1 +#define MOD_INITRD 2 +#define NR_MODULES 3 + +#define MOD_DISCARD_FIRST MOD_KERNEL struct membank { paddr_t start; @@ -40,7 +46,7 @@ struct dt_mb_module { struct dt_module_info { int nr_mods; /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct dt_mb_module module[NR_MODULES + 1]; + struct dt_mb_module module[NR_MODULES]; }; struct dt_early_info { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqv-0006fA-Vh; Sun, 08 Sep 2013 15:24:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqu-0006el-Vp for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:41 +0000 Received: from [85.158.143.35:20583] by server-3.bemta-4.messagelabs.com id 64/A5-08835-8B69C225; Sun, 08 Sep 2013 15:24:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1378653878!2186551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4074 invoked from network); 8 Sep 2013 15:24:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:24:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgqs-00034w-8z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgqs-0004mt-3k for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:38 +0000 Date: Sun, 08 Sep 2013 15:24:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use defines for boot module indexes instead of open coded numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac87d5e2096e4c33c0a5e24a1b4746b1a81a773 Author: Ian Campbell AuthorDate: Thu Aug 22 16:24:46 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:36:31 2013 +0100 xen/arm: use defines for boot module indexes instead of open coded numbers Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/kernel.c | 10 +++++----- xen/arch/arm/setup.c | 7 +++---- xen/common/device_tree.c | 4 ++-- xen/include/xen/device_tree.h | 10 ++++++++-- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 01492bb..9ca663a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -142,9 +142,9 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, const char *bootargs = NULL; int prop; - if ( early_info.modules.nr_mods >= 1 && - early_info.modules.module[1].cmdline[0] ) - bootargs = &early_info.modules.module[1].cmdline[0]; + if ( early_info.modules.nr_mods >= MOD_KERNEL && + early_info.modules.module[MOD_KERNEL].cmdline[0] ) + bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; for ( prop = fdt_first_property_offset(fdt, node); prop >= 0; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1417429..f12f895 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -307,10 +307,10 @@ int kernel_prepare(struct kernel_info *info) paddr_t start, size; - if ( early_info.modules.nr_mods > 1 ) + if ( early_info.modules.nr_mods > MOD_INITRD ) panic("Cannot handle dom0 initrd yet\n"); - if ( early_info.modules.nr_mods < 1 ) + if ( early_info.modules.nr_mods < MOD_KERNEL ) { printk("No boot modules found, trying flash\n"); start = KERNEL_FLASH_ADDRESS; @@ -319,9 +319,9 @@ int kernel_prepare(struct kernel_info *info) } else { - printk("Loading kernel from boot module 1\n"); - start = early_info.modules.module[1].start; - size = early_info.modules.module[1].size; + printk("Loading kernel from boot module %d\n", MOD_KERNEL); + start = early_info.modules.module[MOD_KERNEL].start; + size = early_info.modules.module[MOD_KERNEL].size; info->load_attr = BUFFERABLE; } diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index f8a3d04..4b31623 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -152,7 +152,7 @@ void __init discard_initial_modules(void) struct dt_module_info *mi = &early_info.modules; int i; - for ( i = 1; i <= mi->nr_mods; i++ ) + for ( i = MOD_DISCARD_FIRST; i <= mi->nr_mods; i++ ) { paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); @@ -271,9 +271,8 @@ static paddr_t __init get_xen_paddr(void) early_printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", paddr, paddr + min_size); - /* Xen is module 0 */ - early_info.modules.module[0].start = paddr; - early_info.modules.module[0].size = min_size; + early_info.modules.module[MOD_XEN].start = paddr; + early_info.modules.module[MOD_XEN].size = min_size; return paddr; } diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 1249985..3a3c99c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -445,9 +445,9 @@ static void __init process_multiboot_node(const void *fdt, int node, int len; if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) - nr = 1; + nr = MOD_KERNEL; else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) - nr = 2; + nr = MOD_INITRD; else early_panic("%s not a known xen multiboot type\n", name); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index faf727f..402cef2 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -19,7 +19,13 @@ #define DEVICE_TREE_MAX_DEPTH 16 #define NR_MEM_BANKS 8 -#define NR_MODULES 2 + +#define MOD_XEN 0 +#define MOD_KERNEL 1 +#define MOD_INITRD 2 +#define NR_MODULES 3 + +#define MOD_DISCARD_FIRST MOD_KERNEL struct membank { paddr_t start; @@ -40,7 +46,7 @@ struct dt_mb_module { struct dt_module_info { int nr_mods; /* Module 0 is Xen itself, followed by the provided modules-proper */ - struct dt_mb_module module[NR_MODULES + 1]; + struct dt_mb_module module[NR_MODULES]; }; struct dt_early_info { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr6-0006h6-2W; Sun, 08 Sep 2013 15:24:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr5-0006gw-8o for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:51 +0000 Received: from [193.109.254.147:11569] by server-7.bemta-14.messagelabs.com id C1/F2-04456-2C69C225; Sun, 08 Sep 2013 15:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378653888!473070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27130 invoked from network); 8 Sep 2013 15:24:49 -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; 8 Sep 2013 15:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr2-000352-Ea for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgr2-0004nF-CX for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:48 +0000 Date: Sun, 08 Sep 2013 15:24:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: drop VT-i example X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 460dea6c817eada4f7d43097b1e71e975a7ba52b Author: Jan Beulich AuthorDate: Tue Aug 27 14:23:07 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:49:19 2013 +0100 tools: drop VT-i example ... as being another IA64 leftover. Signed-off-by: Jan Beulich --- tools/examples/Makefile | 1 - tools/examples/xmexample.vti | 180 ------------------------------------------ 2 files changed, 0 insertions(+), 181 deletions(-) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index cc853fa..df24e38 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -14,7 +14,6 @@ XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm-stubdom XEN_CONFIGS-$(CONFIG_XEND) += xmexample.pv-grub XEN_CONFIGS-$(CONFIG_XEND) += xmexample.nbd -XEN_CONFIGS-$(CONFIG_XEND) += xmexample.vti XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-quirks.sxp XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-permissive.sxp diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti deleted file mode 100644 index f97cbe9..0000000 --- a/tools/examples/xmexample.vti +++ /dev/null @@ -1,180 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -import os, re -arch_libdir = 'lib' -arch = os.uname()[4] - -#---------------------------------------------------------------------------- -# Kernel image file. -kernel = "guest_firmware.bin" - -# The domain build function. VTI domain uses 'hvm'. -builder='hvm' - -# Initial memory allocation (in megabytes) for the new domain. -# -# WARNING: Creating a domain with insufficient memory may cause out of -# memory errors. The domain needs enough memory to boot kernel -# and modules. Allocating less than 32MBs is not recommended. -memory = 256 - -# A name for your domain. All domains must have different names. -name = "ExampleVTIDomain" - -# the number of cpus guest platform has, default=1 -#vcpus=1 - -# List of which CPUS this domain is allowed to use, default Xen picks -#cpus = "" # leave to Xen to pick -#cpus = "0" # all vcpus run on CPU0 -#cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 - -# Log2 of VHPT size, default=23 (8MB), minimum=15 (32KB). -# In Windows OS, smaller size shows better performance. -#vhpt = 23 - -# Optionally define mac and/or bridge for the network interfaces. -# Random MACs are assigned if not given. -#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ] -# type=ioemu specify the NIC is an ioemu device not netfront -vif = [ 'type=ioemu, bridge=xenbr0' ] - -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. - -#disk = [ 'phy:hda1,hda1,r' ] -disk = [ 'file:/var/images/xenia64.img,hda,w', ',hdc:cdrom,r' ] - -#---------------------------------------------------------------------------- -# Set according to whether you want the domain restarted when it exits. -# The default is 'onreboot', which restarts the domain when it shuts down -# with exit code reboot. -# Other values are 'always', and 'never'. - -#restart = 'onreboot' - -#============================================================================ - -# New stuff -device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' - -#----------------------------------------------------------------------------- -# boot on floppy (a), hard disk (c) or CD-ROM (d) -# default: hard disk, cd-rom, floppy -#boot="cda" - -#----------------------------------------------------------------------------- -# write to temporary files instead of disk image files -#snapshot=1 - -#---------------------------------------------------------------------------- -# enable SDL library for graphics, default = 0 -sdl=1 - -#---------------------------------------------------------------------------- -# enable VNC library for graphics, default = 1 -vnc=0 - -#---------------------------------------------------------------------------- -# set VNC display number, default = domid -#vncdisplay=1 - -#---------------------------------------------------------------------------- -# try to find an unused port for the VNC server, default = 1 -#vncunused=1 - -#---------------------------------------------------------------------------- -# set password for domain's VNC console -# default is depents on vncpasswd in xend-config.sxp -vncpasswd='' - -#---------------------------------------------------------------------------- -# no graphics, use serial port -#nographic=0 - -#---------------------------------------------------------------------------- -# enable stdvga, default = 0 (use cirrus logic device model) -stdvga=0 - -#----------------------------------------------------------------------------- -# serial port re-direct to pty deivce, /dev/pts/n -# then xm console or minicom can connect -serial='pty' - -#----------------------------------------------------------------------------- -# Qemu Monitor, default is disable -# Use ctrl-alt-2 to connect -#monitor=1 - -#----------------------------------------------------------------------------- -# enable sound card support, [sb16|es1370|all|..,..], default none -#soundhw='sb16' - -#----------------------------------------------------------------------------- -# set the real time clock to local time [default=0 i.e. set to utc] -#localtime=1 - -#----------------------------------------------------------------------------- -# start in full screen -#full-screen=1 diff -r 42cab8724273 tools/libxc/xc_ia64_stubs.c - -#----------------------------------------------------------------------------- -# Enable USB support (specific devices specified at runtime through the -# monitor window) -#usb=1 - -# Enable USB mouse support (only enable one of the following, `mouse' for -# PS/2 protocol relative mouse, `tablet' for -# absolute mouse) -#usbdevice='mouse' -#usbdevice='tablet' - -#----------------------------------------------------------------------------- -# Set keyboard layout, default is en-us keyboard. -#keymap='ja' - -#----------------------------------------------------------------------------- -# Enable optimization features for the specified OS type. (Specific to the -# OS running in the guest domain. Other OSes may not run correctly -# if the wrong OS type is specified.) -# -# Default is "default", which should work for all supported guest OSes. -# -# Known values: -# 'linux' - All Linux variants -# 'windows' - All Windows variants (Windows Server 2003/2008) -# -#guest_os_type='default' - -#----------------------------------------------------------------------------- -# Configure PVSCSI devices: -# -#vscsi=[ 'PDEV, VDEV' ] -# -# PDEV gives physical SCSI device to be attached to specified guest -# domain by one of the following identifier format. -# - XX:XX:XX:XX (4-tuples with decimal notation which shows -# "host:channel:target:lun") -# - /dev/sdxx or sdx -# - /dev/stxx or stx -# - /dev/sgxx or sgx -# - result of 'scsi_id -gu -s'. -# ex. # scsi_id -gu -s /block/sdb -# 36000b5d0006a0000006a0257004c0000 -# -# VDEV gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as -# which the specified guest domain recognize. -# - -#vscsi = [ '/dev/sdx, 0:0:0:0' ] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:24:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr6-0006h6-2W; Sun, 08 Sep 2013 15:24:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr5-0006gw-8o for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:51 +0000 Received: from [193.109.254.147:11569] by server-7.bemta-14.messagelabs.com id C1/F2-04456-2C69C225; Sun, 08 Sep 2013 15:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378653888!473070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27130 invoked from network); 8 Sep 2013 15:24:49 -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; 8 Sep 2013 15:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgr2-000352-Ea for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgr2-0004nF-CX for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:48 +0000 Date: Sun, 08 Sep 2013 15:24:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: drop VT-i example X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 460dea6c817eada4f7d43097b1e71e975a7ba52b Author: Jan Beulich AuthorDate: Tue Aug 27 14:23:07 2013 +0100 Commit: Ian Campbell CommitDate: Tue Aug 27 14:49:19 2013 +0100 tools: drop VT-i example ... as being another IA64 leftover. Signed-off-by: Jan Beulich --- tools/examples/Makefile | 1 - tools/examples/xmexample.vti | 180 ------------------------------------------ 2 files changed, 0 insertions(+), 181 deletions(-) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index cc853fa..df24e38 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -14,7 +14,6 @@ XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm-stubdom XEN_CONFIGS-$(CONFIG_XEND) += xmexample.pv-grub XEN_CONFIGS-$(CONFIG_XEND) += xmexample.nbd -XEN_CONFIGS-$(CONFIG_XEND) += xmexample.vti XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-quirks.sxp XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-permissive.sxp diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti deleted file mode 100644 index f97cbe9..0000000 --- a/tools/examples/xmexample.vti +++ /dev/null @@ -1,180 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -import os, re -arch_libdir = 'lib' -arch = os.uname()[4] - -#---------------------------------------------------------------------------- -# Kernel image file. -kernel = "guest_firmware.bin" - -# The domain build function. VTI domain uses 'hvm'. -builder='hvm' - -# Initial memory allocation (in megabytes) for the new domain. -# -# WARNING: Creating a domain with insufficient memory may cause out of -# memory errors. The domain needs enough memory to boot kernel -# and modules. Allocating less than 32MBs is not recommended. -memory = 256 - -# A name for your domain. All domains must have different names. -name = "ExampleVTIDomain" - -# the number of cpus guest platform has, default=1 -#vcpus=1 - -# List of which CPUS this domain is allowed to use, default Xen picks -#cpus = "" # leave to Xen to pick -#cpus = "0" # all vcpus run on CPU0 -#cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 - -# Log2 of VHPT size, default=23 (8MB), minimum=15 (32KB). -# In Windows OS, smaller size shows better performance. -#vhpt = 23 - -# Optionally define mac and/or bridge for the network interfaces. -# Random MACs are assigned if not given. -#vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0, model=ne2k_pci' ] -# type=ioemu specify the NIC is an ioemu device not netfront -vif = [ 'type=ioemu, bridge=xenbr0' ] - -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. - -#disk = [ 'phy:hda1,hda1,r' ] -disk = [ 'file:/var/images/xenia64.img,hda,w', ',hdc:cdrom,r' ] - -#---------------------------------------------------------------------------- -# Set according to whether you want the domain restarted when it exits. -# The default is 'onreboot', which restarts the domain when it shuts down -# with exit code reboot. -# Other values are 'always', and 'never'. - -#restart = 'onreboot' - -#============================================================================ - -# New stuff -device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' - -#----------------------------------------------------------------------------- -# boot on floppy (a), hard disk (c) or CD-ROM (d) -# default: hard disk, cd-rom, floppy -#boot="cda" - -#----------------------------------------------------------------------------- -# write to temporary files instead of disk image files -#snapshot=1 - -#---------------------------------------------------------------------------- -# enable SDL library for graphics, default = 0 -sdl=1 - -#---------------------------------------------------------------------------- -# enable VNC library for graphics, default = 1 -vnc=0 - -#---------------------------------------------------------------------------- -# set VNC display number, default = domid -#vncdisplay=1 - -#---------------------------------------------------------------------------- -# try to find an unused port for the VNC server, default = 1 -#vncunused=1 - -#---------------------------------------------------------------------------- -# set password for domain's VNC console -# default is depents on vncpasswd in xend-config.sxp -vncpasswd='' - -#---------------------------------------------------------------------------- -# no graphics, use serial port -#nographic=0 - -#---------------------------------------------------------------------------- -# enable stdvga, default = 0 (use cirrus logic device model) -stdvga=0 - -#----------------------------------------------------------------------------- -# serial port re-direct to pty deivce, /dev/pts/n -# then xm console or minicom can connect -serial='pty' - -#----------------------------------------------------------------------------- -# Qemu Monitor, default is disable -# Use ctrl-alt-2 to connect -#monitor=1 - -#----------------------------------------------------------------------------- -# enable sound card support, [sb16|es1370|all|..,..], default none -#soundhw='sb16' - -#----------------------------------------------------------------------------- -# set the real time clock to local time [default=0 i.e. set to utc] -#localtime=1 - -#----------------------------------------------------------------------------- -# start in full screen -#full-screen=1 diff -r 42cab8724273 tools/libxc/xc_ia64_stubs.c - -#----------------------------------------------------------------------------- -# Enable USB support (specific devices specified at runtime through the -# monitor window) -#usb=1 - -# Enable USB mouse support (only enable one of the following, `mouse' for -# PS/2 protocol relative mouse, `tablet' for -# absolute mouse) -#usbdevice='mouse' -#usbdevice='tablet' - -#----------------------------------------------------------------------------- -# Set keyboard layout, default is en-us keyboard. -#keymap='ja' - -#----------------------------------------------------------------------------- -# Enable optimization features for the specified OS type. (Specific to the -# OS running in the guest domain. Other OSes may not run correctly -# if the wrong OS type is specified.) -# -# Default is "default", which should work for all supported guest OSes. -# -# Known values: -# 'linux' - All Linux variants -# 'windows' - All Windows variants (Windows Server 2003/2008) -# -#guest_os_type='default' - -#----------------------------------------------------------------------------- -# Configure PVSCSI devices: -# -#vscsi=[ 'PDEV, VDEV' ] -# -# PDEV gives physical SCSI device to be attached to specified guest -# domain by one of the following identifier format. -# - XX:XX:XX:XX (4-tuples with decimal notation which shows -# "host:channel:target:lun") -# - /dev/sdxx or sdx -# - /dev/stxx or stx -# - /dev/sgxx or sgx -# - result of 'scsi_id -gu -s'. -# ex. # scsi_id -gu -s /block/sdb -# 36000b5d0006a0000006a0257004c0000 -# -# VDEV gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as -# which the specified guest domain recognize. -# - -#vscsi = [ '/dev/sdx, 0:0:0:0' ] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrG-0006j1-5a; Sun, 08 Sep 2013 15:25:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrF-0006ik-4Z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:01 +0000 Received: from [85.158.139.211:62158] by server-10.bemta-5.messagelabs.com id 27/0B-23973-CC69C225; Sun, 08 Sep 2013 15:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378653898!1308668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28207 invoked from network); 8 Sep 2013 15:24:59 -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; 8 Sep 2013 15:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrC-00035B-KI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrC-0004nc-ID for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:58 +0000 Date: Sun, 08 Sep 2013 15:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: also allocate IRTEs for HPET MSI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcbff3aeac6020cdf1f5bd0f0eb0d329fc55d939 Author: Jan Beulich AuthorDate: Wed Aug 28 10:11:19 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:11:19 2013 +0200 AMD IOMMU: also allocate IRTEs for HPET MSI Omitting this was a blatant oversight of mine in commit 2ca9fbd7 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"). This also changes a bogus inequality check into a sensible one, even though it is already known that this will make HPET MSI unusable on certain systems (having respective broken firmware). This, however, seems better than failing on systems with consistent ACPI tables. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_intr.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index bae0be7..831f92a 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -595,14 +595,31 @@ void* __init amd_iommu_alloc_intremap_table(unsigned long **inuse_map) int __init amd_setup_hpet_msi(struct msi_desc *msi_desc) { - if ( (!msi_desc->hpet_id != hpet_sbdf.id) || - (hpet_sbdf.iommu == NULL) ) + spinlock_t *lock; + unsigned long flags; + int rc = 0; + + if ( msi_desc->hpet_id != hpet_sbdf.id || !hpet_sbdf.iommu ) { - AMD_IOMMU_DEBUG("Fail to setup HPET MSI remapping\n"); - return 1; + AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping: %s\n", + hpet_sbdf.iommu ? "Wrong HPET" : "No IOMMU"); + return -ENODEV; } - return 0; + lock = get_intremap_lock(hpet_sbdf.seg, hpet_sbdf.bdf); + spin_lock_irqsave(lock, flags); + + msi_desc->remap_index = alloc_intremap_entry(hpet_sbdf.seg, + hpet_sbdf.bdf, 1); + if ( msi_desc->remap_index >= INTREMAP_ENTRIES ) + { + msi_desc->remap_index = -1; + rc = -ENXIO; + } + + spin_unlock_irqrestore(lock, flags); + + return rc; } static void dump_intremap_table(const u32 *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 Sun Sep 08 15:25:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrG-0006j1-5a; Sun, 08 Sep 2013 15:25:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrF-0006ik-4Z for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:01 +0000 Received: from [85.158.139.211:62158] by server-10.bemta-5.messagelabs.com id 27/0B-23973-CC69C225; Sun, 08 Sep 2013 15:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378653898!1308668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28207 invoked from network); 8 Sep 2013 15:24:59 -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; 8 Sep 2013 15:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrC-00035B-KI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrC-0004nc-ID for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:24:58 +0000 Date: Sun, 08 Sep 2013 15:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: also allocate IRTEs for HPET MSI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcbff3aeac6020cdf1f5bd0f0eb0d329fc55d939 Author: Jan Beulich AuthorDate: Wed Aug 28 10:11:19 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:11:19 2013 +0200 AMD IOMMU: also allocate IRTEs for HPET MSI Omitting this was a blatant oversight of mine in commit 2ca9fbd7 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"). This also changes a bogus inequality check into a sensible one, even though it is already known that this will make HPET MSI unusable on certain systems (having respective broken firmware). This, however, seems better than failing on systems with consistent ACPI tables. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_intr.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index bae0be7..831f92a 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -595,14 +595,31 @@ void* __init amd_iommu_alloc_intremap_table(unsigned long **inuse_map) int __init amd_setup_hpet_msi(struct msi_desc *msi_desc) { - if ( (!msi_desc->hpet_id != hpet_sbdf.id) || - (hpet_sbdf.iommu == NULL) ) + spinlock_t *lock; + unsigned long flags; + int rc = 0; + + if ( msi_desc->hpet_id != hpet_sbdf.id || !hpet_sbdf.iommu ) { - AMD_IOMMU_DEBUG("Fail to setup HPET MSI remapping\n"); - return 1; + AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping: %s\n", + hpet_sbdf.iommu ? "Wrong HPET" : "No IOMMU"); + return -ENODEV; } - return 0; + lock = get_intremap_lock(hpet_sbdf.seg, hpet_sbdf.bdf); + spin_lock_irqsave(lock, flags); + + msi_desc->remap_index = alloc_intremap_entry(hpet_sbdf.seg, + hpet_sbdf.bdf, 1); + if ( msi_desc->remap_index >= INTREMAP_ENTRIES ) + { + msi_desc->remap_index = -1; + rc = -ENXIO; + } + + spin_unlock_irqrestore(lock, flags); + + return rc; } static void dump_intremap_table(const u32 *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 Sun Sep 08 15:25:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrR-0006l6-Bo; Sun, 08 Sep 2013 15:25:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrP-0006kt-OV for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:12 +0000 Received: from [193.109.254.147:11925] by server-6.bemta-14.messagelabs.com id 79/94-20235-7D69C225; Sun, 08 Sep 2013 15:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653908!246615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9692 invoked from network); 8 Sep 2013 15:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrM-00035k-Ow for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrM-0004oB-NU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:08 +0000 Date: Sun, 08 Sep 2013 15:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PCI: centralize parsing of device coordinates in command line options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa4b2aea4fa300341668971e50fbfd16b1ed925d Author: Jan Beulich AuthorDate: Wed Aug 28 10:12:36 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:12:36 2013 +0200 PCI: centralize parsing of device coordinates in command line options With yet another case to come in a subsequent patch, it seems time to do this in a single place rather than hand crafting it in various scattered around locations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/drivers/char/ehci-dbgp.c | 24 ++++++++-------------- xen/drivers/char/ns16550.c | 22 ++++++-------------- xen/drivers/passthrough/pci.c | 21 +++++-------------- xen/drivers/pci/pci.c | 42 +++++++++++++++++++++++++++++++++++++++++ xen/include/xen/pci.h | 2 + 5 files changed, 66 insertions(+), 45 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 6b70660..bead374 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1482,31 +1482,25 @@ void __init ehci_dbgp_init(void) } else if ( strncmp(opt_dbgp + 4, "@pci", 4) == 0 ) { - unsigned long val = simple_strtoul(opt_dbgp + 8, &e, 16); + unsigned int bus, slot, func; - dbgp->bus = val; - if ( dbgp->bus != val || *e != ':' ) + e = parse_pci(opt_dbgp + 8, NULL, &bus, &slot, &func); + if ( !e || *e ) return; - val = simple_strtoul(e + 1, &e, 16); - if ( PCI_SLOT(PCI_DEVFN(val, 0)) != val || *e != '.' ) - return; - dbgp->slot = val; - - val = simple_strtoul(e + 1, &e, 16); - if ( PCI_FUNC(PCI_DEVFN(0, val)) != val || *e ) - return; - dbgp->func = val; + dbgp->bus = bus; + dbgp->slot = slot; + dbgp->func = func; - if ( !pci_device_detect(0, dbgp->bus, dbgp->slot, dbgp->func) ) + if ( !pci_device_detect(0, bus, slot, func) ) return; - dbgp->cap = __find_dbgp(dbgp->bus, dbgp->slot, dbgp->func); + dbgp->cap = __find_dbgp(bus, slot, func); if ( !dbgp->cap ) return; dbgp_printk("Using EHCI debug port on %02x:%02x.%u\n", - dbgp->bus, dbgp->slot, dbgp->func); + bus, slot, func); } else return; diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 6082c85..7cbe5fd 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -403,19 +403,6 @@ static int __init parse_parity_char(int c) return 0; } -static void __init parse_pci_bdf(const char **conf, unsigned int bdf[3]) -{ - bdf[0] = simple_strtoul(*conf, conf, 16); - if ( **conf != ':' ) - return; - (*conf)++; - bdf[1] = simple_strtoul(*conf, conf, 16); - if ( **conf != '.' ) - return; - (*conf)++; - bdf[2] = simple_strtoul(*conf, conf, 16); -} - static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; @@ -593,14 +580,19 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { + conf = parse_pci(conf, NULL, &uart->ps_bdf[0], + &uart->ps_bdf[1], &uart->ps_bdf[2]); + if ( !conf ) + PARSE_ERR("Bad port PCI coordinates"); uart->ps_bdf_enable = 1; - parse_pci_bdf(&conf, &uart->ps_bdf[0]); } if ( *conf == ',' && *++conf != ',' ) { + if ( !parse_pci(conf, NULL, &uart->pb_bdf[0], + &uart->pb_bdf[1], &uart->pb_bdf[2]) ) + PARSE_ERR("Bad bridge PCI coordinates"); uart->pb_bdf_enable = 1; - parse_pci_bdf(&conf, &uart->pb_bdf[0]); } config_parsed: diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index b488e2a..e9f2a56 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -127,29 +127,20 @@ static unsigned int nr_phantom_devs; static void __init parse_phantom_dev(char *str) { const char *s = str; + unsigned int seg, bus, slot; struct phantom_dev phantom; if ( !s || !*s || nr_phantom_devs >= ARRAY_SIZE(phantom_devs) ) return; - phantom.seg = simple_strtol(s, &s, 16); - if ( *s != ':' ) + s = parse_pci(s, &seg, &bus, &slot, NULL); + if ( !s || *s != ',' ) return; - phantom.bus = simple_strtol(s + 1, &s, 16); - if ( *s == ',' ) - { - phantom.slot = phantom.bus; - phantom.bus = phantom.seg; - phantom.seg = 0; - } - else if ( *s == ':' ) - phantom.slot = simple_strtol(s + 1, &s, 16); - else - return; + phantom.seg = seg; + phantom.bus = bus; + phantom.slot = slot; - if ( *s != ',' ) - return; switch ( phantom.stride = simple_strtol(s + 1, &s, 0) ) { case 1: case 2: case 4: diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index b6e388a..25dc5f1 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -4,6 +4,7 @@ * Architecture-independent PCI access functions. */ +#include #include #include @@ -102,3 +103,44 @@ int pci_find_ext_capability(int seg, int bus, int devfn, int cap) } return 0; } + +const char *__init parse_pci(const char *s, unsigned int *seg_p, + unsigned int *bus_p, unsigned int *dev_p, + unsigned int *func_p) +{ + unsigned long seg = simple_strtoul(s, &s, 16), bus, dev, func; + + if ( *s != ':' ) + return NULL; + bus = simple_strtoul(s + 1, &s, 16); + if ( *s == ':' ) + dev = simple_strtoul(s + 1, &s, 16); + else + { + dev = bus; + bus = seg; + seg = 0; + } + if ( func_p ) + { + if ( *s != '.' ) + return NULL; + func = simple_strtoul(s + 1, &s, 0); + } + else + func = 0; + if ( seg != (seg_p ? (u16)seg : 0) || + bus != PCI_BUS(PCI_BDF2(bus, 0)) || + dev != PCI_SLOT(PCI_DEVFN(dev, 0)) || + func != PCI_FUNC(PCI_DEVFN(0, func)) ) + return NULL; + + if ( seg_p ) + *seg_p = seg; + *bus_p = bus; + *dev_p = dev; + if ( func_p ) + *func_p = func; + + return s; +} diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index c367736..3003803 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -139,6 +139,8 @@ int pci_mmcfg_write(unsigned int seg, unsigned int bus, int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap); int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap); int pci_find_ext_capability(int seg, int bus, int devfn, int cap); +const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, + unsigned int *dev, unsigned int *func); struct pirq; int msixtbl_pt_register(struct domain *, struct pirq *, uint64_t gtable); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrR-0006l6-Bo; Sun, 08 Sep 2013 15:25:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrP-0006kt-OV for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:12 +0000 Received: from [193.109.254.147:11925] by server-6.bemta-14.messagelabs.com id 79/94-20235-7D69C225; Sun, 08 Sep 2013 15:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653908!246615!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9692 invoked from network); 8 Sep 2013 15:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrM-00035k-Ow for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrM-0004oB-NU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:08 +0000 Date: Sun, 08 Sep 2013 15:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PCI: centralize parsing of device coordinates in command line options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa4b2aea4fa300341668971e50fbfd16b1ed925d Author: Jan Beulich AuthorDate: Wed Aug 28 10:12:36 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:12:36 2013 +0200 PCI: centralize parsing of device coordinates in command line options With yet another case to come in a subsequent patch, it seems time to do this in a single place rather than hand crafting it in various scattered around locations. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/drivers/char/ehci-dbgp.c | 24 ++++++++-------------- xen/drivers/char/ns16550.c | 22 ++++++-------------- xen/drivers/passthrough/pci.c | 21 +++++-------------- xen/drivers/pci/pci.c | 42 +++++++++++++++++++++++++++++++++++++++++ xen/include/xen/pci.h | 2 + 5 files changed, 66 insertions(+), 45 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 6b70660..bead374 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1482,31 +1482,25 @@ void __init ehci_dbgp_init(void) } else if ( strncmp(opt_dbgp + 4, "@pci", 4) == 0 ) { - unsigned long val = simple_strtoul(opt_dbgp + 8, &e, 16); + unsigned int bus, slot, func; - dbgp->bus = val; - if ( dbgp->bus != val || *e != ':' ) + e = parse_pci(opt_dbgp + 8, NULL, &bus, &slot, &func); + if ( !e || *e ) return; - val = simple_strtoul(e + 1, &e, 16); - if ( PCI_SLOT(PCI_DEVFN(val, 0)) != val || *e != '.' ) - return; - dbgp->slot = val; - - val = simple_strtoul(e + 1, &e, 16); - if ( PCI_FUNC(PCI_DEVFN(0, val)) != val || *e ) - return; - dbgp->func = val; + dbgp->bus = bus; + dbgp->slot = slot; + dbgp->func = func; - if ( !pci_device_detect(0, dbgp->bus, dbgp->slot, dbgp->func) ) + if ( !pci_device_detect(0, bus, slot, func) ) return; - dbgp->cap = __find_dbgp(dbgp->bus, dbgp->slot, dbgp->func); + dbgp->cap = __find_dbgp(bus, slot, func); if ( !dbgp->cap ) return; dbgp_printk("Using EHCI debug port on %02x:%02x.%u\n", - dbgp->bus, dbgp->slot, dbgp->func); + bus, slot, func); } else return; diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 6082c85..7cbe5fd 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -403,19 +403,6 @@ static int __init parse_parity_char(int c) return 0; } -static void __init parse_pci_bdf(const char **conf, unsigned int bdf[3]) -{ - bdf[0] = simple_strtoul(*conf, conf, 16); - if ( **conf != ':' ) - return; - (*conf)++; - bdf[1] = simple_strtoul(*conf, conf, 16); - if ( **conf != '.' ) - return; - (*conf)++; - bdf[2] = simple_strtoul(*conf, conf, 16); -} - static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; @@ -593,14 +580,19 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { + conf = parse_pci(conf, NULL, &uart->ps_bdf[0], + &uart->ps_bdf[1], &uart->ps_bdf[2]); + if ( !conf ) + PARSE_ERR("Bad port PCI coordinates"); uart->ps_bdf_enable = 1; - parse_pci_bdf(&conf, &uart->ps_bdf[0]); } if ( *conf == ',' && *++conf != ',' ) { + if ( !parse_pci(conf, NULL, &uart->pb_bdf[0], + &uart->pb_bdf[1], &uart->pb_bdf[2]) ) + PARSE_ERR("Bad bridge PCI coordinates"); uart->pb_bdf_enable = 1; - parse_pci_bdf(&conf, &uart->pb_bdf[0]); } config_parsed: diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index b488e2a..e9f2a56 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -127,29 +127,20 @@ static unsigned int nr_phantom_devs; static void __init parse_phantom_dev(char *str) { const char *s = str; + unsigned int seg, bus, slot; struct phantom_dev phantom; if ( !s || !*s || nr_phantom_devs >= ARRAY_SIZE(phantom_devs) ) return; - phantom.seg = simple_strtol(s, &s, 16); - if ( *s != ':' ) + s = parse_pci(s, &seg, &bus, &slot, NULL); + if ( !s || *s != ',' ) return; - phantom.bus = simple_strtol(s + 1, &s, 16); - if ( *s == ',' ) - { - phantom.slot = phantom.bus; - phantom.bus = phantom.seg; - phantom.seg = 0; - } - else if ( *s == ':' ) - phantom.slot = simple_strtol(s + 1, &s, 16); - else - return; + phantom.seg = seg; + phantom.bus = bus; + phantom.slot = slot; - if ( *s != ',' ) - return; switch ( phantom.stride = simple_strtol(s + 1, &s, 0) ) { case 1: case 2: case 4: diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index b6e388a..25dc5f1 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -4,6 +4,7 @@ * Architecture-independent PCI access functions. */ +#include #include #include @@ -102,3 +103,44 @@ int pci_find_ext_capability(int seg, int bus, int devfn, int cap) } return 0; } + +const char *__init parse_pci(const char *s, unsigned int *seg_p, + unsigned int *bus_p, unsigned int *dev_p, + unsigned int *func_p) +{ + unsigned long seg = simple_strtoul(s, &s, 16), bus, dev, func; + + if ( *s != ':' ) + return NULL; + bus = simple_strtoul(s + 1, &s, 16); + if ( *s == ':' ) + dev = simple_strtoul(s + 1, &s, 16); + else + { + dev = bus; + bus = seg; + seg = 0; + } + if ( func_p ) + { + if ( *s != '.' ) + return NULL; + func = simple_strtoul(s + 1, &s, 0); + } + else + func = 0; + if ( seg != (seg_p ? (u16)seg : 0) || + bus != PCI_BUS(PCI_BDF2(bus, 0)) || + dev != PCI_SLOT(PCI_DEVFN(dev, 0)) || + func != PCI_FUNC(PCI_DEVFN(0, func)) ) + return NULL; + + if ( seg_p ) + *seg_p = seg; + *bus_p = bus; + *dev_p = dev; + if ( func_p ) + *func_p = func; + + return s; +} diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index c367736..3003803 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -139,6 +139,8 @@ int pci_mmcfg_write(unsigned int seg, unsigned int bus, int pci_find_cap_offset(u16 seg, u8 bus, u8 dev, u8 func, u8 cap); int pci_find_next_cap(u16 seg, u8 bus, unsigned int devfn, u8 pos, int cap); int pci_find_ext_capability(int seg, int bus, int devfn, int cap); +const char *parse_pci(const char *, unsigned int *seg, unsigned int *bus, + unsigned int *dev, unsigned int *func); struct pirq; int msixtbl_pt_register(struct domain *, struct pirq *, uint64_t gtable); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgra-0006ma-Ej; Sun, 08 Sep 2013 15:25:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrZ-0006mL-D6 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:21 +0000 Received: from [193.109.254.147:18061] by server-14.bemta-14.messagelabs.com id 4A/44-07546-0E69C225; Sun, 08 Sep 2013 15:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378653919!473112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28429 invoked from network); 8 Sep 2013 15:25:19 -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; 8 Sep 2013 15:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrW-00035q-VK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrW-0004pL-Rz for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:18 +0000 Date: Sun, 08 Sep 2013 15:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e2c5938246546a5b3f698b7421640d85602b994 Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 10:18:39 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:18:39 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 7cbe5fd..ddca62f 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -59,6 +59,8 @@ static struct ns16550 { u8 bar_idx; } ns16550_com[2] = { { 0 } }; +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -256,6 +258,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -346,7 +349,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } 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 Sun Sep 08 15:25:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgra-0006ma-Ej; Sun, 08 Sep 2013 15:25:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrZ-0006mL-D6 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:21 +0000 Received: from [193.109.254.147:18061] by server-14.bemta-14.messagelabs.com id 4A/44-07546-0E69C225; Sun, 08 Sep 2013 15:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378653919!473112!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28429 invoked from network); 8 Sep 2013 15:25:19 -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; 8 Sep 2013 15:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrW-00035q-VK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrW-0004pL-Rz for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:18 +0000 Date: Sun, 08 Sep 2013 15:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Fix inactive timer list corruption on second S3 resume X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e2c5938246546a5b3f698b7421640d85602b994 Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 10:18:39 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:18:39 2013 +0200 Fix inactive timer list corruption on second S3 resume init_timer cannot be safely called multiple times on same timer since it does memset(0) on the structure, erasing the auxiliary member used by linked list code. This breaks inactive timer list in common/timer.c. Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/drivers/char/ns16550.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 7cbe5fd..ddca62f 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -59,6 +59,8 @@ static struct ns16550 { u8 bar_idx; } ns16550_com[2] = { { 0 } }; +static void ns16550_delayed_resume(void *data); + static char ns_read_reg(struct ns16550 *uart, int reg) { if ( uart->remapped_io_base == NULL ) @@ -256,6 +258,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); + init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -346,7 +349,6 @@ static void ns16550_resume(struct serial_port *port) if ( ns16550_ioport_invalid(uart) ) { delayed_resume_tries = RESUME_RETRIES; - init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); set_timer(&uart->resume_timer, NOW() + RESUME_DELAY); } 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 Sun Sep 08 15:25:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrl-0006op-He; Sun, 08 Sep 2013 15:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrk-0006oa-Jd for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:32 +0000 Received: from [85.158.139.211:62846] by server-5.bemta-5.messagelabs.com id 13/80-29992-BE69C225; Sun, 08 Sep 2013 15:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378653929!1308703!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28708 invoked from network); 8 Sep 2013 15:25:30 -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; 8 Sep 2013 15:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrh-00035y-5a for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrh-0004ph-2x for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:29 +0000 Date: Sun, 08 Sep 2013 15:25:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PCI UART: better cope with UART being temporarily unavailable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37f36d894ef43dc2986d0936612ec967c5a89be8 Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 10:19:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:19:42 2013 +0200 PCI UART: better cope with UART being temporarily unavailable This happens for example when dom0 disables ioport responses during PCI subsystem initialisation. If a __ns16550_poll() happens to be scheduled during that time, Xen hangs. Detect and exit that condition. Amended ns16550_ioport_invalid function to only check IER register, which contins 3 reserved (always 0) bits, therefore it's sufficient for that test. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/drivers/char/ehci-dbgp.c | 2 +- xen/drivers/char/ns16550.c | 27 ++++++++++++++++----------- xen/drivers/char/serial.c | 38 +++++++++++++++++++++++++------------- xen/include/xen/serial.h | 5 +++-- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index bead374..2504979 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1204,7 +1204,7 @@ static void ehci_dbgp_putc(struct serial_port *port, char c) ehci_dbgp_flush(port); } -static unsigned int ehci_dbgp_tx_ready(struct serial_port *port) +static int ehci_dbgp_tx_ready(struct serial_port *port) { struct ehci_dbgp *dbgp = port->uart; diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index ddca62f..e0f80f6 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -75,6 +75,11 @@ static void ns_write_reg(struct ns16550 *uart, int reg, char c) writeb(c, uart->remapped_io_base + reg); } +static int ns16550_ioport_invalid(struct ns16550 *uart) +{ + return (unsigned char)ns_read_reg(uart, UART_IER) == 0xff; +} + static void ns16550_interrupt( int irq, void *dev_id, struct cpu_user_regs *regs) { @@ -105,11 +110,17 @@ static void __ns16550_poll(struct cpu_user_regs *regs) return; /* Interrupts work - no more polling */ while ( ns_read_reg(uart, UART_LSR) & UART_LSR_DR ) + { + if ( ns16550_ioport_invalid(uart) ) + goto out; + serial_rx_interrupt(port, regs); + } if ( ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ) serial_tx_interrupt(port, regs); +out: set_timer(&uart->timer, NOW() + MILLISECS(uart->timeout_ms)); } @@ -123,10 +134,12 @@ static void ns16550_poll(void *data) #endif } -static unsigned int ns16550_tx_ready(struct serial_port *port) +static int ns16550_tx_ready(struct serial_port *port) { struct ns16550 *uart = port->uart; + if ( ns16550_ioport_invalid(uart) ) + return -EIO; return ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ? uart->fifo_size : 0; } @@ -140,7 +153,8 @@ static int ns16550_getc(struct serial_port *port, char *pc) { struct ns16550 *uart = port->uart; - if ( !(ns_read_reg(uart, UART_LSR) & UART_LSR_DR) ) + if ( ns16550_ioport_invalid(uart) || + !(ns_read_reg(uart, UART_LSR) & UART_LSR_DR) ) return 0; *pc = ns_read_reg(uart, UART_RBR); @@ -308,15 +322,6 @@ static void _ns16550_resume(struct serial_port *port) ns16550_setup_postirq(port->uart); } -static int ns16550_ioport_invalid(struct ns16550 *uart) -{ - return ((((unsigned char)ns_read_reg(uart, UART_LSR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_MCR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_IER)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_IIR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_LCR)) == 0xff)); -} - static int delayed_resume_tries; static void ns16550_delayed_resume(void *data) { diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index cd0b864..9b006f2 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -59,7 +59,7 @@ void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { - unsigned int i, n; + int i, n; unsigned long flags; local_irq_save(flags); @@ -71,7 +71,7 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) */ while ( !spin_trylock(&port->tx_lock) ) { - if ( !port->driver->tx_ready(port) ) + if ( port->driver->tx_ready(port) <= 0 ) goto out; cpu_relax(); } @@ -111,15 +111,18 @@ static void __serial_putc(struct serial_port *port, char c) if ( port->tx_log_everything ) { /* Buffer is full: we spin waiting for space to appear. */ - unsigned int n; + int n; while ( (n = port->driver->tx_ready(port)) == 0 ) cpu_relax(); - while ( n-- ) - port->driver->putc( - port, - port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); - port->txbuf[mask_serial_txbuf_idx(port->txbufp++)] = c; + if ( n > 0 ) + { + while ( n-- ) + port->driver->putc( + port, + port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); + port->txbuf[mask_serial_txbuf_idx(port->txbufp++)] = c; + } } else { @@ -130,9 +133,9 @@ static void __serial_putc(struct serial_port *port, char c) } if ( ((port->txbufp - port->txbufc) == 0) && - port->driver->tx_ready(port) ) + port->driver->tx_ready(port) > 0 ) { - /* Buffer and UART FIFO are both empty. */ + /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } else @@ -143,10 +146,13 @@ static void __serial_putc(struct serial_port *port, char c) } else if ( port->driver->tx_ready ) { + int n; + /* Synchronous finite-capacity transmitter. */ - while ( !port->driver->tx_ready(port) ) + while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); - port->driver->putc(port, c); + if ( n > 0 ) + port->driver->putc(port, c); } else { @@ -390,8 +396,14 @@ void serial_start_sync(int handle) { while ( (port->txbufp - port->txbufc) != 0 ) { - while ( !port->driver->tx_ready(port) ) + int n; + + while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); + if ( n < 0 ) + /* port is unavailable and might not come up until reenabled by + dom0, we can't really do proper sync */ + break; port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 403e193..f38c9b7 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -70,8 +70,9 @@ struct uart_driver { /* Driver suspend/resume. */ void (*suspend)(struct serial_port *); void (*resume)(struct serial_port *); - /* Return number of characters the port can hold for transmit. */ - unsigned int (*tx_ready)(struct serial_port *); + /* Return number of characters the port can hold for transmit, + * or -EIO if port is inaccesible */ + int (*tx_ready)(struct serial_port *); /* Put a character onto the serial line. */ void (*putc)(struct serial_port *, char); /* Flush accumulated characters. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrl-0006op-He; Sun, 08 Sep 2013 15:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrk-0006oa-Jd for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:32 +0000 Received: from [85.158.139.211:62846] by server-5.bemta-5.messagelabs.com id 13/80-29992-BE69C225; Sun, 08 Sep 2013 15:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378653929!1308703!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28708 invoked from network); 8 Sep 2013 15:25:30 -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; 8 Sep 2013 15:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrh-00035y-5a for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrh-0004ph-2x for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:29 +0000 Date: Sun, 08 Sep 2013 15:25:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PCI UART: better cope with UART being temporarily unavailable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37f36d894ef43dc2986d0936612ec967c5a89be8 Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 10:19:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 10:19:42 2013 +0200 PCI UART: better cope with UART being temporarily unavailable This happens for example when dom0 disables ioport responses during PCI subsystem initialisation. If a __ns16550_poll() happens to be scheduled during that time, Xen hangs. Detect and exit that condition. Amended ns16550_ioport_invalid function to only check IER register, which contins 3 reserved (always 0) bits, therefore it's sufficient for that test. Signed-off-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/drivers/char/ehci-dbgp.c | 2 +- xen/drivers/char/ns16550.c | 27 ++++++++++++++++----------- xen/drivers/char/serial.c | 38 +++++++++++++++++++++++++------------- xen/include/xen/serial.h | 5 +++-- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index bead374..2504979 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1204,7 +1204,7 @@ static void ehci_dbgp_putc(struct serial_port *port, char c) ehci_dbgp_flush(port); } -static unsigned int ehci_dbgp_tx_ready(struct serial_port *port) +static int ehci_dbgp_tx_ready(struct serial_port *port) { struct ehci_dbgp *dbgp = port->uart; diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index ddca62f..e0f80f6 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -75,6 +75,11 @@ static void ns_write_reg(struct ns16550 *uart, int reg, char c) writeb(c, uart->remapped_io_base + reg); } +static int ns16550_ioport_invalid(struct ns16550 *uart) +{ + return (unsigned char)ns_read_reg(uart, UART_IER) == 0xff; +} + static void ns16550_interrupt( int irq, void *dev_id, struct cpu_user_regs *regs) { @@ -105,11 +110,17 @@ static void __ns16550_poll(struct cpu_user_regs *regs) return; /* Interrupts work - no more polling */ while ( ns_read_reg(uart, UART_LSR) & UART_LSR_DR ) + { + if ( ns16550_ioport_invalid(uart) ) + goto out; + serial_rx_interrupt(port, regs); + } if ( ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ) serial_tx_interrupt(port, regs); +out: set_timer(&uart->timer, NOW() + MILLISECS(uart->timeout_ms)); } @@ -123,10 +134,12 @@ static void ns16550_poll(void *data) #endif } -static unsigned int ns16550_tx_ready(struct serial_port *port) +static int ns16550_tx_ready(struct serial_port *port) { struct ns16550 *uart = port->uart; + if ( ns16550_ioport_invalid(uart) ) + return -EIO; return ns_read_reg(uart, UART_LSR) & UART_LSR_THRE ? uart->fifo_size : 0; } @@ -140,7 +153,8 @@ static int ns16550_getc(struct serial_port *port, char *pc) { struct ns16550 *uart = port->uart; - if ( !(ns_read_reg(uart, UART_LSR) & UART_LSR_DR) ) + if ( ns16550_ioport_invalid(uart) || + !(ns_read_reg(uart, UART_LSR) & UART_LSR_DR) ) return 0; *pc = ns_read_reg(uart, UART_RBR); @@ -308,15 +322,6 @@ static void _ns16550_resume(struct serial_port *port) ns16550_setup_postirq(port->uart); } -static int ns16550_ioport_invalid(struct ns16550 *uart) -{ - return ((((unsigned char)ns_read_reg(uart, UART_LSR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_MCR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_IER)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_IIR)) == 0xff) && - (((unsigned char)ns_read_reg(uart, UART_LCR)) == 0xff)); -} - static int delayed_resume_tries; static void ns16550_delayed_resume(void *data) { diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index cd0b864..9b006f2 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -59,7 +59,7 @@ void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) { - unsigned int i, n; + int i, n; unsigned long flags; local_irq_save(flags); @@ -71,7 +71,7 @@ void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs) */ while ( !spin_trylock(&port->tx_lock) ) { - if ( !port->driver->tx_ready(port) ) + if ( port->driver->tx_ready(port) <= 0 ) goto out; cpu_relax(); } @@ -111,15 +111,18 @@ static void __serial_putc(struct serial_port *port, char c) if ( port->tx_log_everything ) { /* Buffer is full: we spin waiting for space to appear. */ - unsigned int n; + int n; while ( (n = port->driver->tx_ready(port)) == 0 ) cpu_relax(); - while ( n-- ) - port->driver->putc( - port, - port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); - port->txbuf[mask_serial_txbuf_idx(port->txbufp++)] = c; + if ( n > 0 ) + { + while ( n-- ) + port->driver->putc( + port, + port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); + port->txbuf[mask_serial_txbuf_idx(port->txbufp++)] = c; + } } else { @@ -130,9 +133,9 @@ static void __serial_putc(struct serial_port *port, char c) } if ( ((port->txbufp - port->txbufc) == 0) && - port->driver->tx_ready(port) ) + port->driver->tx_ready(port) > 0 ) { - /* Buffer and UART FIFO are both empty. */ + /* Buffer and UART FIFO are both empty, and port is available. */ port->driver->putc(port, c); } else @@ -143,10 +146,13 @@ static void __serial_putc(struct serial_port *port, char c) } else if ( port->driver->tx_ready ) { + int n; + /* Synchronous finite-capacity transmitter. */ - while ( !port->driver->tx_ready(port) ) + while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); - port->driver->putc(port, c); + if ( n > 0 ) + port->driver->putc(port, c); } else { @@ -390,8 +396,14 @@ void serial_start_sync(int handle) { while ( (port->txbufp - port->txbufc) != 0 ) { - while ( !port->driver->tx_ready(port) ) + int n; + + while ( !(n = port->driver->tx_ready(port)) ) cpu_relax(); + if ( n < 0 ) + /* port is unavailable and might not come up until reenabled by + dom0, we can't really do proper sync */ + break; port->driver->putc( port, port->txbuf[mask_serial_txbuf_idx(port->txbufc++)]); } diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 403e193..f38c9b7 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -70,8 +70,9 @@ struct uart_driver { /* Driver suspend/resume. */ void (*suspend)(struct serial_port *); void (*resume)(struct serial_port *); - /* Return number of characters the port can hold for transmit. */ - unsigned int (*tx_ready)(struct serial_port *); + /* Return number of characters the port can hold for transmit, + * or -EIO if port is inaccesible */ + int (*tx_ready)(struct serial_port *); /* Put a character onto the serial line. */ void (*putc)(struct serial_port *, char); /* Flush accumulated characters. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgru-0006qW-Kv; Sun, 08 Sep 2013 15:25:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrt-0006qL-P8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:41 +0000 Received: from [193.109.254.147:7592] by server-1.bemta-14.messagelabs.com id 20/72-04740-5F69C225; Sun, 08 Sep 2013 15:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378653939!1502929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10083 invoked from network); 8 Sep 2013 15:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrr-000364-AJ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrr-0004qB-8b for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:39 +0000 Date: Sun, 08 Sep 2013 15:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: update tx_ready callback for ARM serial drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95d43eb2e957470a3a96bcd94a2f1094bef12bde Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 13:36:18 2013 +0200 Commit: Ian Campbell CommitDate: Wed Aug 28 12:50:00 2013 +0100 xen: update tx_ready callback for ARM serial drivers Type of tx_ready callback got changed to int to facilitate error condition, but the ARM serial drivers were not modified thus breaking the compilation. Reported-by: Julien Grall Signed-off-by: Tomasz Wroblewski --- xen/drivers/char/exynos4210-uart.c | 2 +- xen/drivers/char/omap-uart.c | 2 +- xen/drivers/char/pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index 9b34f92..b297ed4 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -221,7 +221,7 @@ static void exynos4210_uart_resume(struct serial_port *port) BUG(); // XXX } -static unsigned int exynos4210_uart_tx_ready(struct serial_port *port) +static int exynos4210_uart_tx_ready(struct serial_port *port) { struct exynos4210_uart *uart = port->uart; diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 91391c8..ffa71db 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -226,7 +226,7 @@ static void omap_uart_resume(struct serial_port *port) BUG(); } -static unsigned int omap_uart_tx_ready(struct serial_port *port) +static int omap_uart_tx_ready(struct serial_port *port) { struct omap_uart *uart = port->uart; uint32_t reg; diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 3ea0d41..3ec6e10 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -155,7 +155,7 @@ static void pl011_resume(struct serial_port *port) BUG(); // XXX } -static unsigned int pl011_tx_ready(struct serial_port *port) +static int pl011_tx_ready(struct serial_port *port) { struct pl011 *uart = port->uart; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgru-0006qW-Kv; Sun, 08 Sep 2013 15:25:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrt-0006qL-P8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:41 +0000 Received: from [193.109.254.147:7592] by server-1.bemta-14.messagelabs.com id 20/72-04740-5F69C225; Sun, 08 Sep 2013 15:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1378653939!1502929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10083 invoked from network); 8 Sep 2013 15:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgrr-000364-AJ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgrr-0004qB-8b for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:39 +0000 Date: Sun, 08 Sep 2013 15:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: update tx_ready callback for ARM serial drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95d43eb2e957470a3a96bcd94a2f1094bef12bde Author: Tomasz Wroblewski AuthorDate: Wed Aug 28 13:36:18 2013 +0200 Commit: Ian Campbell CommitDate: Wed Aug 28 12:50:00 2013 +0100 xen: update tx_ready callback for ARM serial drivers Type of tx_ready callback got changed to int to facilitate error condition, but the ARM serial drivers were not modified thus breaking the compilation. Reported-by: Julien Grall Signed-off-by: Tomasz Wroblewski --- xen/drivers/char/exynos4210-uart.c | 2 +- xen/drivers/char/omap-uart.c | 2 +- xen/drivers/char/pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index 9b34f92..b297ed4 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -221,7 +221,7 @@ static void exynos4210_uart_resume(struct serial_port *port) BUG(); // XXX } -static unsigned int exynos4210_uart_tx_ready(struct serial_port *port) +static int exynos4210_uart_tx_ready(struct serial_port *port) { struct exynos4210_uart *uart = port->uart; diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 91391c8..ffa71db 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -226,7 +226,7 @@ static void omap_uart_resume(struct serial_port *port) BUG(); } -static unsigned int omap_uart_tx_ready(struct serial_port *port) +static int omap_uart_tx_ready(struct serial_port *port) { struct omap_uart *uart = port->uart; uint32_t reg; diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 3ea0d41..3ec6e10 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -155,7 +155,7 @@ static void pl011_resume(struct serial_port *port) BUG(); // XXX } -static unsigned int pl011_tx_ready(struct serial_port *port) +static int pl011_tx_ready(struct serial_port *port) { struct pl011 *uart = port->uart; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25: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 1VIgs6-0006t7-No; Sun, 08 Sep 2013 15:25:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgs4-0006sb-Ns for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:53 +0000 Received: from [85.158.139.211:13683] by server-11.bemta-5.messagelabs.com id 73/63-10409-0079C225; Sun, 08 Sep 2013 15:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1378653949!1306805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24865 invoked from network); 8 Sep 2013 15:25:50 -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; 8 Sep 2013 15:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgs1-00036A-Hx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgs1-0004qb-Dj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:49 +0000 Date: Sun, 08 Sep 2013 15:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 062919448e2f4b127c9c3c085b1a8e1d56a33051 Author: Jan Beulich AuthorDate: Wed Aug 28 17:03:50 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 17:03:50 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 462d7c7..8794b82 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3899,8 +3896,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4168,7 +4166,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:25:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:25: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 1VIgs6-0006t7-No; Sun, 08 Sep 2013 15:25:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgs4-0006sb-Ns for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:53 +0000 Received: from [85.158.139.211:13683] by server-11.bemta-5.messagelabs.com id 73/63-10409-0079C225; Sun, 08 Sep 2013 15:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1378653949!1306805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24865 invoked from network); 8 Sep 2013 15:25:50 -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; 8 Sep 2013 15:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgs1-00036A-Hx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgs1-0004qb-Dj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:49 +0000 Date: Sun, 08 Sep 2013 15:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 062919448e2f4b127c9c3c085b1a8e1d56a33051 Author: Jan Beulich AuthorDate: Wed Aug 28 17:03:50 2013 +0200 Commit: Jan Beulich CommitDate: Wed Aug 28 17:03:50 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 462d7c7..8794b82 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3899,8 +3896,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4168,7 +4166,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsF-0006v3-Ty; Sun, 08 Sep 2013 15:26:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsE-0006ui-7B for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:02 +0000 Received: from [85.158.143.35:12515] by server-2.bemta-4.messagelabs.com id 18/5D-26052-9079C225; Sun, 08 Sep 2013 15:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378653959!2185717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 625 invoked from network); 8 Sep 2013 15:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsB-00036J-MI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsB-0004qx-L5 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:59 +0000 Date: Sun, 08 Sep 2013 15:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: add missing checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3785d30efe8264b899499e0883b10cc434bd0959 Author: Jan Beulich AuthorDate: Thu Aug 29 09:31:37 2013 +0200 Commit: Jan Beulich CommitDate: Thu Aug 29 09:31:37 2013 +0200 AMD IOMMU: add missing checks For one we shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). And then we shouldn't memset() a pointer allocation of which failed. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 6f270b8..c903f93 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -674,6 +674,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_2_idx ) { if ( ioapic_sbdf[special->handle].bdf == bdf && @@ -943,13 +950,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) { ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( u16, nr_ioapic_entries[apic]); - if ( !ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, + nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); + else { printk(XENLOG_ERR "IVHD Error: Out of memory\n"); error = -ENOMEM; } - memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, - nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsF-0006v3-Ty; Sun, 08 Sep 2013 15:26:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsE-0006ui-7B for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:02 +0000 Received: from [85.158.143.35:12515] by server-2.bemta-4.messagelabs.com id 18/5D-26052-9079C225; Sun, 08 Sep 2013 15:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378653959!2185717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 625 invoked from network); 8 Sep 2013 15:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsB-00036J-MI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsB-0004qx-L5 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:25:59 +0000 Date: Sun, 08 Sep 2013 15:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: add missing checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3785d30efe8264b899499e0883b10cc434bd0959 Author: Jan Beulich AuthorDate: Thu Aug 29 09:31:37 2013 +0200 Commit: Jan Beulich CommitDate: Thu Aug 29 09:31:37 2013 +0200 AMD IOMMU: add missing checks For one we shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). And then we shouldn't memset() a pointer allocation of which failed. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 6f270b8..c903f93 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -674,6 +674,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != special->handle ) continue; + if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + special->handle); + return 0; + } + if ( ioapic_sbdf[special->handle].pin_2_idx ) { if ( ioapic_sbdf[special->handle].bdf == bdf && @@ -943,13 +950,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) { ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( u16, nr_ioapic_entries[apic]); - if ( !ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, + nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); + else { printk(XENLOG_ERR "IVHD Error: Out of memory\n"); error = -ENOMEM; } - memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, - nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsR-0006x3-0o; Sun, 08 Sep 2013 15:26:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsP-0006wn-1s for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:13 +0000 Received: from [85.158.139.211:63794] by server-14.bemta-5.messagelabs.com id 0F/CD-12040-4179C225; Sun, 08 Sep 2013 15:26:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1378653970!1320666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5176 invoked from network); 8 Sep 2013 15:26:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsL-00036s-Rx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsL-0004rW-PZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:09 +0000 Date: Sun, 08 Sep 2013 15:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: allow command line overrides for broken IVRS 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 fb3f1c1855bd9aca625bc0d040be4cdcc216e958 Author: Jan Beulich AuthorDate: Thu Aug 29 09:53:07 2013 +0200 Commit: Jan Beulich CommitDate: Thu Aug 29 09:53:07 2013 +0200 AMD IOMMU: allow command line overrides for broken IVRS tables With there being so many systems with broken ACPI tables, and with it generally being known what's wrong with those tables, give people a handle to overcome the resulting disabling of their IOMMUs. Inspired by Linux side patches providing similar functionality. Suggested-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-By: Sander Eikelenboom Acked-by: Keir Fraser Acked-by: Suravee Suthikulpanit --- docs/misc/xen-command-line.markdown | 14 ++++ xen/common/kernel.c | 16 +++++ xen/drivers/passthrough/amd/iommu_acpi.c | 88 ++++++++++++++++++++----- xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 1 + 4 files changed, 101 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 13c0306..a86014b 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -578,6 +578,20 @@ debug hypervisor only). > `= ` ### irq\_vector\_map +### ivrs_hpet[``] +> `=[:]:.` + +Force the use of `[:]:.` as device ID of HPET +`` instead of the one specified by the IVHD sub-tables of the IVRS +ACPI table. + +### ivrs_ioapic[``] +> `=[:]:.` + +Force the use of `[:]:.` as device ID of IO-APIC +`` instead of the one specified by the IVHD sub-tables of the IVRS +ACPI table. + ### lapic Force the use of use of the local APIC on a uniprocessor system, even diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 72fb905..b8707d9 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -81,9 +81,15 @@ void __init cmdline_parse(const char *cmdline) /* Search for value part of a key=value option. */ optval = strchr(opt, '='); if ( optval != NULL ) + { *optval++ = '\0'; /* nul-terminate the option value */ + q = strpbrk(opt, "([{<"); + } else + { optval = q; /* default option value is empty string */ + q = NULL; + } /* Boolean parameters can be inverted with 'no-' prefix. */ bool_assert = !!strncmp("no-", optkey, 3); @@ -93,7 +99,17 @@ void __init cmdline_parse(const char *cmdline) for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) + { + if ( param->type == OPT_CUSTOM && q && + strlen(param->name) == q + 1 - opt && + !strncmp(param->name, opt, q + 1 - opt) ) + { + optval[-1] = '='; + ((void (*)(const char *))param->var)(q); + optval[-1] = '\0'; + } continue; + } switch ( param->type ) { diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index c903f93..89b359c 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -633,6 +633,50 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } +static __initdata DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); + +static void __init parse_ivrs_ioapic(char *str) +{ + const char *s = str; + unsigned long id; + unsigned int seg, bus, dev, func; + + ASSERT(*s == '['); + id = simple_strtoul(s + 1, &s, 0); + if ( id >= ARRAY_SIZE(ioapic_sbdf) || *s != ']' || *++s != '=' ) + return; + + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || *s ) + return; + + ioapic_sbdf[id].bdf = PCI_BDF(bus, dev, func); + ioapic_sbdf[id].seg = seg; + __set_bit(id, ioapic_cmdline); +} +custom_param("ivrs_ioapic[", parse_ivrs_ioapic); + +static void __init parse_ivrs_hpet(char *str) +{ + const char *s = str; + unsigned long id; + unsigned int seg, bus, dev, func; + + ASSERT(*s == '['); + id = simple_strtoul(s + 1, &s, 0); + if ( id != (typeof(hpet_sbdf.id))id || *s != ']' || *++s != '=' ) + return; + + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || *s ) + return; + + hpet_sbdf.bdf = PCI_BDF(bus, dev, func); + hpet_sbdf.seg = seg; + hpet_sbdf.cmdline = 1; +} +custom_param("ivrs_hpet[", parse_ivrs_hpet); + static u16 __init parse_ivhd_device_special( const struct acpi_ivrs_device8c *special, u16 seg, u16 header_length, u16 block_length, struct amd_iommu *iommu) @@ -681,7 +725,10 @@ static u16 __init parse_ivhd_device_special( return 0; } - if ( ioapic_sbdf[special->handle].pin_2_idx ) + if ( test_bit(special->handle, ioapic_cmdline) ) + AMD_IOMMU_DEBUG("IVHD: Command line override present for IO-APIC %#x\n", + special->handle); + else if ( ioapic_sbdf[special->handle].pin_2_idx ) { if ( ioapic_sbdf[special->handle].bdf == bdf && ioapic_sbdf[special->handle].seg == seg ) @@ -724,14 +771,18 @@ static u16 __init parse_ivhd_device_special( break; case ACPI_IVHD_HPET: /* set device id of hpet */ - if ( hpet_sbdf.iommu ) + if ( hpet_sbdf.iommu || + (hpet_sbdf.cmdline && hpet_sbdf.id != special->handle) ) { printk(XENLOG_WARNING "Only one IVHD HPET entry is supported\n"); break; } hpet_sbdf.id = special->handle; - hpet_sbdf.bdf = bdf; - hpet_sbdf.seg = seg; + if ( !hpet_sbdf.cmdline ) + { + hpet_sbdf.bdf = bdf; + hpet_sbdf.seg = seg; + } hpet_sbdf.iommu = iommu; break; default: @@ -942,22 +993,23 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) continue; - printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", - IO_APIC_ID(apic)); - if ( amd_iommu_perdev_intremap ) - error = -ENXIO; + if ( !test_bit(IO_APIC_ID(apic), ioapic_cmdline) ) + { + printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", + IO_APIC_ID(apic)); + if ( amd_iommu_perdev_intremap ) + return -ENXIO; + } + + ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( + u16, nr_ioapic_entries[apic]); + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, + nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); else { - ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( - u16, nr_ioapic_entries[apic]); - if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) - memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, - nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); - else - { - printk(XENLOG_ERR "IVHD Error: Out of memory\n"); - error = -ENOMEM; - } + printk(XENLOG_ERR "IVHD Error: Out of memory\n"); + error = -ENOMEM; } } diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h index 7736ff4..3e6961d 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h @@ -108,6 +108,7 @@ extern struct ioapic_sbdf { extern struct hpet_sbdf { u16 bdf, seg, id; + bool_t cmdline; struct amd_iommu *iommu; } hpet_sbdf; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsR-0006x3-0o; Sun, 08 Sep 2013 15:26:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsP-0006wn-1s for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:13 +0000 Received: from [85.158.139.211:63794] by server-14.bemta-5.messagelabs.com id 0F/CD-12040-4179C225; Sun, 08 Sep 2013 15:26:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1378653970!1320666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5176 invoked from network); 8 Sep 2013 15:26:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsL-00036s-Rx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsL-0004rW-PZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:09 +0000 Date: Sun, 08 Sep 2013 15:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: allow command line overrides for broken IVRS 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 fb3f1c1855bd9aca625bc0d040be4cdcc216e958 Author: Jan Beulich AuthorDate: Thu Aug 29 09:53:07 2013 +0200 Commit: Jan Beulich CommitDate: Thu Aug 29 09:53:07 2013 +0200 AMD IOMMU: allow command line overrides for broken IVRS tables With there being so many systems with broken ACPI tables, and with it generally being known what's wrong with those tables, give people a handle to overcome the resulting disabling of their IOMMUs. Inspired by Linux side patches providing similar functionality. Suggested-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-By: Sander Eikelenboom Acked-by: Keir Fraser Acked-by: Suravee Suthikulpanit --- docs/misc/xen-command-line.markdown | 14 ++++ xen/common/kernel.c | 16 +++++ xen/drivers/passthrough/amd/iommu_acpi.c | 88 ++++++++++++++++++++----- xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 1 + 4 files changed, 101 insertions(+), 18 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 13c0306..a86014b 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -578,6 +578,20 @@ debug hypervisor only). > `= ` ### irq\_vector\_map +### ivrs_hpet[``] +> `=[:]:.` + +Force the use of `[:]:.` as device ID of HPET +`` instead of the one specified by the IVHD sub-tables of the IVRS +ACPI table. + +### ivrs_ioapic[``] +> `=[:]:.` + +Force the use of `[:]:.` as device ID of IO-APIC +`` instead of the one specified by the IVHD sub-tables of the IVRS +ACPI table. + ### lapic Force the use of use of the local APIC on a uniprocessor system, even diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 72fb905..b8707d9 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -81,9 +81,15 @@ void __init cmdline_parse(const char *cmdline) /* Search for value part of a key=value option. */ optval = strchr(opt, '='); if ( optval != NULL ) + { *optval++ = '\0'; /* nul-terminate the option value */ + q = strpbrk(opt, "([{<"); + } else + { optval = q; /* default option value is empty string */ + q = NULL; + } /* Boolean parameters can be inverted with 'no-' prefix. */ bool_assert = !!strncmp("no-", optkey, 3); @@ -93,7 +99,17 @@ void __init cmdline_parse(const char *cmdline) for ( param = &__setup_start; param < &__setup_end; param++ ) { if ( strcmp(param->name, optkey) ) + { + if ( param->type == OPT_CUSTOM && q && + strlen(param->name) == q + 1 - opt && + !strncmp(param->name, opt, q + 1 - opt) ) + { + optval[-1] = '='; + ((void (*)(const char *))param->var)(q); + optval[-1] = '\0'; + } continue; + } switch ( param->type ) { diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index c903f93..89b359c 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -633,6 +633,50 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } +static __initdata DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); + +static void __init parse_ivrs_ioapic(char *str) +{ + const char *s = str; + unsigned long id; + unsigned int seg, bus, dev, func; + + ASSERT(*s == '['); + id = simple_strtoul(s + 1, &s, 0); + if ( id >= ARRAY_SIZE(ioapic_sbdf) || *s != ']' || *++s != '=' ) + return; + + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || *s ) + return; + + ioapic_sbdf[id].bdf = PCI_BDF(bus, dev, func); + ioapic_sbdf[id].seg = seg; + __set_bit(id, ioapic_cmdline); +} +custom_param("ivrs_ioapic[", parse_ivrs_ioapic); + +static void __init parse_ivrs_hpet(char *str) +{ + const char *s = str; + unsigned long id; + unsigned int seg, bus, dev, func; + + ASSERT(*s == '['); + id = simple_strtoul(s + 1, &s, 0); + if ( id != (typeof(hpet_sbdf.id))id || *s != ']' || *++s != '=' ) + return; + + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || *s ) + return; + + hpet_sbdf.bdf = PCI_BDF(bus, dev, func); + hpet_sbdf.seg = seg; + hpet_sbdf.cmdline = 1; +} +custom_param("ivrs_hpet[", parse_ivrs_hpet); + static u16 __init parse_ivhd_device_special( const struct acpi_ivrs_device8c *special, u16 seg, u16 header_length, u16 block_length, struct amd_iommu *iommu) @@ -681,7 +725,10 @@ static u16 __init parse_ivhd_device_special( return 0; } - if ( ioapic_sbdf[special->handle].pin_2_idx ) + if ( test_bit(special->handle, ioapic_cmdline) ) + AMD_IOMMU_DEBUG("IVHD: Command line override present for IO-APIC %#x\n", + special->handle); + else if ( ioapic_sbdf[special->handle].pin_2_idx ) { if ( ioapic_sbdf[special->handle].bdf == bdf && ioapic_sbdf[special->handle].seg == seg ) @@ -724,14 +771,18 @@ static u16 __init parse_ivhd_device_special( break; case ACPI_IVHD_HPET: /* set device id of hpet */ - if ( hpet_sbdf.iommu ) + if ( hpet_sbdf.iommu || + (hpet_sbdf.cmdline && hpet_sbdf.id != special->handle) ) { printk(XENLOG_WARNING "Only one IVHD HPET entry is supported\n"); break; } hpet_sbdf.id = special->handle; - hpet_sbdf.bdf = bdf; - hpet_sbdf.seg = seg; + if ( !hpet_sbdf.cmdline ) + { + hpet_sbdf.bdf = bdf; + hpet_sbdf.seg = seg; + } hpet_sbdf.iommu = iommu; break; default: @@ -942,22 +993,23 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) continue; - printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", - IO_APIC_ID(apic)); - if ( amd_iommu_perdev_intremap ) - error = -ENXIO; + if ( !test_bit(IO_APIC_ID(apic), ioapic_cmdline) ) + { + printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", + IO_APIC_ID(apic)); + if ( amd_iommu_perdev_intremap ) + return -ENXIO; + } + + ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( + u16, nr_ioapic_entries[apic]); + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, + nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); else { - ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx = xmalloc_array( - u16, nr_ioapic_entries[apic]); - if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) - memset(ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx, -1, - nr_ioapic_entries[apic] * sizeof(*ioapic_sbdf->pin_2_idx)); - else - { - printk(XENLOG_ERR "IVHD Error: Out of memory\n"); - error = -ENOMEM; - } + printk(XENLOG_ERR "IVHD Error: Out of memory\n"); + error = -ENOMEM; } } diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h index 7736ff4..3e6961d 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h @@ -108,6 +108,7 @@ extern struct ioapic_sbdf { extern struct hpet_sbdf { u16 bdf, seg, id; + bool_t cmdline; struct amd_iommu *iommu; } hpet_sbdf; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsa-0006ym-40; Sun, 08 Sep 2013 15:26:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsY-0006yW-BG for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:22 +0000 Received: from [193.109.254.147:12444] by server-8.bemta-14.messagelabs.com id B1/A1-14324-D179C225; Sun, 08 Sep 2013 15:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378653980!1497651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 730 invoked from network); 8 Sep 2013 15:26:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsW-00036y-0r for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsV-0004sO-VK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:19 +0000 Date: Sun, 08 Sep 2013 15:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader/smbios: Correctly count the number of tables written X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4aa19549e17650b9bfe2b31d7f52a95696d388f0 Author: Andrew Cooper AuthorDate: Fri Aug 30 10:40:29 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:40:29 2013 +0200 hvmloader/smbios: Correctly count the number of tables written Fixes regression indirectly introduced by c/s 4d23036e709627 That changeset added some smbios tables which were option based on the toolstack providing appropriate xenstore keys. The do_struct() macro would unconditionally increment nr_structs, even if a table was not actually written. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- tools/firmware/hvmloader/smbios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 3d5dc51..9f292cc 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -192,7 +192,8 @@ write_smbios_tables(void *ep, void *start, #define do_struct(fn) do { \ q = (fn); \ - (*nr_structs)++; \ + if ( q != p ) \ + (*nr_structs)++; \ if ( (q - p) > *max_struct_size ) \ *max_struct_size = q - p; \ p = q; \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsa-0006ym-40; Sun, 08 Sep 2013 15:26:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsY-0006yW-BG for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:22 +0000 Received: from [193.109.254.147:12444] by server-8.bemta-14.messagelabs.com id B1/A1-14324-D179C225; Sun, 08 Sep 2013 15:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1378653980!1497651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 730 invoked from network); 8 Sep 2013 15:26:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsW-00036y-0r for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsV-0004sO-VK for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:19 +0000 Date: Sun, 08 Sep 2013 15:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader/smbios: Correctly count the number of tables written X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4aa19549e17650b9bfe2b31d7f52a95696d388f0 Author: Andrew Cooper AuthorDate: Fri Aug 30 10:40:29 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:40:29 2013 +0200 hvmloader/smbios: Correctly count the number of tables written Fixes regression indirectly introduced by c/s 4d23036e709627 That changeset added some smbios tables which were option based on the toolstack providing appropriate xenstore keys. The do_struct() macro would unconditionally increment nr_structs, even if a table was not actually written. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- tools/firmware/hvmloader/smbios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 3d5dc51..9f292cc 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -192,7 +192,8 @@ write_smbios_tables(void *ep, void *start, #define do_struct(fn) do { \ q = (fn); \ - (*nr_structs)++; \ + if ( q != p ) \ + (*nr_structs)++; \ if ( (q - p) > *max_struct_size ) \ *max_struct_size = q - p; \ p = q; \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsk-00070T-6g; Sun, 08 Sep 2013 15:26:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsi-000709-Il for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:32 +0000 Received: from [193.109.254.147:46670] by server-15.bemta-14.messagelabs.com id 5C/EE-10716-7279C225; Sun, 08 Sep 2013 15:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653990!246726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13406 invoked from network); 8 Sep 2013 15:26:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsg-000376-5G for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsg-0004sl-3j for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:30 +0000 Date: Sun, 08 Sep 2013 15:26:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f4cb23c3ea5b987c49c9a9368e7a0d505ec064f Author: Andrew Cooper AuthorDate: Fri Aug 30 10:40:48 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:40:48 2013 +0200 public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings The old code for OEM SMBios strings was: char path[20] = "bios-strings/oem-XX"; path[(sizeof path) - 3] = '0' + ((i < 10) ? i : i / 10); path[(sizeof path) - 2] = (i < 10) ? '\0' : '0' + (i % 10); Where oem-1 thru 9 specifically had no leading 0. However, the definition of HVM_XS_OEM_STRINGS specifically requires leading 0s. This regression was introduced by the combination of c/s 4d23036e709627 and e64c3f71ceb662 I realise that this patch causes a change to the public headers. However I feel it is justified as: * All toolstacks used to have to embed the magic string (and almost certainly still do) * If by some miriacle a new toolstack has started using the new define will continue to work. * The only intree consumer of the define is hvmloader itself. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/include/public/hvm/hvm_xs_strings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index 4de5881..8aec935 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -75,6 +75,6 @@ /* 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" +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%d" #endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgsk-00070T-6g; Sun, 08 Sep 2013 15:26:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsi-000709-Il for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:32 +0000 Received: from [193.109.254.147:46670] by server-15.bemta-14.messagelabs.com id 5C/EE-10716-7279C225; Sun, 08 Sep 2013 15:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1378653990!246726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13406 invoked from network); 8 Sep 2013 15:26:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsg-000376-5G for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsg-0004sl-3j for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:30 +0000 Date: Sun, 08 Sep 2013 15:26:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f4cb23c3ea5b987c49c9a9368e7a0d505ec064f Author: Andrew Cooper AuthorDate: Fri Aug 30 10:40:48 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:40:48 2013 +0200 public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings The old code for OEM SMBios strings was: char path[20] = "bios-strings/oem-XX"; path[(sizeof path) - 3] = '0' + ((i < 10) ? i : i / 10); path[(sizeof path) - 2] = (i < 10) ? '\0' : '0' + (i % 10); Where oem-1 thru 9 specifically had no leading 0. However, the definition of HVM_XS_OEM_STRINGS specifically requires leading 0s. This regression was introduced by the combination of c/s 4d23036e709627 and e64c3f71ceb662 I realise that this patch causes a change to the public headers. However I feel it is justified as: * All toolstacks used to have to embed the magic string (and almost certainly still do) * If by some miriacle a new toolstack has started using the new define will continue to work. * The only intree consumer of the define is hvmloader itself. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/include/public/hvm/hvm_xs_strings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index 4de5881..8aec935 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -75,6 +75,6 @@ /* 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" +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%d" #endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsv-00072S-AG; Sun, 08 Sep 2013 15:26:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgst-000727-BV for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:43 +0000 Received: from [85.158.143.35:31871] by server-2.bemta-4.messagelabs.com id 63/8D-26052-2379C225; Sun, 08 Sep 2013 15:26:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1378654000!2196858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18612 invoked from network); 8 Sep 2013 15:26:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsq-00037F-9y for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsq-0004tA-8p for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:40 +0000 Date: Sun, 08 Sep 2013 15:26:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove references to unimplemented BIOS reboot option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 735be2c1db9651b552c1df636742aaeab00ec538 Author: Matt Wilson AuthorDate: Fri Aug 30 10:49:59 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:49:59 2013 +0200 x86: remove references to unimplemented BIOS reboot option The BIOS reboot option was never implemented for x86_64, and retaining it is somewhat false advertising. Signed-off-by: Matt Wilson Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 5 +--- xen/arch/x86/shutdown.c | 42 ++++++++++++++-------------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a86014b..2da29b7 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -761,7 +761,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -771,9 +771,6 @@ Specify the host reboot method. `cold` instructs Xen to set the cold reboot flag. -`bios` instructs Xen to reboot the host by jumping to BIOS. This is -only available on 32-bit x86 platforms. - `triple` instructs Xen to reboot the host by causing a triple fault. `kbd` instructs Xen to reboot the host via the keyboard controller. diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 4715681..167905a 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -31,7 +31,6 @@ enum reboot_type { BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', - BOOT_BIOS = 'b', BOOT_CF9 = 'p', }; @@ -42,7 +41,6 @@ static int reboot_mode; * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag - * bios Reboot by jumping through the BIOS (only for X86_32) * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT @@ -64,7 +62,6 @@ static void __init set_reboot_type(char *str) case 'c': /* "cold" reboot (with memory testing etc) */ reboot_mode = 0x0; break; - case 'b': case 'a': case 'k': case 't': @@ -112,7 +109,6 @@ static int __init override_reboot(struct dmi_system_id *d) { static const char *__initdata msg[] = { - [BOOT_BIOS] = "BIOS", [BOOT_KBD] = "keyboard controller", [BOOT_CF9] = "PCI", }; @@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d) static struct dmi_system_id __initdata reboot_dmi_table[] = { { /* Handle problems with rebooting on Dell E520's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell E520", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -137,7 +133,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 1300's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 1300", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -146,7 +142,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 300's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 300", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -155,7 +151,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745's SFF */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -164,7 +160,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745's DFF */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -174,7 +170,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -184,7 +180,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 330", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -194,7 +190,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 360", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -204,7 +200,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 760", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -214,7 +210,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 2400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 2400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -223,7 +219,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell T5400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell Precision T5400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -232,7 +228,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell T7400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell Precision T7400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -241,7 +237,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on HP laptops */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "HP Compaq Laptop", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), @@ -250,7 +246,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell XPS710 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell XPS710", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -259,7 +255,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell DXP061 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell DXP061", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -268,7 +264,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Sony VGN-Z540N */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Sony VGN-Z540N", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), @@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on ASUS P4S800 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "ASUS P4S800", .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), @@ -530,10 +526,6 @@ void machine_restart(unsigned int delay_millisecs) asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) ); reboot_type = BOOT_KBD; break; - case BOOT_BIOS: - /* unsupported on x86_64 */ - reboot_type = BOOT_KBD; - break; case BOOT_ACPI: acpi_reboot(); reboot_type = BOOT_KBD; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsv-00072S-AG; Sun, 08 Sep 2013 15:26:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgst-000727-BV for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:43 +0000 Received: from [85.158.143.35:31871] by server-2.bemta-4.messagelabs.com id 63/8D-26052-2379C225; Sun, 08 Sep 2013 15:26:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1378654000!2196858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18612 invoked from network); 8 Sep 2013 15:26:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgsq-00037F-9y for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgsq-0004tA-8p for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:40 +0000 Date: Sun, 08 Sep 2013 15:26:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove references to unimplemented BIOS reboot option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 735be2c1db9651b552c1df636742aaeab00ec538 Author: Matt Wilson AuthorDate: Fri Aug 30 10:49:59 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:49:59 2013 +0200 x86: remove references to unimplemented BIOS reboot option The BIOS reboot option was never implemented for x86_64, and retaining it is somewhat false advertising. Signed-off-by: Matt Wilson Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 5 +--- xen/arch/x86/shutdown.c | 42 ++++++++++++++-------------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a86014b..2da29b7 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -761,7 +761,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -771,9 +771,6 @@ Specify the host reboot method. `cold` instructs Xen to set the cold reboot flag. -`bios` instructs Xen to reboot the host by jumping to BIOS. This is -only available on 32-bit x86 platforms. - `triple` instructs Xen to reboot the host by causing a triple fault. `kbd` instructs Xen to reboot the host via the keyboard controller. diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 4715681..167905a 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -31,7 +31,6 @@ enum reboot_type { BOOT_TRIPLE = 't', BOOT_KBD = 'k', BOOT_ACPI = 'a', - BOOT_BIOS = 'b', BOOT_CF9 = 'p', }; @@ -42,7 +41,6 @@ static int reboot_mode; * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag - * bios Reboot by jumping through the BIOS (only for X86_32) * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT @@ -64,7 +62,6 @@ static void __init set_reboot_type(char *str) case 'c': /* "cold" reboot (with memory testing etc) */ reboot_mode = 0x0; break; - case 'b': case 'a': case 'k': case 't': @@ -112,7 +109,6 @@ static int __init override_reboot(struct dmi_system_id *d) { static const char *__initdata msg[] = { - [BOOT_BIOS] = "BIOS", [BOOT_KBD] = "keyboard controller", [BOOT_CF9] = "PCI", }; @@ -128,7 +124,7 @@ static int __init override_reboot(struct dmi_system_id *d) static struct dmi_system_id __initdata reboot_dmi_table[] = { { /* Handle problems with rebooting on Dell E520's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell E520", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -137,7 +133,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 1300's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 1300", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -146,7 +142,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 300's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 300", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -155,7 +151,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745's SFF */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -164,7 +160,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745's DFF */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -174,7 +170,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 745", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -184,7 +180,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 330", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -194,7 +190,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 360", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -204,7 +200,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell OptiPlex 760", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -214,7 +210,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell 2400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell PowerEdge 2400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -223,7 +219,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell T5400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell Precision T5400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -232,7 +228,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell T7400's */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell Precision T7400", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -241,7 +237,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on HP laptops */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "HP Compaq Laptop", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), @@ -250,7 +246,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell XPS710 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell XPS710", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -259,7 +255,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Dell DXP061 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Dell DXP061", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -268,7 +264,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on Sony VGN-Z540N */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "Sony VGN-Z540N", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), @@ -277,7 +273,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on ASUS P4S800 */ .callback = override_reboot, - .driver_data = (void *)(long)BOOT_BIOS, + .driver_data = (void *)(long)BOOT_KBD, .ident = "ASUS P4S800", .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), @@ -530,10 +526,6 @@ void machine_restart(unsigned int delay_millisecs) asm volatile ( "lidt %0 ; int3" : "=m" (no_idt) ); reboot_type = BOOT_KBD; break; - case BOOT_BIOS: - /* unsupported on x86_64 */ - reboot_type = BOOT_KBD; - break; case BOOT_ACPI: acpi_reboot(); reboot_type = BOOT_KBD; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgt4-00074U-FA; Sun, 08 Sep 2013 15:26:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgt3-00074G-ES for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:53 +0000 Received: from [85.158.137.68:31798] by server-4.bemta-3.messagelabs.com id D2/18-13758-C379C225; Sun, 08 Sep 2013 15:26:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378654010!808990!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16653 invoked from network); 8 Sep 2013 15:26:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgt0-00037P-FU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgt0-0004td-Ct for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:50 +0000 Date: Sun, 08 Sep 2013 15:26:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove DMI checks in bigsmp driver for obsolete systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ab9e14530c58be4aa30c811bfaef35f64bdd90d Author: Matt Wilson AuthorDate: Fri Aug 30 10:53:33 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:53:33 2013 +0200 x86/apic: remove DMI checks in bigsmp driver for obsolete systems The DMI checks that force the use of the bigsmp APIC driver are for systems that are no longer supported by Xen (32-bit x86). Signed-off-by: Matt Wilson Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/genapic/bigsmp.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 96b23d6..411ddcf 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -21,15 +21,6 @@ static __init int force_bigsmp(struct dmi_system_id *d) static struct dmi_system_id __initdata bigsmp_dmi_table[] = { - { force_bigsmp, "HP ProLiant DL760 G2", { - DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P44-"), - }}, - - { force_bigsmp, "HP ProLiant DL740", { - DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P47-"), - }}, { force_bigsmp, "UNISYS ES7000-ONE", { DMI_MATCH(DMI_PRODUCT_NAME, "ES7000-ONE") }}, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:26:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:26: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 1VIgt4-00074U-FA; Sun, 08 Sep 2013 15:26:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgt3-00074G-ES for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:53 +0000 Received: from [85.158.137.68:31798] by server-4.bemta-3.messagelabs.com id D2/18-13758-C379C225; Sun, 08 Sep 2013 15:26:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378654010!808990!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16653 invoked from network); 8 Sep 2013 15:26:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:26:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgt0-00037P-FU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgt0-0004td-Ct for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:26:50 +0000 Date: Sun, 08 Sep 2013 15:26:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/apic: remove DMI checks in bigsmp driver for obsolete systems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ab9e14530c58be4aa30c811bfaef35f64bdd90d Author: Matt Wilson AuthorDate: Fri Aug 30 10:53:33 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:53:33 2013 +0200 x86/apic: remove DMI checks in bigsmp driver for obsolete systems The DMI checks that force the use of the bigsmp APIC driver are for systems that are no longer supported by Xen (32-bit x86). Signed-off-by: Matt Wilson Acked-by: Keir Fraser Reviewed-by: Andrew Cooper --- xen/arch/x86/genapic/bigsmp.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 96b23d6..411ddcf 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -21,15 +21,6 @@ static __init int force_bigsmp(struct dmi_system_id *d) static struct dmi_system_id __initdata bigsmp_dmi_table[] = { - { force_bigsmp, "HP ProLiant DL760 G2", { - DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P44-"), - }}, - - { force_bigsmp, "HP ProLiant DL740", { - DMI_MATCH(DMI_BIOS_VENDOR, "HP"), - DMI_MATCH(DMI_BIOS_VERSION, "P47-"), - }}, { force_bigsmp, "UNISYS ES7000-ONE", { DMI_MATCH(DMI_PRODUCT_NAME, "ES7000-ONE") }}, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtE-00076O-IG; Sun, 08 Sep 2013 15:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtD-00076A-CQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:03 +0000 Received: from [85.158.137.68:30548] by server-5.bemta-3.messagelabs.com id 42/1C-23058-6479C225; Sun, 08 Sep 2013 15:27:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378654020!816597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20843 invoked from network); 8 Sep 2013 15:27:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtA-00037Y-Lt for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtA-0004u0-Jn for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:00 +0000 Date: Sun, 08 Sep 2013 15:27:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove X86_INTEL_USERCOPY code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9758fb369c558dacccf67800b178ab77a17d011 Author: Matt Wilson AuthorDate: Fri Aug 30 10:54:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:54:00 2013 +0200 x86: remove X86_INTEL_USERCOPY code Nothing defines CONFIG_X86_INTEL_USERCOPY, and as far as I can tell it was never used even when Xen supported 32-bit x86. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/intel.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9b71d36..072ecbc 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -18,13 +18,6 @@ #define select_idle_routine(x) ((void)0) -#ifdef CONFIG_X86_INTEL_USERCOPY -/* - * Alignment at which movsl is preferred for bulk memory copies. - */ -struct movsl_mask movsl_mask __read_mostly; -#endif - static unsigned int probe_intel_cpuid_faulting(void) { uint64_t x; @@ -229,20 +222,6 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) /* Work around errata */ Intel_errata_workarounds(c); -#ifdef CONFIG_X86_INTEL_USERCOPY - /* - * Set up the preferred alignment for movsl bulk memory moves - */ - switch (c->x86) { - case 6: /* PII/PIII only like movsl with 8-byte alignment */ - movsl_mask.mask = 7; - break; - case 15: /* P4 is OK down to 8-byte alignment */ - movsl_mask.mask = 7; - break; - } -#endif - if ((c->x86 == 0xf && c->x86_model >= 0x03) || (c->x86 == 0x6 && c->x86_model >= 0x0e)) set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtE-00076O-IG; Sun, 08 Sep 2013 15:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtD-00076A-CQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:03 +0000 Received: from [85.158.137.68:30548] by server-5.bemta-3.messagelabs.com id 42/1C-23058-6479C225; Sun, 08 Sep 2013 15:27:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378654020!816597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20843 invoked from network); 8 Sep 2013 15:27:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtA-00037Y-Lt for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtA-0004u0-Jn for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:00 +0000 Date: Sun, 08 Sep 2013 15:27:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove X86_INTEL_USERCOPY code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a9758fb369c558dacccf67800b178ab77a17d011 Author: Matt Wilson AuthorDate: Fri Aug 30 10:54:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:54:00 2013 +0200 x86: remove X86_INTEL_USERCOPY code Nothing defines CONFIG_X86_INTEL_USERCOPY, and as far as I can tell it was never used even when Xen supported 32-bit x86. Signed-off-by: Matt Wilson Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/intel.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 9b71d36..072ecbc 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -18,13 +18,6 @@ #define select_idle_routine(x) ((void)0) -#ifdef CONFIG_X86_INTEL_USERCOPY -/* - * Alignment at which movsl is preferred for bulk memory copies. - */ -struct movsl_mask movsl_mask __read_mostly; -#endif - static unsigned int probe_intel_cpuid_faulting(void) { uint64_t x; @@ -229,20 +222,6 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) /* Work around errata */ Intel_errata_workarounds(c); -#ifdef CONFIG_X86_INTEL_USERCOPY - /* - * Set up the preferred alignment for movsl bulk memory moves - */ - switch (c->x86) { - case 6: /* PII/PIII only like movsl with 8-byte alignment */ - movsl_mask.mask = 7; - break; - case 15: /* P4 is OK down to 8-byte alignment */ - movsl_mask.mask = 7; - break; - } -#endif - if ((c->x86 == 0xf && c->x86_model >= 0x03) || (c->x86 == 0x6 && c->x86_model >= 0x0e)) set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15: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 1VIgtO-000785-L9; Sun, 08 Sep 2013 15:27:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtN-00077t-Py for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:13 +0000 Received: from [85.158.137.68:30852] by server-11.bemta-3.messagelabs.com id 71/E1-16607-0579C225; Sun, 08 Sep 2013 15:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378654031!812424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1073 invoked from network); 8 Sep 2013 15:27:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtL-000387-20 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtK-0004uX-P8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:10 +0000 Date: Sun, 08 Sep 2013 15:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove PentiumPro check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a497fc19b20e905d3e1b7bf2a845a243d55e0737 Author: Matt Wilson AuthorDate: Fri Aug 30 10:54:32 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:54:32 2013 +0200 x86: remove PentiumPro check ... as it's not a supported processor Signed-off-by: Matt Wilson Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 072ecbc..31b69c9 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -198,10 +198,6 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_ARCH_PERFMON, c->x86_capability); } - /* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */ - if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633) - clear_bit(X86_FEATURE_SEP, c->x86_capability); - if ( !cpu_has(c, X86_FEATURE_XTOPOLOGY) ) { c->x86_max_cores = num_cpu_cores(c); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15: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 1VIgtO-000785-L9; Sun, 08 Sep 2013 15:27:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtN-00077t-Py for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:13 +0000 Received: from [85.158.137.68:30852] by server-11.bemta-3.messagelabs.com id 71/E1-16607-0579C225; Sun, 08 Sep 2013 15:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378654031!812424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1073 invoked from network); 8 Sep 2013 15:27:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtL-000387-20 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtK-0004uX-P8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:10 +0000 Date: Sun, 08 Sep 2013 15:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove PentiumPro check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a497fc19b20e905d3e1b7bf2a845a243d55e0737 Author: Matt Wilson AuthorDate: Fri Aug 30 10:54:32 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:54:32 2013 +0200 x86: remove PentiumPro check ... as it's not a supported processor Signed-off-by: Matt Wilson Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 072ecbc..31b69c9 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -198,10 +198,6 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_ARCH_PERFMON, c->x86_capability); } - /* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */ - if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633) - clear_bit(X86_FEATURE_SEP, c->x86_capability); - if ( !cpu_has(c, X86_FEATURE_XTOPOLOGY) ) { c->x86_max_cores = num_cpu_cores(c); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27: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 1VIgtZ-0007A0-OQ; Sun, 08 Sep 2013 15:27:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtY-00079i-3K for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:24 +0000 Received: from [85.158.137.68:50953] by server-12.bemta-3.messagelabs.com id 55/3F-11891-B579C225; Sun, 08 Sep 2013 15:27:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378654041!813321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15719 invoked from network); 8 Sep 2013 15:27:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtV-00038D-9w for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtV-0004vd-70 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:21 +0000 Date: Sun, 08 Sep 2013 15:27:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6066e78f4a66005b0d5d86c6ade32e2ab78923a Author: Jan Beulich AuthorDate: Fri Aug 30 10:56:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:56:07 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 24c3dd8..e1220e6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -304,7 +304,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 2c00706..7e459d0 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -251,11 +251,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -264,6 +263,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -275,31 +275,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index dc3cb8e..9bea08b 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -82,6 +82,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27: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 1VIgtZ-0007A0-OQ; Sun, 08 Sep 2013 15:27:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtY-00079i-3K for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:24 +0000 Received: from [85.158.137.68:50953] by server-12.bemta-3.messagelabs.com id 55/3F-11891-B579C225; Sun, 08 Sep 2013 15:27:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378654041!813321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15719 invoked from network); 8 Sep 2013 15:27:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtV-00038D-9w for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtV-0004vd-70 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:21 +0000 Date: Sun, 08 Sep 2013 15:27:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6066e78f4a66005b0d5d86c6ade32e2ab78923a Author: Jan Beulich AuthorDate: Fri Aug 30 10:56:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:56:07 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 24c3dd8..e1220e6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -304,7 +304,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 2c00706..7e459d0 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -251,11 +251,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -264,6 +263,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -275,31 +275,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index dc3cb8e..9bea08b 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -82,6 +82,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27: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 1VIgtj-0007Bs-S7; Sun, 08 Sep 2013 15:27:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgti-0007Bg-IZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:34 +0000 Received: from [85.158.137.68:31287] by server-13.bemta-3.messagelabs.com id 4D/CD-25971-5679C225; Sun, 08 Sep 2013 15:27:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1378654051!813898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6423 invoked from network); 8 Sep 2013 15:27:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtf-00038L-F2 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtf-0004w0-D6 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:31 +0000 Date: Sun, 08 Sep 2013 15:27:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: remove assumption of one C-state per MWAIT flag X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3642ba0f692cfa9319fdeca82268238daba23794 Author: Len Brown AuthorDate: Fri Aug 30 10:58:21 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:58:21 2013 +0200 x86/mwait_idle: remove assumption of one C-state per MWAIT flag Remove the assumption that cstate_tables are indexed by MWAIT flag values. Each entry identifies itself via its own flags value. This change is needed to support multiple states that share the same MWAIT flags. Note that this can have an effect on what state is described by 'N' on cmdline max_cstate=N on some systems. Signed-off-by: Len Brown Avoided the effect of changing the meaning of "max_cstate=". Drop MWAIT_MAX_NUM_CSTATES (done differently in a prior patch on Linux). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 106 +++++++++++++++++++--------------------- xen/include/asm-x86/mwait.h | 1 - 2 files changed, 50 insertions(+), 57 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index e0c9707..ccfa750 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -116,146 +116,146 @@ static const struct cpuidle_state { */ #define flg2MWAIT(flags) (((flags) >> 24) & 0xFF) #define MWAIT2flg(eax) ((eax & 0xFF) << 24) +#define MWAIT_HINT2CSTATE(hint) (((hint) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) +#define MWAIT_HINT2SUBSTATE(hint) ((hint) & MWAIT_CSTATE_MASK) /* * States are indexed by the cstate number, * which is also the index into the MWAIT hint array. * Thus C0 is a dummy. */ -static const struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state nehalem_cstates[] = { + { .name = "C1-NHM", .flags = MWAIT2flg(0x00), .exit_latency = 3, .target_residency = 6, }, - { /* MWAIT C2 */ + { .name = "C3-NHM", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 20, .target_residency = 80, }, - { /* MWAIT C3 */ + { .name = "C6-NHM", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 200, .target_residency = 800, - } + }, + {} }; -static const struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state snb_cstates[] = { + { .name = "C1-SNB", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 1, }, - { /* MWAIT C2 */ + { .name = "C3-SNB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 80, .target_residency = 211, }, - { /* MWAIT C3 */ + { .name = "C6-SNB", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 104, .target_residency = 345, }, - { /* MWAIT C4 */ + { .name = "C7-SNB", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 109, .target_residency = 345, - } + }, + {} }; -static const struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state ivb_cstates[] = { + { .name = "C1-IVB", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 1, }, - { /* MWAIT C2 */ + { .name = "C3-IVB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 59, .target_residency = 156, }, - { /* MWAIT C3 */ + { .name = "C6-IVB", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 80, .target_residency = 300, }, - { /* MWAIT C4 */ + { .name = "C7-IVB", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 87, .target_residency = 300, - } + }, + {} }; -static const struct cpuidle_state hsw_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state hsw_cstates[] = { + { .name = "C1-HSW", .flags = MWAIT2flg(0x00), .exit_latency = 2, .target_residency = 2, }, - { /* MWAIT C2 */ + { .name = "C3-HSW", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 33, .target_residency = 100, }, - { /* MWAIT C3 */ + { .name = "C6-HSW", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 133, .target_residency = 400, }, - { /* MWAIT C4 */ + { .name = "C7s-HSW", .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 166, .target_residency = 500, }, + {} }; -static const struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state atom_cstates[] = { + { .name = "C1-ATM", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 4, }, - { /* MWAIT C2 */ + { .name = "C2-ATM", .flags = MWAIT2flg(0x10), .exit_latency = 20, .target_residency = 80, }, - { /* MWAIT C3 */ }, - { /* MWAIT C4 */ + { .name = "C4-ATM", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 100, .target_residency = 400, }, - { /* MWAIT C5 */ }, - { /* MWAIT C6 */ + { .name = "C6-ATM", .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 140, .target_residency = 560, - } + }, + {} }; static void mwait_idle(void) @@ -476,29 +476,25 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, dev->count = 1; - for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) { - unsigned int num_substates; + for (cstate = 0; cpuidle_state_table[cstate].target_residency; ++cstate) { + unsigned int num_substates, hint, state, substate; struct acpi_processor_cx *cx; - if (cstate > max_cstate) { + hint = flg2MWAIT(cpuidle_state_table[cstate].flags); + state = MWAIT_HINT2CSTATE(hint) + 1; + substate = MWAIT_HINT2SUBSTATE(hint); + + if (state > max_cstate) { printk(PREFIX "max C-state %u reached\n", max_cstate); break; } /* Does the state exist in CPUID.MWAIT? */ - num_substates = (mwait_substates >> (cstate * 4)) - & MWAIT_SUBSTATE_MASK; - if (!num_substates) - continue; - /* Is the state not enabled? */ - if (!cpuidle_state_table[cstate].target_residency) { - /* does the driver not know about the state? */ - if (!pm_idle_save && !*cpuidle_state_table[cstate].name) - pr_debug(PREFIX "unaware of family %#x model %#x MWAIT %u\n", - boot_cpu_data.x86, - boot_cpu_data.x86_model, cstate); + num_substates = (mwait_substates >> (state * 4)) + & MWAIT_SUBSTATE_MASK; + /* if sub-state in table is not enumerated by CPUID */ + if (substate >= num_substates) continue; - } if (dev->count >= ACPI_PROCESSOR_MAX_POWER) { printk(PREFIX "max C-state count of %u reached\n", @@ -506,15 +502,13 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, break; } - if (cstate > 2 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) { - if (pm_idle_save) - continue; + if (state > 2 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC) && + !pm_idle_save) setup_clear_cpu_cap(X86_FEATURE_TSC_RELIABLE); - } cx = dev->states + dev->count; - cx->type = cstate; - cx->address = flg2MWAIT(cpuidle_state_table[cstate].flags); + cx->type = state; + cx->address = hint; cx->entry_method = ACPI_CSTATE_EM_FFH; cx->latency = cpuidle_state_table[cstate].exit_latency; cx->target_residency = diff --git a/xen/include/asm-x86/mwait.h b/xen/include/asm-x86/mwait.h index 3ad3d9c..ba9c0ea 100644 --- a/xen/include/asm-x86/mwait.h +++ b/xen/include/asm-x86/mwait.h @@ -4,7 +4,6 @@ #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 -#define MWAIT_MAX_NUM_CSTATES 8 #define CPUID_MWAIT_LEAF 5 #define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27: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 1VIgtj-0007Bs-S7; Sun, 08 Sep 2013 15:27:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgti-0007Bg-IZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:34 +0000 Received: from [85.158.137.68:31287] by server-13.bemta-3.messagelabs.com id 4D/CD-25971-5679C225; Sun, 08 Sep 2013 15:27:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1378654051!813898!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6423 invoked from network); 8 Sep 2013 15:27:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtf-00038L-F2 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtf-0004w0-D6 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:31 +0000 Date: Sun, 08 Sep 2013 15:27:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: remove assumption of one C-state per MWAIT flag X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3642ba0f692cfa9319fdeca82268238daba23794 Author: Len Brown AuthorDate: Fri Aug 30 10:58:21 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:58:21 2013 +0200 x86/mwait_idle: remove assumption of one C-state per MWAIT flag Remove the assumption that cstate_tables are indexed by MWAIT flag values. Each entry identifies itself via its own flags value. This change is needed to support multiple states that share the same MWAIT flags. Note that this can have an effect on what state is described by 'N' on cmdline max_cstate=N on some systems. Signed-off-by: Len Brown Avoided the effect of changing the meaning of "max_cstate=". Drop MWAIT_MAX_NUM_CSTATES (done differently in a prior patch on Linux). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 106 +++++++++++++++++++--------------------- xen/include/asm-x86/mwait.h | 1 - 2 files changed, 50 insertions(+), 57 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index e0c9707..ccfa750 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -116,146 +116,146 @@ static const struct cpuidle_state { */ #define flg2MWAIT(flags) (((flags) >> 24) & 0xFF) #define MWAIT2flg(eax) ((eax & 0xFF) << 24) +#define MWAIT_HINT2CSTATE(hint) (((hint) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) +#define MWAIT_HINT2SUBSTATE(hint) ((hint) & MWAIT_CSTATE_MASK) /* * States are indexed by the cstate number, * which is also the index into the MWAIT hint array. * Thus C0 is a dummy. */ -static const struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state nehalem_cstates[] = { + { .name = "C1-NHM", .flags = MWAIT2flg(0x00), .exit_latency = 3, .target_residency = 6, }, - { /* MWAIT C2 */ + { .name = "C3-NHM", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 20, .target_residency = 80, }, - { /* MWAIT C3 */ + { .name = "C6-NHM", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 200, .target_residency = 800, - } + }, + {} }; -static const struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state snb_cstates[] = { + { .name = "C1-SNB", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 1, }, - { /* MWAIT C2 */ + { .name = "C3-SNB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 80, .target_residency = 211, }, - { /* MWAIT C3 */ + { .name = "C6-SNB", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 104, .target_residency = 345, }, - { /* MWAIT C4 */ + { .name = "C7-SNB", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 109, .target_residency = 345, - } + }, + {} }; -static const struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state ivb_cstates[] = { + { .name = "C1-IVB", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 1, }, - { /* MWAIT C2 */ + { .name = "C3-IVB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 59, .target_residency = 156, }, - { /* MWAIT C3 */ + { .name = "C6-IVB", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 80, .target_residency = 300, }, - { /* MWAIT C4 */ + { .name = "C7-IVB", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 87, .target_residency = 300, - } + }, + {} }; -static const struct cpuidle_state hsw_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state hsw_cstates[] = { + { .name = "C1-HSW", .flags = MWAIT2flg(0x00), .exit_latency = 2, .target_residency = 2, }, - { /* MWAIT C2 */ + { .name = "C3-HSW", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 33, .target_residency = 100, }, - { /* MWAIT C3 */ + { .name = "C6-HSW", .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 133, .target_residency = 400, }, - { /* MWAIT C4 */ + { .name = "C7s-HSW", .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 166, .target_residency = 500, }, + {} }; -static const struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { - { /* MWAIT C0 */ }, - { /* MWAIT C1 */ +static const struct cpuidle_state atom_cstates[] = { + { .name = "C1-ATM", .flags = MWAIT2flg(0x00), .exit_latency = 1, .target_residency = 4, }, - { /* MWAIT C2 */ + { .name = "C2-ATM", .flags = MWAIT2flg(0x10), .exit_latency = 20, .target_residency = 80, }, - { /* MWAIT C3 */ }, - { /* MWAIT C4 */ + { .name = "C4-ATM", .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 100, .target_residency = 400, }, - { /* MWAIT C5 */ }, - { /* MWAIT C6 */ + { .name = "C6-ATM", .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 140, .target_residency = 560, - } + }, + {} }; static void mwait_idle(void) @@ -476,29 +476,25 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, dev->count = 1; - for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) { - unsigned int num_substates; + for (cstate = 0; cpuidle_state_table[cstate].target_residency; ++cstate) { + unsigned int num_substates, hint, state, substate; struct acpi_processor_cx *cx; - if (cstate > max_cstate) { + hint = flg2MWAIT(cpuidle_state_table[cstate].flags); + state = MWAIT_HINT2CSTATE(hint) + 1; + substate = MWAIT_HINT2SUBSTATE(hint); + + if (state > max_cstate) { printk(PREFIX "max C-state %u reached\n", max_cstate); break; } /* Does the state exist in CPUID.MWAIT? */ - num_substates = (mwait_substates >> (cstate * 4)) - & MWAIT_SUBSTATE_MASK; - if (!num_substates) - continue; - /* Is the state not enabled? */ - if (!cpuidle_state_table[cstate].target_residency) { - /* does the driver not know about the state? */ - if (!pm_idle_save && !*cpuidle_state_table[cstate].name) - pr_debug(PREFIX "unaware of family %#x model %#x MWAIT %u\n", - boot_cpu_data.x86, - boot_cpu_data.x86_model, cstate); + num_substates = (mwait_substates >> (state * 4)) + & MWAIT_SUBSTATE_MASK; + /* if sub-state in table is not enumerated by CPUID */ + if (substate >= num_substates) continue; - } if (dev->count >= ACPI_PROCESSOR_MAX_POWER) { printk(PREFIX "max C-state count of %u reached\n", @@ -506,15 +502,13 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, break; } - if (cstate > 2 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) { - if (pm_idle_save) - continue; + if (state > 2 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC) && + !pm_idle_save) setup_clear_cpu_cap(X86_FEATURE_TSC_RELIABLE); - } cx = dev->states + dev->count; - cx->type = cstate; - cx->address = flg2MWAIT(cpuidle_state_table[cstate].flags); + cx->type = state; + cx->address = hint; cx->entry_method = ACPI_CSTATE_EM_FFH; cx->latency = cpuidle_state_table[cstate].exit_latency; cx->target_residency = diff --git a/xen/include/asm-x86/mwait.h b/xen/include/asm-x86/mwait.h index 3ad3d9c..ba9c0ea 100644 --- a/xen/include/asm-x86/mwait.h +++ b/xen/include/asm-x86/mwait.h @@ -4,7 +4,6 @@ #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 -#define MWAIT_MAX_NUM_CSTATES 8 #define CPUID_MWAIT_LEAF 5 #define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtt-0007E3-VE; Sun, 08 Sep 2013 15:27:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgts-0007Dj-Cs for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:44 +0000 Received: from [85.158.139.211:8518] by server-6.bemta-5.messagelabs.com id F0/E3-05559-F679C225; Sun, 08 Sep 2013 15:27:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1378654061!1315699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30991 invoked from network); 8 Sep 2013 15:27:42 -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; 8 Sep 2013 15:27:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtp-00038R-Jj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtp-0004wP-I4 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:41 +0000 Date: Sun, 08 Sep 2013 15:27:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: export both C1 and C1E X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91413b51963127d435cfba38e382e81188527ef5 Author: Len Brown AuthorDate: Fri Aug 30 10:59:09 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:59:09 2013 +0200 x86/mwait_idle: export both C1 and C1E Here we disable HW promotion of C1 to C1E and export both C1 and C1E as distinct C-states. This allows a cpuidle governor to choose a lower latency C-state than C1E when necessary to satisfy performance and QOS constraints -- and still save power versus polling. This also corrects the erroneous latency previously reported for C1E -- it is 10usec, not 1usec. Signed-off-by: Len Brown Avoided the effect of changing the meaning of "max_cstate=". Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 51 +++++++++++++++++++++++++++++++++++---- xen/include/asm-x86/msr-index.h | 2 + 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index ccfa750..8799632 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -88,6 +88,7 @@ struct idle_cpu { * Indicate which enable bits to clear here. */ unsigned long auto_demotion_disable_flags; + bool_t disable_promotion_to_c1e; }; static const struct idle_cpu *icpu; @@ -132,6 +133,12 @@ static const struct cpuidle_state nehalem_cstates[] = { .target_residency = 6, }, { + .name = "C1E-NHM", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-NHM", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 20, @@ -150,8 +157,14 @@ static const struct cpuidle_state snb_cstates[] = { { .name = "C1-SNB", .flags = MWAIT2flg(0x00), - .exit_latency = 1, - .target_residency = 1, + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-SNB", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, }, { .name = "C3-SNB", @@ -182,6 +195,12 @@ static const struct cpuidle_state ivb_cstates[] = { .target_residency = 1, }, { + .name = "C1E-IVB", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-IVB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 59, @@ -210,6 +229,12 @@ static const struct cpuidle_state hsw_cstates[] = { .target_residency = 2, }, { + .name = "C1E-HSW", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-HSW", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 33, @@ -232,10 +257,10 @@ static const struct cpuidle_state hsw_cstates[] = { static const struct cpuidle_state atom_cstates[] = { { - .name = "C1-ATM", + .name = "C1E-ATM", .flags = MWAIT2flg(0x00), - .exit_latency = 1, - .target_residency = 4, + .exit_latency = 10, + .target_residency = 20, }, { .name = "C2-ATM", @@ -354,9 +379,19 @@ static void auto_demotion_disable(void *dummy) wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); } +static void c1e_promotion_disable(void *dummy) +{ + u64 msr_bits; + + rdmsrl(MSR_IA32_POWER_CTL, msr_bits); + msr_bits &= ~0x2; + wrmsrl(MSR_IA32_POWER_CTL, msr_bits); +} + static const struct idle_cpu idle_cpu_nehalem = { .state_table = nehalem_cstates, .auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_atom = { @@ -370,14 +405,17 @@ static const struct idle_cpu idle_cpu_lincroft = { static const struct idle_cpu idle_cpu_snb = { .state_table = snb_cstates, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_hsw = { .state_table = hsw_cstates, + .disable_promotion_to_c1e = 1, }; #define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } @@ -520,6 +558,9 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, if (icpu->auto_demotion_disable_flags) on_selected_cpus(cpumask_of(cpu), auto_demotion_disable, NULL, 1); + if (icpu->disable_promotion_to_c1e) + on_selected_cpus(cpumask_of(cpu), c1e_promotion_disable, NULL, 1); + return NOTIFY_DONE; } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 03cb00e..e597a28 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -83,6 +83,8 @@ #define MSR_IA32_LASTINTFROMIP 0x000001dd #define MSR_IA32_LASTINTTOIP 0x000001de +#define MSR_IA32_POWER_CTL 0x000001fc + #define MSR_IA32_MTRR_PHYSBASE0 0x00000200 #define MSR_IA32_MTRR_PHYSMASK0 0x00000201 #define MSR_IA32_MTRR_PHYSBASE1 0x00000202 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtt-0007E3-VE; Sun, 08 Sep 2013 15:27:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgts-0007Dj-Cs for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:44 +0000 Received: from [85.158.139.211:8518] by server-6.bemta-5.messagelabs.com id F0/E3-05559-F679C225; Sun, 08 Sep 2013 15:27:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1378654061!1315699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30991 invoked from network); 8 Sep 2013 15:27:42 -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; 8 Sep 2013 15:27:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtp-00038R-Jj for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtp-0004wP-I4 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:41 +0000 Date: Sun, 08 Sep 2013 15:27:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: export both C1 and C1E X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91413b51963127d435cfba38e382e81188527ef5 Author: Len Brown AuthorDate: Fri Aug 30 10:59:09 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 10:59:09 2013 +0200 x86/mwait_idle: export both C1 and C1E Here we disable HW promotion of C1 to C1E and export both C1 and C1E as distinct C-states. This allows a cpuidle governor to choose a lower latency C-state than C1E when necessary to satisfy performance and QOS constraints -- and still save power versus polling. This also corrects the erroneous latency previously reported for C1E -- it is 10usec, not 1usec. Signed-off-by: Len Brown Avoided the effect of changing the meaning of "max_cstate=". Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 51 +++++++++++++++++++++++++++++++++++---- xen/include/asm-x86/msr-index.h | 2 + 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index ccfa750..8799632 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -88,6 +88,7 @@ struct idle_cpu { * Indicate which enable bits to clear here. */ unsigned long auto_demotion_disable_flags; + bool_t disable_promotion_to_c1e; }; static const struct idle_cpu *icpu; @@ -132,6 +133,12 @@ static const struct cpuidle_state nehalem_cstates[] = { .target_residency = 6, }, { + .name = "C1E-NHM", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-NHM", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 20, @@ -150,8 +157,14 @@ static const struct cpuidle_state snb_cstates[] = { { .name = "C1-SNB", .flags = MWAIT2flg(0x00), - .exit_latency = 1, - .target_residency = 1, + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-SNB", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, }, { .name = "C3-SNB", @@ -182,6 +195,12 @@ static const struct cpuidle_state ivb_cstates[] = { .target_residency = 1, }, { + .name = "C1E-IVB", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-IVB", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 59, @@ -210,6 +229,12 @@ static const struct cpuidle_state hsw_cstates[] = { .target_residency = 2, }, { + .name = "C1E-HSW", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { .name = "C3-HSW", .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 33, @@ -232,10 +257,10 @@ static const struct cpuidle_state hsw_cstates[] = { static const struct cpuidle_state atom_cstates[] = { { - .name = "C1-ATM", + .name = "C1E-ATM", .flags = MWAIT2flg(0x00), - .exit_latency = 1, - .target_residency = 4, + .exit_latency = 10, + .target_residency = 20, }, { .name = "C2-ATM", @@ -354,9 +379,19 @@ static void auto_demotion_disable(void *dummy) wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); } +static void c1e_promotion_disable(void *dummy) +{ + u64 msr_bits; + + rdmsrl(MSR_IA32_POWER_CTL, msr_bits); + msr_bits &= ~0x2; + wrmsrl(MSR_IA32_POWER_CTL, msr_bits); +} + static const struct idle_cpu idle_cpu_nehalem = { .state_table = nehalem_cstates, .auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_atom = { @@ -370,14 +405,17 @@ static const struct idle_cpu idle_cpu_lincroft = { static const struct idle_cpu idle_cpu_snb = { .state_table = snb_cstates, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, + .disable_promotion_to_c1e = 1, }; static const struct idle_cpu idle_cpu_hsw = { .state_table = hsw_cstates, + .disable_promotion_to_c1e = 1, }; #define ICPU(model, cpu) { 6, model, &idle_cpu_##cpu } @@ -520,6 +558,9 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, if (icpu->auto_demotion_disable_flags) on_selected_cpus(cpumask_of(cpu), auto_demotion_disable, NULL, 1); + if (icpu->disable_promotion_to_c1e) + on_selected_cpus(cpumask_of(cpu), c1e_promotion_disable, NULL, 1); + return NOTIFY_DONE; } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 03cb00e..e597a28 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -83,6 +83,8 @@ #define MSR_IA32_LASTINTFROMIP 0x000001dd #define MSR_IA32_LASTINTTOIP 0x000001de +#define MSR_IA32_POWER_CTL 0x000001fc + #define MSR_IA32_MTRR_PHYSBASE0 0x00000200 #define MSR_IA32_MTRR_PHYSMASK0 0x00000201 #define MSR_IA32_MTRR_PHYSBASE1 0x00000202 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgu3-0007Fv-4n; Sun, 08 Sep 2013 15:27:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgu2-0007Fl-5G for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:54 +0000 Received: from [85.158.143.35:17891] by server-3.bemta-4.messagelabs.com id 13/76-08835-9779C225; Sun, 08 Sep 2013 15:27:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378654071!2172629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4766 invoked from network); 8 Sep 2013 15:27:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtz-00038X-Oa for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtz-0004wl-Md for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:51 +0000 Date: Sun, 08 Sep 2013 15:27:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: initial C8, C9, C10 support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e287713c94b40bbf21a378eab622108b1186233 Author: Len Brown AuthorDate: Fri Aug 30 11:00:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 11:00:07 2013 +0200 x86/mwait_idle: initial C8, C9, C10 support Allow mwait_idle to utilize C8, C9, C10 when they are present on... "Fourth Generation Intel(R) Core(TM) Processors", which are based on Intel(R) microarchitecture code name Haswell. Signed-off-by: Len Brown Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 8799632..85179f2 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -252,6 +252,24 @@ static const struct cpuidle_state hsw_cstates[] = { .exit_latency = 166, .target_residency = 500, }, + { + .name = "C8-HSW", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 300, + .target_residency = 900, + }, + { + .name = "C9-HSW", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 600, + .target_residency = 1800, + }, + { + .name = "C10-HSW", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 2600, + .target_residency = 7700, + }, {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:27:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:27:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgu3-0007Fv-4n; Sun, 08 Sep 2013 15:27:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgu2-0007Fl-5G for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:54 +0000 Received: from [85.158.143.35:17891] by server-3.bemta-4.messagelabs.com id 13/76-08835-9779C225; Sun, 08 Sep 2013 15:27:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378654071!2172629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4766 invoked from network); 8 Sep 2013 15:27:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:27:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgtz-00038X-Oa for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgtz-0004wl-Md for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:27:51 +0000 Date: Sun, 08 Sep 2013 15:27:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait_idle: initial C8, C9, C10 support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e287713c94b40bbf21a378eab622108b1186233 Author: Len Brown AuthorDate: Fri Aug 30 11:00:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Aug 30 11:00:07 2013 +0200 x86/mwait_idle: initial C8, C9, C10 support Allow mwait_idle to utilize C8, C9, C10 when they are present on... "Fourth Generation Intel(R) Core(TM) Processors", which are based on Intel(R) microarchitecture code name Haswell. Signed-off-by: Len Brown Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/mwait-idle.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 8799632..85179f2 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -252,6 +252,24 @@ static const struct cpuidle_state hsw_cstates[] = { .exit_latency = 166, .target_residency = 500, }, + { + .name = "C8-HSW", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 300, + .target_residency = 900, + }, + { + .name = "C9-HSW", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 600, + .target_residency = 1800, + }, + { + .name = "C10-HSW", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 2600, + .target_residency = 7700, + }, {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguF-0007Hl-7h; Sun, 08 Sep 2013 15:28:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguC-0007H7-Ji for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:05 +0000 Received: from [85.158.139.211:9099] by server-14.bemta-5.messagelabs.com id 45/6E-12040-3879C225; Sun, 08 Sep 2013 15:28:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1378654082!1313518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5205 invoked from network); 8 Sep 2013 15:28:03 -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; 8 Sep 2013 15:28:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguA-00038g-0d for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgu9-0004xH-RR for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:01 +0000 Date: Sun, 08 Sep 2013 15:28:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: don't use '.ifnes' in bug frame construction. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec3f60c9d609703cce2fca30edbc6e72cd18e492 Author: Tim Deegan AuthorDate: Thu Aug 29 16:47:12 2013 +0100 Commit: Tim Deegan CommitDate: Fri Aug 30 11:23:38 2013 +0100 xen/x86: don't use '.ifnes' in bug frame construction. Spotted because it breaks the clang build for LLVM <3.2. .ifnes is not right here as it will choke on a string with embedded quotes. .ifnb would be better except that LLVM <3.2 doesn't support that either (and nor does binutils 2.16). It should be possible to use something like !!msg or !!msg[0] instead of a separate flag, but I gave up trying to find something that would make it through CPP, asm() and gas as a usable constant. :| Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/bug.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index 148975f..e5dd559 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -25,7 +25,7 @@ struct bug_frame { #define BUGFRAME_bug 2 #define BUGFRAME_assert 3 -#define BUG_FRAME(type, line, ptr, msg) do { \ +#define BUG_FRAME(type, line, ptr, second_frame, msg) do { \ BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE_HI_WIDTH)); \ asm volatile ( ".Lbug%=: ud2\n" \ ".pushsection .bug_frames.%c0, \"a\", @progbits\n" \ @@ -33,7 +33,7 @@ struct bug_frame { ".Lfrm%=:\n" \ ".long (.Lbug%= - .Lfrm%=) + %c4\n" \ ".long (%c1 - .Lfrm%=) + %c3\n" \ - ".ifnes \"" msg "\", \"\"\n" \ + ".if " #second_frame "\n" \ ".long 0, %c2 - .Lfrm%=\n" \ ".endif\n" \ ".popsection" \ @@ -44,12 +44,14 @@ struct bug_frame { "i" (((line) >> BUG_LINE_LO_WIDTH) << BUG_DISP_WIDTH)); \ } while (0) -#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, "") -#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, "") -#define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, "") +#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) +#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL) -#define assert_failed(msg) BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, msg) +#define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL) + +#define assert_failed(msg) \ + BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg) extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_0[], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguF-0007Hl-7h; Sun, 08 Sep 2013 15:28:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguC-0007H7-Ji for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:05 +0000 Received: from [85.158.139.211:9099] by server-14.bemta-5.messagelabs.com id 45/6E-12040-3879C225; Sun, 08 Sep 2013 15:28:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1378654082!1313518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5205 invoked from network); 8 Sep 2013 15:28:03 -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; 8 Sep 2013 15:28:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguA-00038g-0d for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgu9-0004xH-RR for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:01 +0000 Date: Sun, 08 Sep 2013 15:28:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: don't use '.ifnes' in bug frame construction. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec3f60c9d609703cce2fca30edbc6e72cd18e492 Author: Tim Deegan AuthorDate: Thu Aug 29 16:47:12 2013 +0100 Commit: Tim Deegan CommitDate: Fri Aug 30 11:23:38 2013 +0100 xen/x86: don't use '.ifnes' in bug frame construction. Spotted because it breaks the clang build for LLVM <3.2. .ifnes is not right here as it will choke on a string with embedded quotes. .ifnb would be better except that LLVM <3.2 doesn't support that either (and nor does binutils 2.16). It should be possible to use something like !!msg or !!msg[0] instead of a separate flag, but I gave up trying to find something that would make it through CPP, asm() and gas as a usable constant. :| Signed-off-by: Tim Deegan Acked-by: Jan Beulich --- xen/include/asm-x86/bug.h | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index 148975f..e5dd559 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -25,7 +25,7 @@ struct bug_frame { #define BUGFRAME_bug 2 #define BUGFRAME_assert 3 -#define BUG_FRAME(type, line, ptr, msg) do { \ +#define BUG_FRAME(type, line, ptr, second_frame, msg) do { \ BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE_HI_WIDTH)); \ asm volatile ( ".Lbug%=: ud2\n" \ ".pushsection .bug_frames.%c0, \"a\", @progbits\n" \ @@ -33,7 +33,7 @@ struct bug_frame { ".Lfrm%=:\n" \ ".long (.Lbug%= - .Lfrm%=) + %c4\n" \ ".long (%c1 - .Lfrm%=) + %c3\n" \ - ".ifnes \"" msg "\", \"\"\n" \ + ".if " #second_frame "\n" \ ".long 0, %c2 - .Lfrm%=\n" \ ".endif\n" \ ".popsection" \ @@ -44,12 +44,14 @@ struct bug_frame { "i" (((line) >> BUG_LINE_LO_WIDTH) << BUG_DISP_WIDTH)); \ } while (0) -#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, "") -#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, "") -#define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, "") +#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) +#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL) -#define assert_failed(msg) BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, msg) +#define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL) + +#define assert_failed(msg) \ + BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg) extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_0[], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguO-0007KW-Ag; Sun, 08 Sep 2013 15:28:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguM-0007KD-TZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:15 +0000 Received: from [85.158.143.35:18459] by server-1.bemta-4.messagelabs.com id F8/F2-16125-E879C225; Sun, 08 Sep 2013 15:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1378654092!2200343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30828 invoked from network); 8 Sep 2013 15:28:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguK-00039F-6r for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguK-0004xf-3g for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:12 +0000 Date: Sun, 08 Sep 2013 15:28:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pl011: preserve RTS and DTR signal on UART init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b272d61e8ac507ec98d075d41b56eb9ff83b596 Author: Andre Przywara AuthorDate: Tue Sep 3 16:00:52 2013 +0200 Commit: Ian Campbell CommitDate: Tue Sep 3 16:33:15 2013 +0100 pl011: preserve RTS and DTR signal on UART init Although we do not support hardware flow control in the Xen driver for the PL011 UART, the other end may be configured to use it. In this case it waits in vain for the RTS signal to be asserted by the host and will never transmit any characters. So we leave RTS and DTR as they had been setup before. This fixes the UART input on Calxeda Midway, which uses hardware flow control for the serial-over-LAN functionality. Signed-off-by: Andre Przywara Acked-by: Ian Campbell --- xen/drivers/char/pl011.c | 7 +++++-- xen/include/asm-arm/pl011-uart.h | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 3ec6e10..3386e2b 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -85,6 +85,7 @@ static void __init pl011_init_preirq(struct serial_port *port) { struct pl011 *uart = port->uart; unsigned int divisor; + unsigned int cr; /* No interrupts, please. */ pl011_write(uart, IMSC, 0); @@ -120,8 +121,10 @@ static void __init pl011_init_preirq(struct serial_port *port) pl011_write(uart, IMSC, 0); pl011_write(uart, ICR, ALLI); - /* Enable the UART for RX and TX; no flow ctrl */ - pl011_write(uart, CR, RXE | TXE | UARTEN); + /* Enable the UART for RX and TX; keep RTS and DTR */ + cr = pl011_read(uart, CR); + cr &= RTS | DTR; + pl011_write(uart, CR, cr | RXE | TXE | UARTEN); } static void __init pl011_init_postirq(struct serial_port *port) diff --git a/xen/include/asm-arm/pl011-uart.h b/xen/include/asm-arm/pl011-uart.h index 3332c51..123f477 100644 --- a/xen/include/asm-arm/pl011-uart.h +++ b/xen/include/asm-arm/pl011-uart.h @@ -38,6 +38,10 @@ #define DMACR (0x48) /* CR bits */ +#define CTSEN (1<<15) /* automatic CTS hardware flow control */ +#define RTSEN (1<<14) /* automatic RTS hardware flow control */ +#define RTS (1<<11) /* RTS signal */ +#define DTR (1<<10) /* DTR signal */ #define RXE (1<<9) /* Receive enable */ #define TXE (1<<8) /* Transmit enable */ #define UARTEN (1<<0) /* UART enable */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguO-0007KW-Ag; Sun, 08 Sep 2013 15:28:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguM-0007KD-TZ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:15 +0000 Received: from [85.158.143.35:18459] by server-1.bemta-4.messagelabs.com id F8/F2-16125-E879C225; Sun, 08 Sep 2013 15:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1378654092!2200343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30828 invoked from network); 8 Sep 2013 15:28:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguK-00039F-6r for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguK-0004xf-3g for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:12 +0000 Date: Sun, 08 Sep 2013 15:28:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pl011: preserve RTS and DTR signal on UART init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b272d61e8ac507ec98d075d41b56eb9ff83b596 Author: Andre Przywara AuthorDate: Tue Sep 3 16:00:52 2013 +0200 Commit: Ian Campbell CommitDate: Tue Sep 3 16:33:15 2013 +0100 pl011: preserve RTS and DTR signal on UART init Although we do not support hardware flow control in the Xen driver for the PL011 UART, the other end may be configured to use it. In this case it waits in vain for the RTS signal to be asserted by the host and will never transmit any characters. So we leave RTS and DTR as they had been setup before. This fixes the UART input on Calxeda Midway, which uses hardware flow control for the serial-over-LAN functionality. Signed-off-by: Andre Przywara Acked-by: Ian Campbell --- xen/drivers/char/pl011.c | 7 +++++-- xen/include/asm-arm/pl011-uart.h | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 3ec6e10..3386e2b 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -85,6 +85,7 @@ static void __init pl011_init_preirq(struct serial_port *port) { struct pl011 *uart = port->uart; unsigned int divisor; + unsigned int cr; /* No interrupts, please. */ pl011_write(uart, IMSC, 0); @@ -120,8 +121,10 @@ static void __init pl011_init_preirq(struct serial_port *port) pl011_write(uart, IMSC, 0); pl011_write(uart, ICR, ALLI); - /* Enable the UART for RX and TX; no flow ctrl */ - pl011_write(uart, CR, RXE | TXE | UARTEN); + /* Enable the UART for RX and TX; keep RTS and DTR */ + cr = pl011_read(uart, CR); + cr &= RTS | DTR; + pl011_write(uart, CR, cr | RXE | TXE | UARTEN); } static void __init pl011_init_postirq(struct serial_port *port) diff --git a/xen/include/asm-arm/pl011-uart.h b/xen/include/asm-arm/pl011-uart.h index 3332c51..123f477 100644 --- a/xen/include/asm-arm/pl011-uart.h +++ b/xen/include/asm-arm/pl011-uart.h @@ -38,6 +38,10 @@ #define DMACR (0x48) /* CR bits */ +#define CTSEN (1<<15) /* automatic CTS hardware flow control */ +#define RTSEN (1<<14) /* automatic RTS hardware flow control */ +#define RTS (1<<11) /* RTS signal */ +#define DTR (1<<10) /* DTR signal */ #define RXE (1<<9) /* Receive enable */ #define TXE (1<<8) /* Transmit enable */ #define UARTEN (1<<0) /* UART enable */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIguY-0007Mj-Du; Sun, 08 Sep 2013 15:28:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguX-0007MI-2e for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:25 +0000 Received: from [85.158.143.35:18747] by server-1.bemta-4.messagelabs.com id A4/03-16125-8979C225; Sun, 08 Sep 2013 15:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378654102!2197174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20479 invoked from network); 8 Sep 2013 15:28:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguU-00039L-I8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguU-0004yX-AH for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:22 +0000 Date: Sun, 08 Sep 2013 15:28:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1893cf77992cc0ce9d827a8d345437fa2494b540 Author: Steven Noonan AuthorDate: Fri Aug 30 16:40:42 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 3 16:36:47 2013 +0100 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIguY-0007Mj-Du; Sun, 08 Sep 2013 15:28:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguX-0007MI-2e for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:25 +0000 Received: from [85.158.143.35:18747] by server-1.bemta-4.messagelabs.com id A4/03-16125-8979C225; Sun, 08 Sep 2013 15:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378654102!2197174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20479 invoked from network); 8 Sep 2013 15:28:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguU-00039L-I8 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguU-0004yX-AH for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:22 +0000 Date: Sun, 08 Sep 2013 15:28:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1893cf77992cc0ce9d827a8d345437fa2494b540 Author: Steven Noonan AuthorDate: Fri Aug 30 16:40:42 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 3 16:36:47 2013 +0100 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIgui-0007QE-Gs; Sun, 08 Sep 2013 15:28:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguh-0007Py-6e for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:35 +0000 Received: from [85.158.143.35:38827] by server-1.bemta-4.messagelabs.com id 4E/03-16125-2A79C225; Sun, 08 Sep 2013 15:28:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1378654112!2190942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6417 invoked from network); 8 Sep 2013 15:28:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgue-00039T-NM for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgue-0004yz-L7 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:32 +0000 Date: Sun, 08 Sep 2013 15:28:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 749019afca4fd002d36856bad002cc11f7d0ddda Author: Xi Xiong AuthorDate: Fri Aug 30 12:21:56 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 3 16:36:52 2013 +0100 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) return 0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIgui-0007QE-Gs; Sun, 08 Sep 2013 15:28:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguh-0007Py-6e for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:35 +0000 Received: from [85.158.143.35:38827] by server-1.bemta-4.messagelabs.com id 4E/03-16125-2A79C225; Sun, 08 Sep 2013 15:28:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1378654112!2190942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6417 invoked from network); 8 Sep 2013 15:28:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgue-00039T-NM for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgue-0004yz-L7 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:32 +0000 Date: Sun, 08 Sep 2013 15:28:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 749019afca4fd002d36856bad002cc11f7d0ddda Author: Xi Xiong AuthorDate: Fri Aug 30 12:21:56 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 3 16:36:52 2013 +0100 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) return 0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgut-0007S1-K6; Sun, 08 Sep 2013 15:28:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgur-0007Rp-OC for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:45 +0000 Received: from [193.109.254.147:53718] by server-16.bemta-14.messagelabs.com id C1/7A-06264-CA79C225; Sun, 08 Sep 2013 15:28:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1378654123!1496877!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2349 invoked from network); 8 Sep 2013 15:28:43 -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 Sep 2013 15:28:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguo-00039Z-Sa for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguo-0004zO-Qh for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:42 +0000 Date: Sun, 08 Sep 2013 15:28:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: prefer qdisk over blktap when choosing disk backend X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0166217103e18368424fbd5ffff01c1ea50d0b17 Author: Wei Liu AuthorDate: Tue Aug 27 15:22:43 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 3 17:00:31 2013 +0100 libxl: prefer qdisk over blktap when choosing disk backend There are some disk formats commonly supported by both qdisk and blktap. As qdisk is better supported and blktap is unmaintained, we choose qdisk over blktap whenever possible. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ea845b7..16a92a4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -288,8 +288,8 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { } else { ok= disk_try_backend(&a, LIBXL_DISK_BACKEND_PHY) ?: - disk_try_backend(&a, LIBXL_DISK_BACKEND_TAP) ?: - disk_try_backend(&a, LIBXL_DISK_BACKEND_QDISK); + disk_try_backend(&a, LIBXL_DISK_BACKEND_QDISK) ?: + disk_try_backend(&a, LIBXL_DISK_BACKEND_TAP); if (ok) LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, using backend %s", disk->vdev, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgut-0007S1-K6; Sun, 08 Sep 2013 15:28:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgur-0007Rp-OC for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:45 +0000 Received: from [193.109.254.147:53718] by server-16.bemta-14.messagelabs.com id C1/7A-06264-CA79C225; Sun, 08 Sep 2013 15:28:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1378654123!1496877!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2349 invoked from network); 8 Sep 2013 15:28:43 -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 Sep 2013 15:28:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguo-00039Z-Sa for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguo-0004zO-Qh for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:42 +0000 Date: Sun, 08 Sep 2013 15:28:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: prefer qdisk over blktap when choosing disk backend X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0166217103e18368424fbd5ffff01c1ea50d0b17 Author: Wei Liu AuthorDate: Tue Aug 27 15:22:43 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 3 17:00:31 2013 +0100 libxl: prefer qdisk over blktap when choosing disk backend There are some disk formats commonly supported by both qdisk and blktap. As qdisk is better supported and blktap is unmaintained, we choose qdisk over blktap whenever possible. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ea845b7..16a92a4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -288,8 +288,8 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { } else { ok= disk_try_backend(&a, LIBXL_DISK_BACKEND_PHY) ?: - disk_try_backend(&a, LIBXL_DISK_BACKEND_TAP) ?: - disk_try_backend(&a, LIBXL_DISK_BACKEND_QDISK); + disk_try_backend(&a, LIBXL_DISK_BACKEND_QDISK) ?: + disk_try_backend(&a, LIBXL_DISK_BACKEND_TAP); if (ok) LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, using backend %s", disk->vdev, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIgv3-0007Tw-ND; Sun, 08 Sep 2013 15:28:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgv1-0007Tj-MU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:55 +0000 Received: from [85.158.143.35:19771] by server-1.bemta-4.messagelabs.com id 1B/23-16125-7B79C225; Sun, 08 Sep 2013 15:28:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378654133!1275458!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2445 invoked from network); 8 Sep 2013 15:28:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguz-00039k-43 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguy-0004zm-Vx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:53 +0000 Date: Sun, 08 Sep 2013 15:28:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvhd: use UTC for VHD timestamp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3fc8cabb8ab704324b4739b6772fcaaa69bbc3b9 Author: Wei Liu AuthorDate: Fri Aug 30 12:33:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 3 17:00:31 2013 +0100 libvhd: use UTC for VHD timestamp [ported from xapi-project/blktap a79ac2c05f9 ("XOP-289: use UTC for VHD timestamps")] Currently, the local timezone is factored into VHD timestamps due to the use of mktime(). This breaks "vhd-util check" for VHDs created in one timezone and then moved westward, which results in "primary footer invalid: creation time in future" errors. Signed-off-by: Andrei Lifchits Andrei no longer works for Citrix but Germano Percossi (ex-colleague of Andrei) contacted Andrei and confirmed that 1) this work was written on Citrix time, 2) it is OK to have Andrei's SoB. Remove unused variable "tm". Signed-off-by: Germano Percossi Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/blktap2/vhd/lib/libvhd.c | 33 +++++++++------------------------ 1 files changed, 9 insertions(+), 24 deletions(-) diff --git a/tools/blktap2/vhd/lib/libvhd.c b/tools/blktap2/vhd/lib/libvhd.c index 3511cb4..95eb5d6 100644 --- a/tools/blktap2/vhd/lib/libvhd.c +++ b/tools/blktap2/vhd/lib/libvhd.c @@ -41,6 +41,10 @@ #include "libvhd.h" #include "relative-path.h" +/* VHD uses an epoch of 12:00AM, Jan 1, 2000. This is the Unix timestamp for + * the start of the VHD epoch. */ +#define VHD_EPOCH_START 946684800 + static int libvhd_dbg = 0; void @@ -694,19 +698,10 @@ vhd_end_of_data(vhd_context_t *ctx, off_t *end) return 0; } -uint32_t +uint32_t inline vhd_time(time_t time) { - struct tm tm; - time_t micro_epoch; - - memset(&tm, 0, sizeof(struct tm)); - tm.tm_year = 100; - tm.tm_mon = 0; - tm.tm_mday = 1; - micro_epoch = mktime(&tm); - - return (uint32_t)(time - micro_epoch); + return (uint32_t)(time - VHD_EPOCH_START); } /* @@ -717,20 +712,10 @@ size_t vhd_time_to_string(uint32_t timestamp, char *target) { char *cr; - struct tm tm; - time_t t1, t2; - - memset(&tm, 0, sizeof(struct tm)); - - /* VHD uses an epoch of 12:00AM, Jan 1, 2000. */ - /* Need to adjust this to the expected epoch of 1970. */ - tm.tm_year = 100; - tm.tm_mon = 0; - tm.tm_mday = 1; + time_t unix_timestamp; - t1 = mktime(&tm); - t2 = t1 + (time_t)timestamp; - ctime_r(&t2, target); + unix_timestamp = (time_t)timestamp + VHD_EPOCH_START; + ctime_r(&unix_timestamp, target); /* handle mad ctime_r newline appending. */ if ((cr = strchr(target, '\n')) != NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:28:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:28: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 1VIgv3-0007Tw-ND; Sun, 08 Sep 2013 15:28:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgv1-0007Tj-MU for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:55 +0000 Received: from [85.158.143.35:19771] by server-1.bemta-4.messagelabs.com id 1B/23-16125-7B79C225; Sun, 08 Sep 2013 15:28:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378654133!1275458!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2445 invoked from network); 8 Sep 2013 15:28:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:28:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIguz-00039k-43 for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIguy-0004zm-Vx for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:28:53 +0000 Date: Sun, 08 Sep 2013 15:28:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvhd: use UTC for VHD timestamp X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3fc8cabb8ab704324b4739b6772fcaaa69bbc3b9 Author: Wei Liu AuthorDate: Fri Aug 30 12:33:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 3 17:00:31 2013 +0100 libvhd: use UTC for VHD timestamp [ported from xapi-project/blktap a79ac2c05f9 ("XOP-289: use UTC for VHD timestamps")] Currently, the local timezone is factored into VHD timestamps due to the use of mktime(). This breaks "vhd-util check" for VHDs created in one timezone and then moved westward, which results in "primary footer invalid: creation time in future" errors. Signed-off-by: Andrei Lifchits Andrei no longer works for Citrix but Germano Percossi (ex-colleague of Andrei) contacted Andrei and confirmed that 1) this work was written on Citrix time, 2) it is OK to have Andrei's SoB. Remove unused variable "tm". Signed-off-by: Germano Percossi Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/blktap2/vhd/lib/libvhd.c | 33 +++++++++------------------------ 1 files changed, 9 insertions(+), 24 deletions(-) diff --git a/tools/blktap2/vhd/lib/libvhd.c b/tools/blktap2/vhd/lib/libvhd.c index 3511cb4..95eb5d6 100644 --- a/tools/blktap2/vhd/lib/libvhd.c +++ b/tools/blktap2/vhd/lib/libvhd.c @@ -41,6 +41,10 @@ #include "libvhd.h" #include "relative-path.h" +/* VHD uses an epoch of 12:00AM, Jan 1, 2000. This is the Unix timestamp for + * the start of the VHD epoch. */ +#define VHD_EPOCH_START 946684800 + static int libvhd_dbg = 0; void @@ -694,19 +698,10 @@ vhd_end_of_data(vhd_context_t *ctx, off_t *end) return 0; } -uint32_t +uint32_t inline vhd_time(time_t time) { - struct tm tm; - time_t micro_epoch; - - memset(&tm, 0, sizeof(struct tm)); - tm.tm_year = 100; - tm.tm_mon = 0; - tm.tm_mday = 1; - micro_epoch = mktime(&tm); - - return (uint32_t)(time - micro_epoch); + return (uint32_t)(time - VHD_EPOCH_START); } /* @@ -717,20 +712,10 @@ size_t vhd_time_to_string(uint32_t timestamp, char *target) { char *cr; - struct tm tm; - time_t t1, t2; - - memset(&tm, 0, sizeof(struct tm)); - - /* VHD uses an epoch of 12:00AM, Jan 1, 2000. */ - /* Need to adjust this to the expected epoch of 1970. */ - tm.tm_year = 100; - tm.tm_mon = 0; - tm.tm_mday = 1; + time_t unix_timestamp; - t1 = mktime(&tm); - t2 = t1 + (time_t)timestamp; - ctime_r(&t2, target); + unix_timestamp = (time_t)timestamp + VHD_EPOCH_START; + ctime_r(&unix_timestamp, target); /* handle mad ctime_r newline appending. */ if ((cr = strchr(target, '\n')) != NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvD-0007Vn-Ry; Sun, 08 Sep 2013 15:29:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvC-0007VO-5a for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:06 +0000 Received: from [85.158.143.35:22126] by server-2.bemta-4.messagelabs.com id D5/2E-26052-1C79C225; Sun, 08 Sep 2013 15:29:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1378654143!2200418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31883 invoked from network); 8 Sep 2013 15:29:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgv9-0003AI-BR for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgv9-00050J-7h for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:03 +0000 Date: Sun, 08 Sep 2013 15:29:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/docs: Correct documentation for the conswitch parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc29e450d1abd2f8be67208dfb78046885a50cca Author: Andrew Cooper AuthorDate: Wed Aug 28 11:19:31 2013 +0100 Commit: Ian Campbell CommitDate: Wed Sep 4 18:19:01 2013 +0100 xen/docs: Correct documentation for the conswitch parameter Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2da29b7..56c9729 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -281,7 +281,7 @@ Flag to indicate whether all guest console output should be copied into the console ring buffer. ### conswitch -> `= [,x]` +> `= [x]` > Default `conswitch=a` @@ -292,7 +292,8 @@ times. The optional trailing `x` indicates that Xen should not automatically switch the console input to dom0 during boot. Any other value, including omission, causes Xen to automatically switch to the dom0 -console during dom0 boot. +console during dom0 boot. Use `conswitch=ax` to keep the default switch +character, but for xen to keep the console. ### cpu\_type > `= arch_perfmon` -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvD-0007Vn-Ry; Sun, 08 Sep 2013 15:29:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvC-0007VO-5a for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:06 +0000 Received: from [85.158.143.35:22126] by server-2.bemta-4.messagelabs.com id D5/2E-26052-1C79C225; Sun, 08 Sep 2013 15:29:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1378654143!2200418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31883 invoked from network); 8 Sep 2013 15:29:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgv9-0003AI-BR for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgv9-00050J-7h for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:03 +0000 Date: Sun, 08 Sep 2013 15:29:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/docs: Correct documentation for the conswitch parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc29e450d1abd2f8be67208dfb78046885a50cca Author: Andrew Cooper AuthorDate: Wed Aug 28 11:19:31 2013 +0100 Commit: Ian Campbell CommitDate: Wed Sep 4 18:19:01 2013 +0100 xen/docs: Correct documentation for the conswitch parameter Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2da29b7..56c9729 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -281,7 +281,7 @@ Flag to indicate whether all guest console output should be copied into the console ring buffer. ### conswitch -> `= [,x]` +> `= [x]` > Default `conswitch=a` @@ -292,7 +292,8 @@ times. The optional trailing `x` indicates that Xen should not automatically switch the console input to dom0 during boot. Any other value, including omission, causes Xen to automatically switch to the dom0 -console during dom0 boot. +console during dom0 boot. Use `conswitch=ax` to keep the default switch +character, but for xen to keep the console. ### cpu\_type > `= arch_perfmon` -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29: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 1VIgvM-0007Y3-VY; Sun, 08 Sep 2013 15:29:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvM-0007Xm-5u for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:16 +0000 Received: from [193.109.254.147:54418] by server-8.bemta-14.messagelabs.com id D2/42-14324-BC79C225; Sun, 08 Sep 2013 15:29:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378654153!1487245!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4717 invoked from network); 8 Sep 2013 15:29:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvJ-0003AO-IQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgvJ-00051Q-FQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:13 +0000 Date: Sun, 08 Sep 2013 15:29:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: fix SeaBIOS interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f2875739beef3a75c7a7e8579b6cbcb464e61b3 Author: Jan Beulich AuthorDate: Thu Sep 5 11:47:03 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 5 11:47:03 2013 +0200 hvmloader: fix SeaBIOS interface The SeaBIOS ROM image may validly exceed 128k in size, it's only our interface code that so far assumed that it wouldn't. Remove that restriction by setting the base address depending on image size. Add a check to HVM loader so that too big images won't result in silent guest failure anymore. Uncomment the intended build-time size check for rombios, moving it into a function so that it would actually compile. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/config-seabios.h | 2 -- tools/firmware/hvmloader/hvmloader.c | 4 ++++ tools/firmware/hvmloader/rombios.c | 4 ++-- tools/firmware/hvmloader/seabios.c | 4 +--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config-seabios.h b/tools/firmware/hvmloader/config-seabios.h index e025243..c4d1142 100644 --- a/tools/firmware/hvmloader/config-seabios.h +++ b/tools/firmware/hvmloader/config-seabios.h @@ -3,8 +3,6 @@ #define BIOS_INFO_PHYSICAL_ADDRESS 0x00001000 -#define SEABIOS_PHYSICAL_ADDRESS 0x000E0000 - #endif /* __HVMLOADER_CONFIG_SEABIOS_H__ */ /* diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 9c1cba2..1cc8cf2 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -292,8 +292,12 @@ int main(void) if ( bios->bios_load ) bios->bios_load(bios); else + { + BUG_ON(bios->bios_address + bios->image_size > + HVMLOADER_PHYSICAL_ADDRESS); memcpy((void *)bios->bios_address, bios->image, bios->image_size); + } if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode ) { diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index f6f5310..810bd24 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -127,6 +127,8 @@ static void rombios_load(const struct bios_config *config) uint32_t bioshigh; struct rombios_info *info; + BUILD_BUG_ON(sizeof(rombios) > 0x100000 - ROMBIOS_PHYSICAL_ADDRESS); + memcpy((void *)config->bios_address, config->image, config->image_size); @@ -206,8 +208,6 @@ static void rombios_create_smbios_tables(void) SMBIOS_PHYSICAL_END); } -//BUILD_BUG_ON(sizeof(rombios) > (0x00100000U - ROMBIOS_PHYSICAL_ADDRESS)); - struct bios_config rombios_config = { .name = "ROMBIOS", diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index f17e67b..dd7dfbe 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -133,15 +133,13 @@ static void seabios_setup_e820(void) dump_e820_table(e820, info->e820_nr); } -//BUILD_BUG_ON(sizeof(seabios) > (0x00100000U - SEABIOS_PHYSICAL_ADDRESS)); - struct bios_config seabios_config = { .name = "SeaBIOS", .image = seabios, .image_size = sizeof(seabios), - .bios_address = SEABIOS_PHYSICAL_ADDRESS, + .bios_address = 0x100000 - sizeof(seabios), .load_roms = NULL, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29: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 1VIgvM-0007Y3-VY; Sun, 08 Sep 2013 15:29:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvM-0007Xm-5u for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:16 +0000 Received: from [193.109.254.147:54418] by server-8.bemta-14.messagelabs.com id D2/42-14324-BC79C225; Sun, 08 Sep 2013 15:29:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378654153!1487245!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4717 invoked from network); 8 Sep 2013 15:29:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvJ-0003AO-IQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgvJ-00051Q-FQ for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:13 +0000 Date: Sun, 08 Sep 2013 15:29:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: fix SeaBIOS interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f2875739beef3a75c7a7e8579b6cbcb464e61b3 Author: Jan Beulich AuthorDate: Thu Sep 5 11:47:03 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 5 11:47:03 2013 +0200 hvmloader: fix SeaBIOS interface The SeaBIOS ROM image may validly exceed 128k in size, it's only our interface code that so far assumed that it wouldn't. Remove that restriction by setting the base address depending on image size. Add a check to HVM loader so that too big images won't result in silent guest failure anymore. Uncomment the intended build-time size check for rombios, moving it into a function so that it would actually compile. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/firmware/hvmloader/config-seabios.h | 2 -- tools/firmware/hvmloader/hvmloader.c | 4 ++++ tools/firmware/hvmloader/rombios.c | 4 ++-- tools/firmware/hvmloader/seabios.c | 4 +--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config-seabios.h b/tools/firmware/hvmloader/config-seabios.h index e025243..c4d1142 100644 --- a/tools/firmware/hvmloader/config-seabios.h +++ b/tools/firmware/hvmloader/config-seabios.h @@ -3,8 +3,6 @@ #define BIOS_INFO_PHYSICAL_ADDRESS 0x00001000 -#define SEABIOS_PHYSICAL_ADDRESS 0x000E0000 - #endif /* __HVMLOADER_CONFIG_SEABIOS_H__ */ /* diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 9c1cba2..1cc8cf2 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -292,8 +292,12 @@ int main(void) if ( bios->bios_load ) bios->bios_load(bios); else + { + BUG_ON(bios->bios_address + bios->image_size > + HVMLOADER_PHYSICAL_ADDRESS); memcpy((void *)bios->bios_address, bios->image, bios->image_size); + } if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode ) { diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index f6f5310..810bd24 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -127,6 +127,8 @@ static void rombios_load(const struct bios_config *config) uint32_t bioshigh; struct rombios_info *info; + BUILD_BUG_ON(sizeof(rombios) > 0x100000 - ROMBIOS_PHYSICAL_ADDRESS); + memcpy((void *)config->bios_address, config->image, config->image_size); @@ -206,8 +208,6 @@ static void rombios_create_smbios_tables(void) SMBIOS_PHYSICAL_END); } -//BUILD_BUG_ON(sizeof(rombios) > (0x00100000U - ROMBIOS_PHYSICAL_ADDRESS)); - struct bios_config rombios_config = { .name = "ROMBIOS", diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index f17e67b..dd7dfbe 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -133,15 +133,13 @@ static void seabios_setup_e820(void) dump_e820_table(e820, info->e820_nr); } -//BUILD_BUG_ON(sizeof(seabios) > (0x00100000U - SEABIOS_PHYSICAL_ADDRESS)); - struct bios_config seabios_config = { .name = "SeaBIOS", .image = seabios, .image_size = sizeof(seabios), - .bios_address = SEABIOS_PHYSICAL_ADDRESS, + .bios_address = 0x100000 - sizeof(seabios), .load_roms = NULL, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29: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 1VIgvX-0007a5-29; Sun, 08 Sep 2013 15:29:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvW-0007Zt-AI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:26 +0000 Received: from [193.109.254.147:35589] by server-16.bemta-14.messagelabs.com id C4/9A-06264-5D79C225; Sun, 08 Sep 2013 15:29:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1378654164!1506904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28826 invoked from network); 8 Sep 2013 15:29:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvT-0003AU-SO for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgvT-00051m-LP for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:23 +0000 Date: Sun, 08 Sep 2013 15:29:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/char: dt-uart: Allow the user to give a path to the node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e008e9119d03852020b93e1d4da9a80ec1af9c75 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:15 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 6 14:08:28 2013 +0100 xen/char: dt-uart: Allow the user to give a path to the node On some board, there is no alias to the UART. To avoid modification in the device tree, dt-uart should also search device by path. To distinguish an alias from a path, dt-uart will check the first character. If it's a / then it's path, otherwise it's an alias. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/char/dt-uart.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 93bb0f5..d7204fb 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -26,9 +26,10 @@ /* * Configure UART port with a string: - * alias,options + * path,options * - * @alias: alias used in the device tree for the UART + * @path: full path used in the device tree for the UART. If the path + * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ static char __initdata opt_dtuart[30] = ""; @@ -38,7 +39,7 @@ void __init dt_uart_init(void) { struct dt_device_node *dev; int ret; - const char *devalias = opt_dtuart; + const char *devpath = opt_dtuart; char *options; if ( !console_has("dtuart") || !strcmp(opt_dtuart, "") ) @@ -53,12 +54,15 @@ void __init dt_uart_init(void) else options = ""; - early_printk("Looking for UART console %s\n", devalias); - dev = dt_find_node_by_alias(devalias); + early_printk("Looking for UART console %s\n", devpath); + if ( *devpath == '/' ) + dev = dt_find_node_by_path(devpath); + else + dev = dt_find_node_by_alias(devpath); if ( !dev ) { - early_printk("Unable to find device \"%s\"\n", devalias); + early_printk("Unable to find device \"%s\"\n", devpath); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 08 15:29:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 08 Sep 2013 15:29: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 1VIgvX-0007a5-29; Sun, 08 Sep 2013 15:29:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvW-0007Zt-AI for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:26 +0000 Received: from [193.109.254.147:35589] by server-16.bemta-14.messagelabs.com id C4/9A-06264-5D79C225; Sun, 08 Sep 2013 15:29:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1378654164!1506904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28826 invoked from network); 8 Sep 2013 15:29:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2013 15:29:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIgvT-0003AU-SO for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIgvT-00051m-LP for xen-changelog@lists.xensource.com; Sun, 08 Sep 2013 15:29:23 +0000 Date: Sun, 08 Sep 2013 15:29:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/char: dt-uart: Allow the user to give a path to the node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e008e9119d03852020b93e1d4da9a80ec1af9c75 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:15 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 6 14:08:28 2013 +0100 xen/char: dt-uart: Allow the user to give a path to the node On some board, there is no alias to the UART. To avoid modification in the device tree, dt-uart should also search device by path. To distinguish an alias from a path, dt-uart will check the first character. If it's a / then it's path, otherwise it's an alias. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/char/dt-uart.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/dt-uart.c b/xen/drivers/char/dt-uart.c index 93bb0f5..d7204fb 100644 --- a/xen/drivers/char/dt-uart.c +++ b/xen/drivers/char/dt-uart.c @@ -26,9 +26,10 @@ /* * Configure UART port with a string: - * alias,options + * path,options * - * @alias: alias used in the device tree for the UART + * @path: full path used in the device tree for the UART. If the path + * doesn't start with '/', we assuming that it's an alias. * @options: UART speficic options (see in each UART driver) */ static char __initdata opt_dtuart[30] = ""; @@ -38,7 +39,7 @@ void __init dt_uart_init(void) { struct dt_device_node *dev; int ret; - const char *devalias = opt_dtuart; + const char *devpath = opt_dtuart; char *options; if ( !console_has("dtuart") || !strcmp(opt_dtuart, "") ) @@ -53,12 +54,15 @@ void __init dt_uart_init(void) else options = ""; - early_printk("Looking for UART console %s\n", devalias); - dev = dt_find_node_by_alias(devalias); + early_printk("Looking for UART console %s\n", devpath); + if ( *devpath == '/' ) + dev = dt_find_node_by_path(devpath); + else + dev = dt_find_node_by_alias(devpath); if ( !dev ) { - early_printk("Unable to find device \"%s\"\n", devalias); + early_printk("Unable to find device \"%s\"\n", devpath); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 00:33:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 00:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPf-0003JX-VW; Mon, 09 Sep 2013 00: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 1VIpPe-0003JI-D2 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:06 +0000 Received: from [85.158.143.35:29587] by server-1.bemta-4.messagelabs.com id 5E/02-16125-1471D225; Mon, 09 Sep 2013 00:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1378686784!2215469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22366 invoked from network); 9 Sep 2013 00:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 00:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPb-0001KO-O6 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIpPb-0003MT-H9 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:03 +0000 Date: Mon, 09 Sep 2013 00:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] VT-d: warn about Compatibility Format Interrupts being enabled by firmware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47477f63bb2ee742a83633ff8d303188f3828672 Author: Jan Beulich AuthorDate: Fri Sep 6 15:42:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 15:42:00 2013 +0200 VT-d: warn about Compatibility Format Interrupts being enabled by firmware ... as being insecure. Also drop the second (redundant) read DMAR_GSTS_REG from enable_intremap(). Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: c9c6abab583d27fdca1d979a7f1d18ae30f54e9b master date: 2013-08-21 16:44:58 +0200 --- xen/drivers/passthrough/vtd/intremap.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 6dc0584..0fcc775 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -752,15 +752,19 @@ int enable_intremap(struct iommu *iommu, int eim) if ( (sts & DMA_GSTS_IRES) && ir_ctrl->iremap_maddr ) return 0; - sts = dmar_readl(iommu->reg, DMAR_GSTS_REG); if ( !(sts & DMA_GSTS_QIES) ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Queued invalidation is not enabled, should not enable " - "interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Queued invalidation is not enabled on IOMMU #%u:" + " Should not enable interrupt remapping\n", iommu->index); return -EINVAL; } + if ( !eim && (sts & DMA_GSTS_CFIS) ) + printk(XENLOG_WARNING VTDPREFIX + " Compatibility Format Interrupts permitted on IOMMU #%u:" + " Device pass-through will be insecure\n", iommu->index); + if ( ir_ctrl->iremap_maddr == 0 ) { drhd = iommu_to_drhd(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 Mon Sep 09 00:33:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 00:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPf-0003JX-VW; Mon, 09 Sep 2013 00: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 1VIpPe-0003JI-D2 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:06 +0000 Received: from [85.158.143.35:29587] by server-1.bemta-4.messagelabs.com id 5E/02-16125-1471D225; Mon, 09 Sep 2013 00:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1378686784!2215469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22366 invoked from network); 9 Sep 2013 00:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 00:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPb-0001KO-O6 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIpPb-0003MT-H9 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:03 +0000 Date: Mon, 09 Sep 2013 00:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] VT-d: warn about Compatibility Format Interrupts being enabled by firmware X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47477f63bb2ee742a83633ff8d303188f3828672 Author: Jan Beulich AuthorDate: Fri Sep 6 15:42:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 15:42:00 2013 +0200 VT-d: warn about Compatibility Format Interrupts being enabled by firmware ... as being insecure. Also drop the second (redundant) read DMAR_GSTS_REG from enable_intremap(). Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: c9c6abab583d27fdca1d979a7f1d18ae30f54e9b master date: 2013-08-21 16:44:58 +0200 --- xen/drivers/passthrough/vtd/intremap.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 6dc0584..0fcc775 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -752,15 +752,19 @@ int enable_intremap(struct iommu *iommu, int eim) if ( (sts & DMA_GSTS_IRES) && ir_ctrl->iremap_maddr ) return 0; - sts = dmar_readl(iommu->reg, DMAR_GSTS_REG); if ( !(sts & DMA_GSTS_QIES) ) { - dprintk(XENLOG_ERR VTDPREFIX, - "Queued invalidation is not enabled, should not enable " - "interrupt remapping\n"); + printk(XENLOG_ERR VTDPREFIX + " Queued invalidation is not enabled on IOMMU #%u:" + " Should not enable interrupt remapping\n", iommu->index); return -EINVAL; } + if ( !eim && (sts & DMA_GSTS_CFIS) ) + printk(XENLOG_WARNING VTDPREFIX + " Compatibility Format Interrupts permitted on IOMMU #%u:" + " Device pass-through will be insecure\n", iommu->index); + if ( ir_ctrl->iremap_maddr == 0 ) { drhd = iommu_to_drhd(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 Mon Sep 09 00:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 00: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 1VIpPr-0003KW-2O; Mon, 09 Sep 2013 00:33:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPo-0003K8-Ql for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:17 +0000 Received: from [85.158.137.68:39342] by server-4.bemta-3.messagelabs.com id 03/84-13758-C471D225; Mon, 09 Sep 2013 00:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1378686794!851436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21578 invoked from network); 9 Sep 2013 00:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 00:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPl-0001KR-US for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIpPl-0003Mx-S3 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:13 +0000 Date: Mon, 09 Sep 2013 00:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 560691065225cc060236ae1c2ba7e3ff8349c485 Author: Jan Beulich AuthorDate: Fri Sep 6 15:43:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 15:43:07 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 7352438..0aeeb30 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -677,6 +677,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != ivhd_device->special.handle ) continue; + if ( ivhd_device->special.handle >= MAX_IO_APICS ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + ivhd_device->special.handle); + return 0; + } + if ( ioapic_bdf[ivhd_device->special.handle].pin_setup ) { if ( ioapic_bdf[ivhd_device->special.handle].bdf == bdf ) -- 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 Sep 09 00:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 00: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 1VIpPr-0003KW-2O; Mon, 09 Sep 2013 00:33:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPo-0003K8-Ql for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:17 +0000 Received: from [85.158.137.68:39342] by server-4.bemta-3.messagelabs.com id 03/84-13758-C471D225; Mon, 09 Sep 2013 00:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1378686794!851436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21578 invoked from network); 9 Sep 2013 00:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 00:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VIpPl-0001KR-US for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VIpPl-0003Mx-S3 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 00:33:13 +0000 Date: Mon, 09 Sep 2013 00:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] AMD IOMMU: add missing check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 560691065225cc060236ae1c2ba7e3ff8349c485 Author: Jan Beulich AuthorDate: Fri Sep 6 15:43:07 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 6 15:43:07 2013 +0200 AMD IOMMU: add missing check We shouldn't accept IVHD tables specifying IO-APIC IDs beyond the limit we support (MAX_IO_APICS, currently 128). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 3785d30efe8264b899499e0883b10cc434bd0959 master date: 2013-08-29 09:31:37 +0200 --- xen/drivers/passthrough/amd/iommu_acpi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 7352438..0aeeb30 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -677,6 +677,13 @@ static u16 __init parse_ivhd_device_special( if ( IO_APIC_ID(apic) != ivhd_device->special.handle ) continue; + if ( ivhd_device->special.handle >= MAX_IO_APICS ) + { + printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", + ivhd_device->special.handle); + return 0; + } + if ( ioapic_bdf[ivhd_device->special.handle].pin_setup ) { if ( ioapic_bdf[ivhd_device->special.handle].bdf == bdf ) -- 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 Sep 09 22:11:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9fn-0004PO-Ir; Mon, 09 Sep 2013 22:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fm-0004PI-Do for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:06 +0000 Received: from [85.158.137.68:63523] by server-3.bemta-3.messagelabs.com id 1C/C4-11625-9774E225; Mon, 09 Sep 2013 22:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1378764663!1075289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18562 invoked from network); 9 Sep 2013 22:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fj-0006pl-LM for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9fj-0007Uq-Ag for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:03 +0000 Date: Mon, 09 Sep 2013 22:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9e3a6e16a6f46e20d300e21100ac1aeadac1c33 Author: Jan Beulich AuthorDate: Mon Sep 9 11:45:16 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:45:16 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: 850188e1278cecd1dfb9b936024bee2d8dfdcc18 master date: 2013-08-27 11:11:38 +0200 --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03fe845..8365f32 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1122,6 +1122,10 @@ int __init construct_dom0( if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9fn-0004PO-Ir; Mon, 09 Sep 2013 22:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fm-0004PI-Do for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:06 +0000 Received: from [85.158.137.68:63523] by server-3.bemta-3.messagelabs.com id 1C/C4-11625-9774E225; Mon, 09 Sep 2013 22:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1378764663!1075289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18562 invoked from network); 9 Sep 2013 22:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fj-0006pl-LM for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9fj-0007Uq-Ag for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:03 +0000 Date: Mon, 09 Sep 2013 22:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9e3a6e16a6f46e20d300e21100ac1aeadac1c33 Author: Jan Beulich AuthorDate: Mon Sep 9 11:45:16 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:45:16 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: 850188e1278cecd1dfb9b936024bee2d8dfdcc18 master date: 2013-08-27 11:11:38 +0200 --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 03fe845..8365f32 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1122,6 +1122,10 @@ int __init construct_dom0( if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9fz-0004Qg-Lt; Mon, 09 Sep 2013 22:11:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fx-0004QO-EA for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:17 +0000 Received: from [193.109.254.147:56802] by server-13.bemta-14.messagelabs.com id CB/AF-01215-4874E225; Mon, 09 Sep 2013 22:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1378764674!1715016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3697 invoked from network); 9 Sep 2013 22:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fu-0006po-As for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9ft-0007VK-PR for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:14 +0000 Date: Mon, 09 Sep 2013 22:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cec8d231f8e203fc72f8e45852b5d29527439e3 Author: Jan Beulich AuthorDate: Mon Sep 9 11:46:26 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:46:26 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 062919448e2f4b127c9c3c085b1a8e1d56a33051 master date: 2013-08-28 17:03:50 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 462d7c7..8794b82 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3899,8 +3896,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4168,7 +4166,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9fz-0004Qg-Lt; Mon, 09 Sep 2013 22:11:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fx-0004QO-EA for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:17 +0000 Received: from [193.109.254.147:56802] by server-13.bemta-14.messagelabs.com id CB/AF-01215-4874E225; Mon, 09 Sep 2013 22:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1378764674!1715016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3697 invoked from network); 9 Sep 2013 22:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9fu-0006po-As for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9ft-0007VK-PR for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:14 +0000 Date: Mon, 09 Sep 2013 22:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cec8d231f8e203fc72f8e45852b5d29527439e3 Author: Jan Beulich AuthorDate: Mon Sep 9 11:46:26 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:46:26 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 062919448e2f4b127c9c3c085b1a8e1d56a33051 master date: 2013-08-28 17:03:50 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 462d7c7..8794b82 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3899,8 +3896,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4168,7 +4166,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9g8-0004Rm-P0; Mon, 09 Sep 2013 22:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9g6-0004RR-VF for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:27 +0000 Received: from [85.158.143.35:37130] by server-1.bemta-4.messagelabs.com id 66/7C-16125-E874E225; Mon, 09 Sep 2013 22:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378764684!89051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19158 invoked from network); 9 Sep 2013 22:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9g4-0006pu-J7 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9g4-0007Vg-Gy for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:24 +0000 Date: Mon, 09 Sep 2013 22:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvmloader/smbios: Correctly count the number of tables written X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ccd12c64bf54baa6d9379b561dc02d0ea15f83a Author: Andrew Cooper AuthorDate: Mon Sep 9 11:47:44 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:47:44 2013 +0200 hvmloader/smbios: Correctly count the number of tables written Fixes regression indirectly introduced by c/s 4d23036e709627 That changeset added some smbios tables which were option based on the toolstack providing appropriate xenstore keys. The do_struct() macro would unconditionally increment nr_structs, even if a table was not actually written. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 4aa19549e17650b9bfe2b31d7f52a95696d388f0 master date: 2013-08-30 10:40:29 +0200 --- tools/firmware/hvmloader/smbios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 3d5dc51..9f292cc 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -192,7 +192,8 @@ write_smbios_tables(void *ep, void *start, #define do_struct(fn) do { \ q = (fn); \ - (*nr_structs)++; \ + if ( q != p ) \ + (*nr_structs)++; \ if ( (q - p) > *max_struct_size ) \ *max_struct_size = q - p; \ p = q; \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9g8-0004Rm-P0; Mon, 09 Sep 2013 22:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9g6-0004RR-VF for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:27 +0000 Received: from [85.158.143.35:37130] by server-1.bemta-4.messagelabs.com id 66/7C-16125-E874E225; Mon, 09 Sep 2013 22:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378764684!89051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19158 invoked from network); 9 Sep 2013 22:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9g4-0006pu-J7 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9g4-0007Vg-Gy for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:24 +0000 Date: Mon, 09 Sep 2013 22:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvmloader/smbios: Correctly count the number of tables written X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ccd12c64bf54baa6d9379b561dc02d0ea15f83a Author: Andrew Cooper AuthorDate: Mon Sep 9 11:47:44 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:47:44 2013 +0200 hvmloader/smbios: Correctly count the number of tables written Fixes regression indirectly introduced by c/s 4d23036e709627 That changeset added some smbios tables which were option based on the toolstack providing appropriate xenstore keys. The do_struct() macro would unconditionally increment nr_structs, even if a table was not actually written. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 4aa19549e17650b9bfe2b31d7f52a95696d388f0 master date: 2013-08-30 10:40:29 +0200 --- tools/firmware/hvmloader/smbios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 3d5dc51..9f292cc 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -192,7 +192,8 @@ write_smbios_tables(void *ep, void *start, #define do_struct(fn) do { \ q = (fn); \ - (*nr_structs)++; \ + if ( q != p ) \ + (*nr_structs)++; \ if ( (q - p) > *max_struct_size ) \ *max_struct_size = q - p; \ p = q; \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9gI-0004TE-Se; Mon, 09 Sep 2013 22:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gH-0004T0-A5 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:37 +0000 Received: from [85.158.143.35:37467] by server-2.bemta-4.messagelabs.com id 96/5C-26052-8974E225; Mon, 09 Sep 2013 22:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1378764694!2481221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29383 invoked from network); 9 Sep 2013 22:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gE-0006q5-QN for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gE-0007Wp-MX for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:34 +0000 Date: Mon, 09 Sep 2013 22:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3aa502a0315402b923d2796f20dad0009970f408 Author: Andrew Cooper AuthorDate: Mon Sep 9 11:48:28 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:48:28 2013 +0200 public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings The old code for OEM SMBios strings was: char path[20] = "bios-strings/oem-XX"; path[(sizeof path) - 3] = '0' + ((i < 10) ? i : i / 10); path[(sizeof path) - 2] = (i < 10) ? '\0' : '0' + (i % 10); Where oem-1 thru 9 specifically had no leading 0. However, the definition of HVM_XS_OEM_STRINGS specifically requires leading 0s. This regression was introduced by the combination of c/s 4d23036e709627 and e64c3f71ceb662 I realise that this patch causes a change to the public headers. However I feel it is justified as: * All toolstacks used to have to embed the magic string (and almost certainly still do) * If by some miriacle a new toolstack has started using the new define will continue to work. * The only intree consumer of the define is hvmloader itself. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 0f4cb23c3ea5b987c49c9a9368e7a0d505ec064f master date: 2013-08-30 10:40:48 +0200 --- xen/include/public/hvm/hvm_xs_strings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index 4de5881..8aec935 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -75,6 +75,6 @@ /* 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" +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%d" #endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9gI-0004TE-Se; Mon, 09 Sep 2013 22:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gH-0004T0-A5 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:37 +0000 Received: from [85.158.143.35:37467] by server-2.bemta-4.messagelabs.com id 96/5C-26052-8974E225; Mon, 09 Sep 2013 22:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1378764694!2481221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29383 invoked from network); 9 Sep 2013 22:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gE-0006q5-QN for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gE-0007Wp-MX for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:34 +0000 Date: Mon, 09 Sep 2013 22:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3aa502a0315402b923d2796f20dad0009970f408 Author: Andrew Cooper AuthorDate: Mon Sep 9 11:48:28 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:48:28 2013 +0200 public/hvm_xs_strings.h: Fix ABI regression for OEM SMBios strings The old code for OEM SMBios strings was: char path[20] = "bios-strings/oem-XX"; path[(sizeof path) - 3] = '0' + ((i < 10) ? i : i / 10); path[(sizeof path) - 2] = (i < 10) ? '\0' : '0' + (i % 10); Where oem-1 thru 9 specifically had no leading 0. However, the definition of HVM_XS_OEM_STRINGS specifically requires leading 0s. This regression was introduced by the combination of c/s 4d23036e709627 and e64c3f71ceb662 I realise that this patch causes a change to the public headers. However I feel it is justified as: * All toolstacks used to have to embed the magic string (and almost certainly still do) * If by some miriacle a new toolstack has started using the new define will continue to work. * The only intree consumer of the define is hvmloader itself. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 0f4cb23c3ea5b987c49c9a9368e7a0d505ec064f master date: 2013-08-30 10:40:48 +0200 --- xen/include/public/hvm/hvm_xs_strings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index 4de5881..8aec935 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -75,6 +75,6 @@ /* 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" +#define HVM_XS_OEM_STRINGS "bios-strings/oem-%d" #endif /* __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9gS-0004V9-Vo; Mon, 09 Sep 2013 22:11:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gR-0004Uq-Qz for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:48 +0000 Received: from [85.158.137.68:13520] by server-16.bemta-3.messagelabs.com id D6/82-30005-3A74E225; Mon, 09 Sep 2013 22:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378764705!1077969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24001 invoked from network); 9 Sep 2013 22:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gO-0006q8-W5 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gO-0007XB-Tk for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:44 +0000 Date: Mon, 09 Sep 2013 22:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4736f563e73f9e2808c0777deff4f2b4e75752f0 Author: Steven Noonan AuthorDate: Mon Sep 9 11:49:15 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:49:15 2013 +0200 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 1893cf77992cc0ce9d827a8d345437fa2494b540 master date: 2013-09-03 16:36:47 +0100 --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:11:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:11: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 1VJ9gS-0004V9-Vo; Mon, 09 Sep 2013 22:11:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gR-0004Uq-Qz for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:48 +0000 Received: from [85.158.137.68:13520] by server-16.bemta-3.messagelabs.com id D6/82-30005-3A74E225; Mon, 09 Sep 2013 22:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378764705!1077969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24001 invoked from network); 9 Sep 2013 22:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gO-0006q8-W5 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gO-0007XB-Tk for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:44 +0000 Date: Mon, 09 Sep 2013 22:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4736f563e73f9e2808c0777deff4f2b4e75752f0 Author: Steven Noonan AuthorDate: Mon Sep 9 11:49:15 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:49:15 2013 +0200 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 1893cf77992cc0ce9d827a8d345437fa2494b540 master date: 2013-09-03 16:36:47 +0100 --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gd-0004X5-2Z; Mon, 09 Sep 2013 22:11:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gb-0004Wj-Qa for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:58 +0000 Received: from [85.158.139.211:47887] by server-15.bemta-5.messagelabs.com id 51/19-01145-DA74E225; Mon, 09 Sep 2013 22:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1378764715!1544497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31432 invoked from network); 9 Sep 2013 22:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gZ-0006qK-5h for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gZ-0007XY-3f for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:55 +0000 Date: Mon, 09 Sep 2013 22:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d6be5eb6fa56ea6884ee4f38364b755ac64786c Author: Xi Xiong AuthorDate: Mon Sep 9 11:49:46 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:49:46 2013 +0200 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 749019afca4fd002d36856bad002cc11f7d0ddda master date: 2013-09-03 16:36:52 +0100 --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) return 0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gd-0004X5-2Z; Mon, 09 Sep 2013 22:11:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gb-0004Wj-Qa for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:58 +0000 Received: from [85.158.139.211:47887] by server-15.bemta-5.messagelabs.com id 51/19-01145-DA74E225; Mon, 09 Sep 2013 22:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1378764715!1544497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31432 invoked from network); 9 Sep 2013 22:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gZ-0006qK-5h for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gZ-0007XY-3f for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:11:55 +0000 Date: Mon, 09 Sep 2013 22:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d6be5eb6fa56ea6884ee4f38364b755ac64786c Author: Xi Xiong AuthorDate: Mon Sep 9 11:49:46 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:49:46 2013 +0200 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 749019afca4fd002d36856bad002cc11f7d0ddda master date: 2013-09-03 16:36:52 +0100 --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) return 0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gm-0004ZA-7u; Mon, 09 Sep 2013 22:12:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gl-0004Yr-Kn for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:07 +0000 Received: from [85.158.143.35:40348] by server-2.bemta-4.messagelabs.com id 75/8C-26052-7B74E225; Mon, 09 Sep 2013 22:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1378764725!2487983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19123 invoked from network); 9 Sep 2013 22:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gj-0006qt-BO for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gj-0007Y5-91 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:05 +0000 Date: Mon, 09 Sep 2013 22:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xen/docs: Correct documentation for the conswitch parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27e533159d8d670bb9531dab06bcbefd385a7faa Author: Andrew Cooper AuthorDate: Mon Sep 9 11:50:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:50:20 2013 +0200 xen/docs: Correct documentation for the conswitch parameter Signed-off-by: Andrew Cooper master commit: cc29e450d1abd2f8be67208dfb78046885a50cca master date: 2013-09-04 18:19:01 +0100 --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 708ffc2..b6b0974 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -281,7 +281,7 @@ Flag to indicate whether all guest console output should be copied into the console ring buffer. ### conswitch -> `= [,x]` +> `= [x]` > Default `conswitch=a` @@ -292,7 +292,8 @@ times. The optional trailing `x` indicates that Xen should not automatically switch the console input to dom0 during boot. Any other value, including omission, causes Xen to automatically switch to the dom0 -console during dom0 boot. +console during dom0 boot. Use `conswitch=ax` to keep the default switch +character, but for xen to keep the console. ### cpu\_type > `= arch_perfmon` -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gm-0004ZA-7u; Mon, 09 Sep 2013 22:12:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gl-0004Yr-Kn for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:07 +0000 Received: from [85.158.143.35:40348] by server-2.bemta-4.messagelabs.com id 75/8C-26052-7B74E225; Mon, 09 Sep 2013 22:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1378764725!2487983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19123 invoked from network); 9 Sep 2013 22:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gj-0006qt-BO for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gj-0007Y5-91 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:05 +0000 Date: Mon, 09 Sep 2013 22:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xen/docs: Correct documentation for the conswitch parameter X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27e533159d8d670bb9531dab06bcbefd385a7faa Author: Andrew Cooper AuthorDate: Mon Sep 9 11:50:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:50:20 2013 +0200 xen/docs: Correct documentation for the conswitch parameter Signed-off-by: Andrew Cooper master commit: cc29e450d1abd2f8be67208dfb78046885a50cca master date: 2013-09-04 18:19:01 +0100 --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 708ffc2..b6b0974 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -281,7 +281,7 @@ Flag to indicate whether all guest console output should be copied into the console ring buffer. ### conswitch -> `= [,x]` +> `= [x]` > Default `conswitch=a` @@ -292,7 +292,8 @@ times. The optional trailing `x` indicates that Xen should not automatically switch the console input to dom0 during boot. Any other value, including omission, causes Xen to automatically switch to the dom0 -console during dom0 boot. +console during dom0 boot. Use `conswitch=ax` to keep the default switch +character, but for xen to keep the console. ### cpu\_type > `= arch_perfmon` -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gx-0004bg-Ay; Mon, 09 Sep 2013 22:12:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gw-0004bN-Cr for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:18 +0000 Received: from [85.158.143.35:40685] by server-2.bemta-4.messagelabs.com id A3/9C-26052-1C74E225; Mon, 09 Sep 2013 22:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378764735!89150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22386 invoked from network); 9 Sep 2013 22:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gt-0006qz-IM for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gt-0007YT-F1 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:15 +0000 Date: Mon, 09 Sep 2013 22:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvmloader: fix SeaBIOS interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8adf2629f052ad2fcdafe0ddac8c16e6501c67ed Author: Jan Beulich AuthorDate: Mon Sep 9 11:51:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:51:20 2013 +0200 hvmloader: fix SeaBIOS interface The SeaBIOS ROM image may validly exceed 128k in size, it's only our interface code that so far assumed that it wouldn't. Remove that restriction by setting the base address depending on image size. Add a check to HVM loader so that too big images won't result in silent guest failure anymore. Uncomment the intended build-time size check for rombios, moving it into a function so that it would actually compile. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5f2875739beef3a75c7a7e8579b6cbcb464e61b3 master date: 2013-09-05 11:47:03 +0200 --- tools/firmware/hvmloader/config-seabios.h | 2 -- tools/firmware/hvmloader/hvmloader.c | 4 ++++ tools/firmware/hvmloader/rombios.c | 4 ++-- tools/firmware/hvmloader/seabios.c | 4 +--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config-seabios.h b/tools/firmware/hvmloader/config-seabios.h index e025243..c4d1142 100644 --- a/tools/firmware/hvmloader/config-seabios.h +++ b/tools/firmware/hvmloader/config-seabios.h @@ -3,8 +3,6 @@ #define BIOS_INFO_PHYSICAL_ADDRESS 0x00001000 -#define SEABIOS_PHYSICAL_ADDRESS 0x000E0000 - #endif /* __HVMLOADER_CONFIG_SEABIOS_H__ */ /* diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 9c1cba2..1cc8cf2 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -292,8 +292,12 @@ int main(void) if ( bios->bios_load ) bios->bios_load(bios); else + { + BUG_ON(bios->bios_address + bios->image_size > + HVMLOADER_PHYSICAL_ADDRESS); memcpy((void *)bios->bios_address, bios->image, bios->image_size); + } if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode ) { diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index f6f5310..810bd24 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -127,6 +127,8 @@ static void rombios_load(const struct bios_config *config) uint32_t bioshigh; struct rombios_info *info; + BUILD_BUG_ON(sizeof(rombios) > 0x100000 - ROMBIOS_PHYSICAL_ADDRESS); + memcpy((void *)config->bios_address, config->image, config->image_size); @@ -206,8 +208,6 @@ static void rombios_create_smbios_tables(void) SMBIOS_PHYSICAL_END); } -//BUILD_BUG_ON(sizeof(rombios) > (0x00100000U - ROMBIOS_PHYSICAL_ADDRESS)); - struct bios_config rombios_config = { .name = "ROMBIOS", diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index f17e67b..dd7dfbe 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -133,15 +133,13 @@ static void seabios_setup_e820(void) dump_e820_table(e820, info->e820_nr); } -//BUILD_BUG_ON(sizeof(seabios) > (0x00100000U - SEABIOS_PHYSICAL_ADDRESS)); - struct bios_config seabios_config = { .name = "SeaBIOS", .image = seabios, .image_size = sizeof(seabios), - .bios_address = SEABIOS_PHYSICAL_ADDRESS, + .bios_address = 0x100000 - sizeof(seabios), .load_roms = NULL, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 09 22:12:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Sep 2013 22:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gx-0004bg-Ay; Mon, 09 Sep 2013 22:12:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gw-0004bN-Cr for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:18 +0000 Received: from [85.158.143.35:40685] by server-2.bemta-4.messagelabs.com id A3/9C-26052-1C74E225; Mon, 09 Sep 2013 22:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378764735!89150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22386 invoked from network); 9 Sep 2013 22:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2013 22:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJ9gt-0006qz-IM for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJ9gt-0007YT-F1 for xen-changelog@lists.xensource.com; Mon, 09 Sep 2013 22:12:15 +0000 Date: Mon, 09 Sep 2013 22:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvmloader: fix SeaBIOS interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8adf2629f052ad2fcdafe0ddac8c16e6501c67ed Author: Jan Beulich AuthorDate: Mon Sep 9 11:51:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 11:51:20 2013 +0200 hvmloader: fix SeaBIOS interface The SeaBIOS ROM image may validly exceed 128k in size, it's only our interface code that so far assumed that it wouldn't. Remove that restriction by setting the base address depending on image size. Add a check to HVM loader so that too big images won't result in silent guest failure anymore. Uncomment the intended build-time size check for rombios, moving it into a function so that it would actually compile. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5f2875739beef3a75c7a7e8579b6cbcb464e61b3 master date: 2013-09-05 11:47:03 +0200 --- tools/firmware/hvmloader/config-seabios.h | 2 -- tools/firmware/hvmloader/hvmloader.c | 4 ++++ tools/firmware/hvmloader/rombios.c | 4 ++-- tools/firmware/hvmloader/seabios.c | 4 +--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config-seabios.h b/tools/firmware/hvmloader/config-seabios.h index e025243..c4d1142 100644 --- a/tools/firmware/hvmloader/config-seabios.h +++ b/tools/firmware/hvmloader/config-seabios.h @@ -3,8 +3,6 @@ #define BIOS_INFO_PHYSICAL_ADDRESS 0x00001000 -#define SEABIOS_PHYSICAL_ADDRESS 0x000E0000 - #endif /* __HVMLOADER_CONFIG_SEABIOS_H__ */ /* diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 9c1cba2..1cc8cf2 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -292,8 +292,12 @@ int main(void) if ( bios->bios_load ) bios->bios_load(bios); else + { + BUG_ON(bios->bios_address + bios->image_size > + HVMLOADER_PHYSICAL_ADDRESS); memcpy((void *)bios->bios_address, bios->image, bios->image_size); + } if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode ) { diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index f6f5310..810bd24 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -127,6 +127,8 @@ static void rombios_load(const struct bios_config *config) uint32_t bioshigh; struct rombios_info *info; + BUILD_BUG_ON(sizeof(rombios) > 0x100000 - ROMBIOS_PHYSICAL_ADDRESS); + memcpy((void *)config->bios_address, config->image, config->image_size); @@ -206,8 +208,6 @@ static void rombios_create_smbios_tables(void) SMBIOS_PHYSICAL_END); } -//BUILD_BUG_ON(sizeof(rombios) > (0x00100000U - ROMBIOS_PHYSICAL_ADDRESS)); - struct bios_config rombios_config = { .name = "ROMBIOS", diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index f17e67b..dd7dfbe 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -133,15 +133,13 @@ static void seabios_setup_e820(void) dump_e820_table(e820, info->e820_nr); } -//BUILD_BUG_ON(sizeof(seabios) > (0x00100000U - SEABIOS_PHYSICAL_ADDRESS)); - struct bios_config seabios_config = { .name = "SeaBIOS", .image = seabios, .image_size = sizeof(seabios), - .bios_address = SEABIOS_PHYSICAL_ADDRESS, + .bios_address = 0x100000 - sizeof(seabios), .load_roms = NULL, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 02:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlM-00053c-83; Tue, 10 Sep 2013 02:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlK-00053Q-QD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:07 +0000 Received: from [85.158.143.35:36261] by server-2.bemta-4.messagelabs.com id 2D/F7-26052-2E48E225; Tue, 10 Sep 2013 02:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378780384!1600543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12152 invoked from network); 10 Sep 2013 02:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlH-0008JE-U7 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlH-00073Y-Lu for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:03 +0000 Date: Tue, 10 Sep 2013 02:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: streamline entry.S code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 71eb3a65e305d2cde6a2fcdae186a7f333c9b778 Author: Jan Beulich AuthorDate: Mon Sep 9 10:20:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:20:52 2013 +0200 VMX: streamline entry.S code - move stuff easily/better done in C into C code - re-arrange code paths so that no redundant GET_CURRENT() would remain on the fast paths - move long latency operations earlier - slightly defer disabling interrupts on the VM entry path - use ENTRY() instead of open coding it Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vmx/entry.S | 83 +++++++++++------------------------------ xen/arch/x86/hvm/vmx/vmx.c | 12 +++++- xen/include/asm-x86/hvm/hvm.h | 15 +++++++ 3 files changed, 48 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 496a62c..664ed83 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -28,109 +28,66 @@ #define VMRESUME .byte 0x0f,0x01,0xc3 #define VMLAUNCH .byte 0x0f,0x01,0xc2 -#define VMREAD(off) .byte 0x0f,0x78,0x47,((off)-UREGS_rip) -#define VMWRITE(off) .byte 0x0f,0x79,0x47,((off)-UREGS_rip) -/* VMCS field encodings */ -#define GUEST_RSP 0x681c -#define GUEST_RIP 0x681e -#define GUEST_RFLAGS 0x6820 - - ALIGN -.globl vmx_asm_vmexit_handler -vmx_asm_vmexit_handler: +ENTRY(vmx_asm_vmexit_handler) push %rdi push %rsi push %rdx push %rcx push %rax + mov %cr2,%rax push %r8 push %r9 push %r10 push %r11 push %rbx + GET_CURRENT(%rbx) push %rbp push %r12 push %r13 push %r14 push %r15 - GET_CURRENT(%rbx) - movb $1,VCPU_vmx_launched(%rbx) - - lea UREGS_rip(%rsp),%rdi - mov $GUEST_RIP,%eax - /*VMREAD(UREGS_rip)*/ - .byte 0x0f,0x78,0x07 /* vmread %rax,(%rdi) */ - mov $GUEST_RSP,%eax - VMREAD(UREGS_rsp) - mov $GUEST_RFLAGS,%eax - VMREAD(UREGS_eflags) - - mov %cr2,%rax mov %rax,VCPU_hvm_guest_cr2(%rbx) -#ifndef NDEBUG - mov $0xbeef,%ax - mov %ax,UREGS_error_code(%rsp) - mov %ax,UREGS_entry_vector(%rsp) - mov %ax,UREGS_saved_upcall_mask(%rsp) - mov %ax,UREGS_cs(%rsp) - mov %ax,UREGS_ds(%rsp) - mov %ax,UREGS_es(%rsp) - mov %ax,UREGS_fs(%rsp) - mov %ax,UREGS_gs(%rsp) - mov %ax,UREGS_ss(%rsp) -#endif - mov %rsp,%rdi call vmx_vmexit_handler -.globl vmx_asm_do_vmentry -vmx_asm_do_vmentry: +.Lvmx_do_vmentry: call vmx_intr_assist call nvmx_switch_guest ASSERT_NOT_IN_ATOMIC - GET_CURRENT(%rbx) - cli - mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%eax lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx - cmpl $0,(%rdx,%rax,1) + xor %ecx,%ecx + shl $IRQSTAT_shift,%eax + cli + cmp %ecx,(%rdx,%rax,1) jnz .Lvmx_process_softirqs - testb $0xff,VCPU_vmx_emulate(%rbx) - jnz .Lvmx_goto_emulator - testb $0xff,VCPU_vmx_realmode(%rbx) -UNLIKELY_START(nz, realmode) - cmpw $0,VCPU_vm86_seg_mask(%rbx) + cmp %cl,VCPU_vmx_emulate(%rbx) + jne .Lvmx_goto_emulator + cmp %cl,VCPU_vmx_realmode(%rbx) +UNLIKELY_START(ne, realmode) + cmp %cx,VCPU_vm86_seg_mask(%rbx) jnz .Lvmx_goto_emulator mov %rsp,%rdi call vmx_enter_realmode UNLIKELY_END(realmode) + mov %rsp,%rdi call vmx_vmenter_helper mov VCPU_hvm_guest_cr2(%rbx),%rax - mov %rax,%cr2 - lea UREGS_rip(%rsp),%rdi - mov $GUEST_RIP,%eax - /*VMWRITE(UREGS_rip)*/ - .byte 0x0f,0x79,0x07 /* vmwrite (%rdi),%rax */ - mov $GUEST_RSP,%eax - VMWRITE(UREGS_rsp) - mov $GUEST_RFLAGS,%eax - VMWRITE(UREGS_eflags) - - cmpb $0,VCPU_vmx_launched(%rbx) pop %r15 pop %r14 pop %r13 pop %r12 pop %rbp + mov %rax,%cr2 + cmpb $0,VCPU_vmx_launched(%rbx) pop %rbx pop %r11 pop %r10 @@ -155,13 +112,17 @@ UNLIKELY_END(realmode) call vm_launch_fail ud2 +ENTRY(vmx_asm_do_vmentry) + GET_CURRENT(%rbx) + jmp .Lvmx_do_vmentry + .Lvmx_goto_emulator: sti mov %rsp,%rdi call vmx_realmode - jmp vmx_asm_do_vmentry + jmp .Lvmx_do_vmentry .Lvmx_process_softirqs: sti call do_softirq - jmp vmx_asm_do_vmentry + jmp .Lvmx_do_vmentry diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 782f8de..d6a7710 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2377,6 +2377,12 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) unsigned long exit_qualification, inst_len = 0; struct vcpu *v = current; + regs->rip = __vmread(GUEST_RIP); + regs->rsp = __vmread(GUEST_RSP); + regs->rflags = __vmread(GUEST_RFLAGS); + + hvm_invalidate_regs_fields(regs); + if ( paging_mode_hap(v->domain) && hvm_paging_enabled(v) ) v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = __vmread(GUEST_CR3); @@ -2870,7 +2876,7 @@ out: nvmx_idtv_handling(); } -void vmx_vmenter_helper(void) +void vmx_vmenter_helper(const struct cpu_user_regs *regs) { struct vcpu *curr = current; u32 new_asid, old_asid; @@ -2912,6 +2918,10 @@ void vmx_vmenter_helper(void) out: HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + + __vmwrite(GUEST_RIP, regs->rip); + __vmwrite(GUEST_RSP, regs->rsp); + __vmwrite(GUEST_RFLAGS, regs->rflags); } /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 00489cf..083f813 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -439,6 +439,21 @@ static inline void hvm_set_info_guest(struct vcpu *v) int hvm_debug_op(struct vcpu *v, int32_t op); +static inline void hvm_invalidate_regs_fields(struct cpu_user_regs *regs) +{ +#ifndef NDEBUG + regs->error_code = 0xbeef; + regs->entry_vector = 0xbeef; + regs->saved_upcall_mask = 0xbf; + regs->cs = 0xbeef; + regs->ss = 0xbeef; + regs->ds = 0xbeef; + regs->es = 0xbeef; + regs->fs = 0xbeef; + regs->gs = 0xbeef; +#endif +} + int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlM-00053c-83; Tue, 10 Sep 2013 02:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlK-00053Q-QD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:07 +0000 Received: from [85.158.143.35:36261] by server-2.bemta-4.messagelabs.com id 2D/F7-26052-2E48E225; Tue, 10 Sep 2013 02:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378780384!1600543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12152 invoked from network); 10 Sep 2013 02:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlH-0008JE-U7 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlH-00073Y-Lu for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:03 +0000 Date: Tue, 10 Sep 2013 02:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: streamline entry.S code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 71eb3a65e305d2cde6a2fcdae186a7f333c9b778 Author: Jan Beulich AuthorDate: Mon Sep 9 10:20:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:20:52 2013 +0200 VMX: streamline entry.S code - move stuff easily/better done in C into C code - re-arrange code paths so that no redundant GET_CURRENT() would remain on the fast paths - move long latency operations earlier - slightly defer disabling interrupts on the VM entry path - use ENTRY() instead of open coding it Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vmx/entry.S | 83 +++++++++++------------------------------ xen/arch/x86/hvm/vmx/vmx.c | 12 +++++- xen/include/asm-x86/hvm/hvm.h | 15 +++++++ 3 files changed, 48 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 496a62c..664ed83 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -28,109 +28,66 @@ #define VMRESUME .byte 0x0f,0x01,0xc3 #define VMLAUNCH .byte 0x0f,0x01,0xc2 -#define VMREAD(off) .byte 0x0f,0x78,0x47,((off)-UREGS_rip) -#define VMWRITE(off) .byte 0x0f,0x79,0x47,((off)-UREGS_rip) -/* VMCS field encodings */ -#define GUEST_RSP 0x681c -#define GUEST_RIP 0x681e -#define GUEST_RFLAGS 0x6820 - - ALIGN -.globl vmx_asm_vmexit_handler -vmx_asm_vmexit_handler: +ENTRY(vmx_asm_vmexit_handler) push %rdi push %rsi push %rdx push %rcx push %rax + mov %cr2,%rax push %r8 push %r9 push %r10 push %r11 push %rbx + GET_CURRENT(%rbx) push %rbp push %r12 push %r13 push %r14 push %r15 - GET_CURRENT(%rbx) - movb $1,VCPU_vmx_launched(%rbx) - - lea UREGS_rip(%rsp),%rdi - mov $GUEST_RIP,%eax - /*VMREAD(UREGS_rip)*/ - .byte 0x0f,0x78,0x07 /* vmread %rax,(%rdi) */ - mov $GUEST_RSP,%eax - VMREAD(UREGS_rsp) - mov $GUEST_RFLAGS,%eax - VMREAD(UREGS_eflags) - - mov %cr2,%rax mov %rax,VCPU_hvm_guest_cr2(%rbx) -#ifndef NDEBUG - mov $0xbeef,%ax - mov %ax,UREGS_error_code(%rsp) - mov %ax,UREGS_entry_vector(%rsp) - mov %ax,UREGS_saved_upcall_mask(%rsp) - mov %ax,UREGS_cs(%rsp) - mov %ax,UREGS_ds(%rsp) - mov %ax,UREGS_es(%rsp) - mov %ax,UREGS_fs(%rsp) - mov %ax,UREGS_gs(%rsp) - mov %ax,UREGS_ss(%rsp) -#endif - mov %rsp,%rdi call vmx_vmexit_handler -.globl vmx_asm_do_vmentry -vmx_asm_do_vmentry: +.Lvmx_do_vmentry: call vmx_intr_assist call nvmx_switch_guest ASSERT_NOT_IN_ATOMIC - GET_CURRENT(%rbx) - cli - mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%eax lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx - cmpl $0,(%rdx,%rax,1) + xor %ecx,%ecx + shl $IRQSTAT_shift,%eax + cli + cmp %ecx,(%rdx,%rax,1) jnz .Lvmx_process_softirqs - testb $0xff,VCPU_vmx_emulate(%rbx) - jnz .Lvmx_goto_emulator - testb $0xff,VCPU_vmx_realmode(%rbx) -UNLIKELY_START(nz, realmode) - cmpw $0,VCPU_vm86_seg_mask(%rbx) + cmp %cl,VCPU_vmx_emulate(%rbx) + jne .Lvmx_goto_emulator + cmp %cl,VCPU_vmx_realmode(%rbx) +UNLIKELY_START(ne, realmode) + cmp %cx,VCPU_vm86_seg_mask(%rbx) jnz .Lvmx_goto_emulator mov %rsp,%rdi call vmx_enter_realmode UNLIKELY_END(realmode) + mov %rsp,%rdi call vmx_vmenter_helper mov VCPU_hvm_guest_cr2(%rbx),%rax - mov %rax,%cr2 - lea UREGS_rip(%rsp),%rdi - mov $GUEST_RIP,%eax - /*VMWRITE(UREGS_rip)*/ - .byte 0x0f,0x79,0x07 /* vmwrite (%rdi),%rax */ - mov $GUEST_RSP,%eax - VMWRITE(UREGS_rsp) - mov $GUEST_RFLAGS,%eax - VMWRITE(UREGS_eflags) - - cmpb $0,VCPU_vmx_launched(%rbx) pop %r15 pop %r14 pop %r13 pop %r12 pop %rbp + mov %rax,%cr2 + cmpb $0,VCPU_vmx_launched(%rbx) pop %rbx pop %r11 pop %r10 @@ -155,13 +112,17 @@ UNLIKELY_END(realmode) call vm_launch_fail ud2 +ENTRY(vmx_asm_do_vmentry) + GET_CURRENT(%rbx) + jmp .Lvmx_do_vmentry + .Lvmx_goto_emulator: sti mov %rsp,%rdi call vmx_realmode - jmp vmx_asm_do_vmentry + jmp .Lvmx_do_vmentry .Lvmx_process_softirqs: sti call do_softirq - jmp vmx_asm_do_vmentry + jmp .Lvmx_do_vmentry diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 782f8de..d6a7710 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2377,6 +2377,12 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) unsigned long exit_qualification, inst_len = 0; struct vcpu *v = current; + regs->rip = __vmread(GUEST_RIP); + regs->rsp = __vmread(GUEST_RSP); + regs->rflags = __vmread(GUEST_RFLAGS); + + hvm_invalidate_regs_fields(regs); + if ( paging_mode_hap(v->domain) && hvm_paging_enabled(v) ) v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = __vmread(GUEST_CR3); @@ -2870,7 +2876,7 @@ out: nvmx_idtv_handling(); } -void vmx_vmenter_helper(void) +void vmx_vmenter_helper(const struct cpu_user_regs *regs) { struct vcpu *curr = current; u32 new_asid, old_asid; @@ -2912,6 +2918,10 @@ void vmx_vmenter_helper(void) out: HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + + __vmwrite(GUEST_RIP, regs->rip); + __vmwrite(GUEST_RSP, regs->rsp); + __vmwrite(GUEST_RFLAGS, regs->rflags); } /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 00489cf..083f813 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -439,6 +439,21 @@ static inline void hvm_set_info_guest(struct vcpu *v) int hvm_debug_op(struct vcpu *v, int32_t op); +static inline void hvm_invalidate_regs_fields(struct cpu_user_regs *regs) +{ +#ifndef NDEBUG + regs->error_code = 0xbeef; + regs->entry_vector = 0xbeef; + regs->saved_upcall_mask = 0xbf; + regs->cs = 0xbeef; + regs->ss = 0xbeef; + regs->ds = 0xbeef; + regs->es = 0xbeef; + regs->fs = 0xbeef; + regs->gs = 0xbeef; +#endif +} + int hvm_hap_nested_page_fault(paddr_t gpa, bool_t gla_valid, unsigned long gla, bool_t access_r, -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlW-00054K-BN; Tue, 10 Sep 2013 02:33:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlV-000548-3w for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:17 +0000 Received: from [85.158.139.211:25638] by server-8.bemta-5.messagelabs.com id 8F/55-17437-CE48E225; Tue, 10 Sep 2013 02:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378780394!1568870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 534 invoked from network); 10 Sep 2013 02:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlS-0008JH-D0 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlS-00074C-1f for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:14 +0000 Date: Tue, 10 Sep 2013 02:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: move various uses of UD2 out of fast 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 b0df10407df96fe25f3c1a2bffc4be0696d328b4 Author: Jan Beulich AuthorDate: Mon Sep 9 10:22:23 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:22:23 2013 +0200 VMX: move various uses of UD2 out of fast paths ... at once making conditional forward jumps, which are statically predicted to be not taken, only used for the unlikely (error) cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/include/asm-x86/asm_defns.h | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vmx/vmx.h | 25 +++++++++++++++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 81d4905..8fc1a2c 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -67,6 +67,30 @@ void ret_from_intr(void); #define ASSERT_NOT_IN_ATOMIC #endif +#else + +#ifdef __clang__ /* clang's builtin assember can't do .subsection */ + +#define UNLIKELY_START_SECTION ".pushsection .fixup,\"ax\"" +#define UNLIKELY_END_SECTION ".popsection" + +#else + +#define UNLIKELY_START_SECTION ".subsection 1" +#define UNLIKELY_END_SECTION ".subsection 0" + +#endif + +#define UNLIKELY_START(cond, tag) \ + "j" #cond " .Lunlikely%=.tag;\n\t" \ + UNLIKELY_START_SECTION "\n" \ + ".Lunlikely%=.tag:" + +#define UNLIKELY_END(tag) \ + "jmp .Llikely%=.tag;\n\t" \ + UNLIKELY_END_SECTION "\n" \ + ".Llikely%=.tag:" + #endif #endif /* __X86_ASM_DEFNS_H__ */ diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index f4d759b..a7b667e 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -285,7 +285,9 @@ static inline void __vmptrld(u64 addr) asm volatile ( VMPTRLD_OPCODE MODRM_EAX_06 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmptrld) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&addr) : "memory"); @@ -296,7 +298,9 @@ static inline void __vmpclear(u64 addr) asm volatile ( VMCLEAR_OPCODE MODRM_EAX_06 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmclear) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&addr) : "memory"); @@ -309,7 +313,9 @@ static inline unsigned long __vmread(unsigned long field) asm volatile ( VMREAD_OPCODE MODRM_EAX_ECX /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmread) + "\tud2\n" + UNLIKELY_END_SECTION : "=c" (ecx) : "a" (field) : "memory"); @@ -322,7 +328,9 @@ static inline void __vmwrite(unsigned long field, unsigned long value) asm volatile ( VMWRITE_OPCODE MODRM_EAX_ECX /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmwrite) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (field) , "c" (value) : "memory"); @@ -360,7 +368,9 @@ static inline void __invept(int type, u64 eptp, u64 gpa) asm volatile ( INVEPT_OPCODE MODRM_EAX_08 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, invept) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&operand), "c" (type) : "memory" ); @@ -377,7 +387,10 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ asm volatile ( "1: " INVVPID_OPCODE MODRM_EAX_08 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 2f ; ud2 ; 2:\n" + UNLIKELY_START(be, invvpid) + "\tud2\n" + UNLIKELY_END_SECTION "\n" + "2:" _ASM_EXTABLE(1b, 2b) : : "a" (&operand), "c" (type) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 02:33:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlW-00054K-BN; Tue, 10 Sep 2013 02:33:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlV-000548-3w for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:17 +0000 Received: from [85.158.139.211:25638] by server-8.bemta-5.messagelabs.com id 8F/55-17437-CE48E225; Tue, 10 Sep 2013 02:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378780394!1568870!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 534 invoked from network); 10 Sep 2013 02:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlS-0008JH-D0 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlS-00074C-1f for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:14 +0000 Date: Tue, 10 Sep 2013 02:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: move various uses of UD2 out of fast 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 b0df10407df96fe25f3c1a2bffc4be0696d328b4 Author: Jan Beulich AuthorDate: Mon Sep 9 10:22:23 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:22:23 2013 +0200 VMX: move various uses of UD2 out of fast paths ... at once making conditional forward jumps, which are statically predicted to be not taken, only used for the unlikely (error) cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/include/asm-x86/asm_defns.h | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vmx/vmx.h | 25 +++++++++++++++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 81d4905..8fc1a2c 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -67,6 +67,30 @@ void ret_from_intr(void); #define ASSERT_NOT_IN_ATOMIC #endif +#else + +#ifdef __clang__ /* clang's builtin assember can't do .subsection */ + +#define UNLIKELY_START_SECTION ".pushsection .fixup,\"ax\"" +#define UNLIKELY_END_SECTION ".popsection" + +#else + +#define UNLIKELY_START_SECTION ".subsection 1" +#define UNLIKELY_END_SECTION ".subsection 0" + +#endif + +#define UNLIKELY_START(cond, tag) \ + "j" #cond " .Lunlikely%=.tag;\n\t" \ + UNLIKELY_START_SECTION "\n" \ + ".Lunlikely%=.tag:" + +#define UNLIKELY_END(tag) \ + "jmp .Llikely%=.tag;\n\t" \ + UNLIKELY_END_SECTION "\n" \ + ".Llikely%=.tag:" + #endif #endif /* __X86_ASM_DEFNS_H__ */ diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index f4d759b..a7b667e 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -285,7 +285,9 @@ static inline void __vmptrld(u64 addr) asm volatile ( VMPTRLD_OPCODE MODRM_EAX_06 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmptrld) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&addr) : "memory"); @@ -296,7 +298,9 @@ static inline void __vmpclear(u64 addr) asm volatile ( VMCLEAR_OPCODE MODRM_EAX_06 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmclear) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&addr) : "memory"); @@ -309,7 +313,9 @@ static inline unsigned long __vmread(unsigned long field) asm volatile ( VMREAD_OPCODE MODRM_EAX_ECX /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmread) + "\tud2\n" + UNLIKELY_END_SECTION : "=c" (ecx) : "a" (field) : "memory"); @@ -322,7 +328,9 @@ static inline void __vmwrite(unsigned long field, unsigned long value) asm volatile ( VMWRITE_OPCODE MODRM_EAX_ECX /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, vmwrite) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (field) , "c" (value) : "memory"); @@ -360,7 +368,9 @@ static inline void __invept(int type, u64 eptp, u64 gpa) asm volatile ( INVEPT_OPCODE MODRM_EAX_08 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 1f ; ud2 ; 1:\n" + UNLIKELY_START(be, invept) + "\tud2\n" + UNLIKELY_END_SECTION : : "a" (&operand), "c" (type) : "memory" ); @@ -377,7 +387,10 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ asm volatile ( "1: " INVVPID_OPCODE MODRM_EAX_08 /* CF==1 or ZF==1 --> crash (ud2) */ - "ja 2f ; ud2 ; 2:\n" + UNLIKELY_START(be, invvpid) + "\tud2\n" + UNLIKELY_END_SECTION "\n" + "2:" _ASM_EXTABLE(1b, 2b) : : "a" (&operand), "c" (type) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 02:33:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlg-00055H-EP; Tue, 10 Sep 2013 02:33:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlf-000554-HH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:27 +0000 Received: from [193.109.254.147:3777] by server-12.bemta-14.messagelabs.com id 30/F0-27329-6F48E225; Tue, 10 Sep 2013 02:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1378780404!1728502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15877 invoked from network); 10 Sep 2013 02:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlc-0008JN-IO for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlc-00074Y-Ga for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:24 +0000 Date: Tue, 10 Sep 2013 02:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: use proper instruction mnemonics if assembler supports 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 cfd54835e6e8a28c743dc7d67c662d151ab4923a Author: Jan Beulich AuthorDate: Mon Sep 9 10:23:32 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:23:32 2013 +0200 VMX: use proper instruction mnemonics if assembler supports them With the hex byte emission we were taking away a good part of flexibility from the compiler, as for simplicity reasons these were built using fixed operands. All half way modern build environments would allow using the mnemonics (but we can't disable the hex variants yet, since the binutils around at the time gcc 4.1 got released didn't support these yet). I didn't convert __vmread() yet because that would, just like for __vmread_safe(), imply converting to a macro so that the output operand can be the caller supplied variable rather than an intermediate one. As that would require touching all invocation points of __vmread() (of which there are quite a few), I'd first like to be certain the approach is acceptable; the main question being whether the now conditional code might be considered to cause future maintenance issues, and the second being that of parameter/argument ordering (here I made __vmread_safe() match __vmwrite(), but one could also take the position that read and write should use the inverse order of one another, in line with the actual instruction operands). Additionally I was quite puzzled to find that all the asm()-s involved here have memory clobbers - what are they needed for? Or can they be dropped at least in some cases? Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- Config.mk | 21 ++++++++ xen/arch/x86/Rules.mk | 2 + xen/arch/x86/hvm/vmx/vmcs.c | 7 +-- xen/arch/x86/hvm/vmx/vvmx.c | 8 +-- xen/include/asm-x86/hvm/vmx/vmx.h | 92 ++++++++++++++++++++++++++++-------- 5 files changed, 100 insertions(+), 30 deletions(-) diff --git a/Config.mk b/Config.mk index f169be4..a26c7c0 100644 --- a/Config.mk +++ b/Config.mk @@ -4,6 +4,12 @@ ifeq ($(filter /%,$(XEN_ROOT)),) $(error XEN_ROOT must be absolute) endif +# Convenient variables +comma := , +squote := ' +empty := +space := $(empty) $(empty) + # fallback for older make realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) @@ -128,6 +134,21 @@ endef check-$(gcc) = $(call cc-ver-check,CC,0x040100,"Xen requires at least gcc-4.1") $(eval $(check-y)) +# as-insn: Check whether assembler supports an instruction. +# Usage: cflags-y += $(call as-insn "insn",option-yes,option-no) +as-insn = $(if $(shell echo 'void _(void) { asm volatile ( $(2) ); }' \ + | $(1) -c -x c -o /dev/null - 2>&1),$(4),$(3)) + +# as-insn-check: Add an option to compilation flags, but only if insn is +# supported by assembler. +# Usage: $(call as-insn-check CFLAGS,CC,"nop",-DHAVE_GAS_NOP) +as-insn-check = $(eval $(call as-insn-check-closure,$(1),$(2),$(3),$(4))) +define as-insn-check-closure + ifeq ($$(call as-insn,$$($(2)),$(3),y,n),y) + $(1) += $(4) + endif +endef + define buildmakevars2shellvars export PREFIX="$(PREFIX)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 04c1a90..eb11b5b 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -28,6 +28,8 @@ CFLAGS += -msoft-float $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) +$(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) +$(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) ifeq ($(supervisor_mode_kernel),y) CFLAGS += -DCONFIG_X86_SUPERVISOR_MODE_KERNEL=1 diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 31347bb..0b40b54 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1292,12 +1292,11 @@ void vmx_do_resume(struct vcpu *v) reset_stack_and_jump(vmx_asm_do_vmentry); } -static unsigned long vmr(unsigned long field) +static inline unsigned long vmr(unsigned long field) { - int rc; unsigned long val; - val = __vmread_safe(field, &rc); - return rc ? 0 : val; + + return __vmread_safe(field, &val) ? val : 0; } static void vmx_dump_sel(char *name, uint32_t selector) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index cecc72f..5ef5ad7 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -963,13 +963,11 @@ fallback: vvmcs_to_shadow(vvmcs, field[i]); } -static void shadow_to_vvmcs(void *vvmcs, unsigned int field) +static inline void shadow_to_vvmcs(void *vvmcs, unsigned int field) { - u64 value; - int rc; + unsigned long value; - value = __vmread_safe(field, &rc); - if ( !rc ) + if ( __vmread_safe(field, &value) ) __set_vvmcs(vvmcs, field, value); } diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index a7b667e..9816ce4 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -282,27 +282,43 @@ extern uint8_t posted_intr_vector; static inline void __vmptrld(u64 addr) { - asm volatile ( VMPTRLD_OPCODE - MODRM_EAX_06 + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmptrld %0\n" +#else + VMPTRLD_OPCODE MODRM_EAX_06 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmptrld) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "m" (addr) +#else : "a" (&addr) +#endif : "memory"); } static inline void __vmpclear(u64 addr) { - asm volatile ( VMCLEAR_OPCODE - MODRM_EAX_06 + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmclear %0\n" +#else + VMCLEAR_OPCODE MODRM_EAX_06 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmclear) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "m" (addr) +#else : "a" (&addr) +#endif : "memory"); } @@ -325,33 +341,50 @@ static inline unsigned long __vmread(unsigned long field) static inline void __vmwrite(unsigned long field, unsigned long value) { - asm volatile ( VMWRITE_OPCODE - MODRM_EAX_ECX + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmwrite %1, %0\n" +#else + VMWRITE_OPCODE MODRM_EAX_ECX +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmwrite) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "r" (field) , "rm" (value) +#else : "a" (field) , "c" (value) +#endif : "memory"); } -static inline unsigned long __vmread_safe(unsigned long field, int *error) +static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) { - unsigned long ecx; + bool_t okay; - asm volatile ( VMREAD_OPCODE - MODRM_EAX_ECX - /* CF==1 or ZF==1 --> rc = -1 */ - "setna %b0 ; neg %0" - : "=q" (*error), "=c" (ecx) - : "0" (0), "a" (field) + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmread %2, %1\n\t" +#else + VMREAD_OPCODE MODRM_EAX_ECX +#endif + /* CF==1 or ZF==1 --> rc = 0 */ + "setnbe %0" +#ifdef HAVE_GAS_VMX + : "=qm" (okay), "=rm" (*value) + : "r" (field) +#else + : "=qm" (okay), "=c" (*value) + : "a" (field) +#endif : "memory"); - return ecx; + return okay; } -static inline void __invept(int type, u64 eptp, u64 gpa) +static inline void __invept(unsigned long type, u64 eptp, u64 gpa) { struct { u64 eptp, gpa; @@ -365,18 +398,26 @@ static inline void __invept(int type, u64 eptp, u64 gpa) !cpu_has_vmx_ept_invept_single_context ) type = INVEPT_ALL_CONTEXT; - asm volatile ( INVEPT_OPCODE - MODRM_EAX_08 + asm volatile ( +#ifdef HAVE_GAS_EPT + "invept %0, %1\n" +#else + INVEPT_OPCODE MODRM_EAX_08 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, invept) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_EPT + : "m" (operand), "r" (type) +#else : "a" (&operand), "c" (type) +#endif : "memory" ); } -static inline void __invvpid(int type, u16 vpid, u64 gva) +static inline void __invvpid(unsigned long type, u16 vpid, u64 gva) { struct { u64 vpid:16; @@ -385,7 +426,12 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) } __attribute__ ((packed)) operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ - asm volatile ( "1: " INVVPID_OPCODE MODRM_EAX_08 + asm volatile ( "1: " +#ifdef HAVE_GAS_EPT + "invvpid %0, %1\n" +#else + INVVPID_OPCODE MODRM_EAX_08 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, invvpid) "\tud2\n" @@ -393,7 +439,11 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) "2:" _ASM_EXTABLE(1b, 2b) : +#ifdef HAVE_GAS_EPT + : "m" (operand), "r" (type) +#else : "a" (&operand), "c" (type) +#endif : "memory" ); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlg-00055H-EP; Tue, 10 Sep 2013 02:33:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlf-000554-HH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:27 +0000 Received: from [193.109.254.147:3777] by server-12.bemta-14.messagelabs.com id 30/F0-27329-6F48E225; Tue, 10 Sep 2013 02:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1378780404!1728502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15877 invoked from network); 10 Sep 2013 02:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlc-0008JN-IO for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlc-00074Y-Ga for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:24 +0000 Date: Tue, 10 Sep 2013 02:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: use proper instruction mnemonics if assembler supports 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 cfd54835e6e8a28c743dc7d67c662d151ab4923a Author: Jan Beulich AuthorDate: Mon Sep 9 10:23:32 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:23:32 2013 +0200 VMX: use proper instruction mnemonics if assembler supports them With the hex byte emission we were taking away a good part of flexibility from the compiler, as for simplicity reasons these were built using fixed operands. All half way modern build environments would allow using the mnemonics (but we can't disable the hex variants yet, since the binutils around at the time gcc 4.1 got released didn't support these yet). I didn't convert __vmread() yet because that would, just like for __vmread_safe(), imply converting to a macro so that the output operand can be the caller supplied variable rather than an intermediate one. As that would require touching all invocation points of __vmread() (of which there are quite a few), I'd first like to be certain the approach is acceptable; the main question being whether the now conditional code might be considered to cause future maintenance issues, and the second being that of parameter/argument ordering (here I made __vmread_safe() match __vmwrite(), but one could also take the position that read and write should use the inverse order of one another, in line with the actual instruction operands). Additionally I was quite puzzled to find that all the asm()-s involved here have memory clobbers - what are they needed for? Or can they be dropped at least in some cases? Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- Config.mk | 21 ++++++++ xen/arch/x86/Rules.mk | 2 + xen/arch/x86/hvm/vmx/vmcs.c | 7 +-- xen/arch/x86/hvm/vmx/vvmx.c | 8 +-- xen/include/asm-x86/hvm/vmx/vmx.h | 92 ++++++++++++++++++++++++++++-------- 5 files changed, 100 insertions(+), 30 deletions(-) diff --git a/Config.mk b/Config.mk index f169be4..a26c7c0 100644 --- a/Config.mk +++ b/Config.mk @@ -4,6 +4,12 @@ ifeq ($(filter /%,$(XEN_ROOT)),) $(error XEN_ROOT must be absolute) endif +# Convenient variables +comma := , +squote := ' +empty := +space := $(empty) $(empty) + # fallback for older make realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) @@ -128,6 +134,21 @@ endef check-$(gcc) = $(call cc-ver-check,CC,0x040100,"Xen requires at least gcc-4.1") $(eval $(check-y)) +# as-insn: Check whether assembler supports an instruction. +# Usage: cflags-y += $(call as-insn "insn",option-yes,option-no) +as-insn = $(if $(shell echo 'void _(void) { asm volatile ( $(2) ); }' \ + | $(1) -c -x c -o /dev/null - 2>&1),$(4),$(3)) + +# as-insn-check: Add an option to compilation flags, but only if insn is +# supported by assembler. +# Usage: $(call as-insn-check CFLAGS,CC,"nop",-DHAVE_GAS_NOP) +as-insn-check = $(eval $(call as-insn-check-closure,$(1),$(2),$(3),$(4))) +define as-insn-check-closure + ifeq ($$(call as-insn,$$($(2)),$(3),y,n),y) + $(1) += $(4) + endif +endef + define buildmakevars2shellvars export PREFIX="$(PREFIX)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 04c1a90..eb11b5b 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -28,6 +28,8 @@ CFLAGS += -msoft-float $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) +$(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) +$(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) ifeq ($(supervisor_mode_kernel),y) CFLAGS += -DCONFIG_X86_SUPERVISOR_MODE_KERNEL=1 diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 31347bb..0b40b54 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1292,12 +1292,11 @@ void vmx_do_resume(struct vcpu *v) reset_stack_and_jump(vmx_asm_do_vmentry); } -static unsigned long vmr(unsigned long field) +static inline unsigned long vmr(unsigned long field) { - int rc; unsigned long val; - val = __vmread_safe(field, &rc); - return rc ? 0 : val; + + return __vmread_safe(field, &val) ? val : 0; } static void vmx_dump_sel(char *name, uint32_t selector) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index cecc72f..5ef5ad7 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -963,13 +963,11 @@ fallback: vvmcs_to_shadow(vvmcs, field[i]); } -static void shadow_to_vvmcs(void *vvmcs, unsigned int field) +static inline void shadow_to_vvmcs(void *vvmcs, unsigned int field) { - u64 value; - int rc; + unsigned long value; - value = __vmread_safe(field, &rc); - if ( !rc ) + if ( __vmread_safe(field, &value) ) __set_vvmcs(vvmcs, field, value); } diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index a7b667e..9816ce4 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -282,27 +282,43 @@ extern uint8_t posted_intr_vector; static inline void __vmptrld(u64 addr) { - asm volatile ( VMPTRLD_OPCODE - MODRM_EAX_06 + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmptrld %0\n" +#else + VMPTRLD_OPCODE MODRM_EAX_06 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmptrld) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "m" (addr) +#else : "a" (&addr) +#endif : "memory"); } static inline void __vmpclear(u64 addr) { - asm volatile ( VMCLEAR_OPCODE - MODRM_EAX_06 + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmclear %0\n" +#else + VMCLEAR_OPCODE MODRM_EAX_06 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmclear) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "m" (addr) +#else : "a" (&addr) +#endif : "memory"); } @@ -325,33 +341,50 @@ static inline unsigned long __vmread(unsigned long field) static inline void __vmwrite(unsigned long field, unsigned long value) { - asm volatile ( VMWRITE_OPCODE - MODRM_EAX_ECX + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmwrite %1, %0\n" +#else + VMWRITE_OPCODE MODRM_EAX_ECX +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmwrite) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_VMX + : "r" (field) , "rm" (value) +#else : "a" (field) , "c" (value) +#endif : "memory"); } -static inline unsigned long __vmread_safe(unsigned long field, int *error) +static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) { - unsigned long ecx; + bool_t okay; - asm volatile ( VMREAD_OPCODE - MODRM_EAX_ECX - /* CF==1 or ZF==1 --> rc = -1 */ - "setna %b0 ; neg %0" - : "=q" (*error), "=c" (ecx) - : "0" (0), "a" (field) + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmread %2, %1\n\t" +#else + VMREAD_OPCODE MODRM_EAX_ECX +#endif + /* CF==1 or ZF==1 --> rc = 0 */ + "setnbe %0" +#ifdef HAVE_GAS_VMX + : "=qm" (okay), "=rm" (*value) + : "r" (field) +#else + : "=qm" (okay), "=c" (*value) + : "a" (field) +#endif : "memory"); - return ecx; + return okay; } -static inline void __invept(int type, u64 eptp, u64 gpa) +static inline void __invept(unsigned long type, u64 eptp, u64 gpa) { struct { u64 eptp, gpa; @@ -365,18 +398,26 @@ static inline void __invept(int type, u64 eptp, u64 gpa) !cpu_has_vmx_ept_invept_single_context ) type = INVEPT_ALL_CONTEXT; - asm volatile ( INVEPT_OPCODE - MODRM_EAX_08 + asm volatile ( +#ifdef HAVE_GAS_EPT + "invept %0, %1\n" +#else + INVEPT_OPCODE MODRM_EAX_08 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, invept) "\tud2\n" UNLIKELY_END_SECTION : +#ifdef HAVE_GAS_EPT + : "m" (operand), "r" (type) +#else : "a" (&operand), "c" (type) +#endif : "memory" ); } -static inline void __invvpid(int type, u16 vpid, u64 gva) +static inline void __invvpid(unsigned long type, u16 vpid, u64 gva) { struct { u64 vpid:16; @@ -385,7 +426,12 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) } __attribute__ ((packed)) operand = {vpid, 0, gva}; /* Fix up #UD exceptions which occur when TLBs are flushed before VMXON. */ - asm volatile ( "1: " INVVPID_OPCODE MODRM_EAX_08 + asm volatile ( "1: " +#ifdef HAVE_GAS_EPT + "invvpid %0, %1\n" +#else + INVVPID_OPCODE MODRM_EAX_08 +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, invvpid) "\tud2\n" @@ -393,7 +439,11 @@ static inline void __invvpid(int type, u16 vpid, u64 gva) "2:" _ASM_EXTABLE(1b, 2b) : +#ifdef HAVE_GAS_EPT + : "m" (operand), "r" (type) +#else : "a" (&operand), "c" (type) +#endif : "memory" ); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlq-00056f-JV; Tue, 10 Sep 2013 02: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 1VJDlp-00056R-BJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:37 +0000 Received: from [85.158.139.211:35859] by server-8.bemta-5.messagelabs.com id 23/95-17437-0058E225; Tue, 10 Sep 2013 02:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378780415!1579970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9948 invoked from network); 10 Sep 2013 02:33:35 -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; 10 Sep 2013 02:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlm-0008JV-QR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlm-00074y-MO for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:34 +0000 Date: Tue, 10 Sep 2013 02:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] SVM: streamline entry.S code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 110b2d6e8aa2a35d8f9d8efc3f3bfda3c49a3855 Author: Jan Beulich AuthorDate: Mon Sep 9 10:24:21 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:24:21 2013 +0200 SVM: streamline entry.S code - fix a bogus "test" with zero immediate - move stuff easily/better done in C into C code - re-arrange code paths so that no redundant GET_CURRENT() would remain on the fast paths - move long latency operations earlier - slightly defer disabling global interrupts on the VM entry path Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/svm/entry.S | 61 +++++++++++++++----------------------- xen/arch/x86/hvm/svm/svm.c | 2 + xen/include/asm-x86/asm_defns.h | 10 +++++- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 1969629..3ee4247 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -32,28 +32,34 @@ #define CLGI .byte 0x0F,0x01,0xDD ENTRY(svm_asm_do_resume) + GET_CURRENT(%rbx) +.Lsvm_do_resume: call svm_intr_assist mov %rsp,%rdi call nsvm_vcpu_switch ASSERT_NOT_IN_ATOMIC - GET_CURRENT(%rbx) - CLGI - mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%eax lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx - cmpl $0,(%rdx,%rax,1) + xor %ecx,%ecx + shl $IRQSTAT_shift,%eax + CLGI + cmp %ecx,(%rdx,%rax,1) jne .Lsvm_process_softirqs - testb $0, VCPU_nsvm_hap_enabled(%rbx) -UNLIKELY_START(nz, nsvm_hap) - mov VCPU_nhvm_p2m(%rbx),%rax - test %rax,%rax + cmp %cl,VCPU_nsvm_hap_enabled(%rbx) +UNLIKELY_START(ne, nsvm_hap) + cmp %rcx,VCPU_nhvm_p2m(%rbx) sete %al - andb VCPU_nhvm_guestmode(%rbx),%al - jnz .Lsvm_nsvm_no_p2m -UNLIKELY_END(nsvm_hap) + test VCPU_nhvm_guestmode(%rbx),%al + UNLIKELY_DONE(z, nsvm_hap) + /* + * Someone shot down our nested p2m table; go round again + * and nsvm_vcpu_switch() will fix it for us. + */ + STGI + jmp .Lsvm_do_resume +__UNLIKELY_END(nsvm_hap) call svm_asid_handle_vmrun @@ -72,13 +78,12 @@ UNLIKELY_END(svm_trace) mov UREGS_eflags(%rsp),%rax mov %rax,VMCB_rflags(%rcx) - mov VCPU_svm_vmcb_pa(%rbx),%rax - pop %r15 pop %r14 pop %r13 pop %r12 pop %rbp + mov VCPU_svm_vmcb_pa(%rbx),%rax pop %rbx pop %r11 pop %r10 @@ -92,25 +97,26 @@ UNLIKELY_END(svm_trace) VMRUN + GET_CURRENT(%rax) push %rdi push %rsi push %rdx push %rcx + mov VCPU_svm_vmcb(%rax),%rcx push %rax push %r8 push %r9 push %r10 push %r11 push %rbx + mov %rax,%rbx push %rbp push %r12 push %r13 push %r14 push %r15 - GET_CURRENT(%rbx) movb $0,VCPU_svm_vmcb_in_sync(%rbx) - mov VCPU_svm_vmcb(%rbx),%rcx mov VMCB_rax(%rcx),%rax mov %rax,UREGS_rax(%rsp) mov VMCB_rip(%rcx),%rax @@ -120,33 +126,14 @@ UNLIKELY_END(svm_trace) mov VMCB_rflags(%rcx),%rax mov %rax,UREGS_eflags(%rsp) -#ifndef NDEBUG - mov $0xbeef,%ax - mov %ax,UREGS_error_code(%rsp) - mov %ax,UREGS_entry_vector(%rsp) - mov %ax,UREGS_saved_upcall_mask(%rsp) - mov %ax,UREGS_cs(%rsp) - mov %ax,UREGS_ds(%rsp) - mov %ax,UREGS_es(%rsp) - mov %ax,UREGS_fs(%rsp) - mov %ax,UREGS_gs(%rsp) - mov %ax,UREGS_ss(%rsp) -#endif - STGI .globl svm_stgi_label svm_stgi_label: mov %rsp,%rdi call svm_vmexit_handler - jmp svm_asm_do_resume + jmp .Lsvm_do_resume .Lsvm_process_softirqs: STGI call do_softirq - jmp svm_asm_do_resume - -.Lsvm_nsvm_no_p2m: - /* Someone shot down our nested p2m table; go round again - * and nsvm_vcpu_switch() will fix it for us. */ - STGI - jmp svm_asm_do_resume + jmp .Lsvm_do_resume diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index f74265a..695b53a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2069,6 +2069,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) vintr_t intr; bool_t vcpu_guestmode = 0; + hvm_invalidate_regs_fields(regs); + if ( paging_mode_hap(v->domain) ) v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = vmcb_get_cr3(vmcb); diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 8fc1a2c..25032d5 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -39,11 +39,17 @@ void ret_from_intr(void); .subsection 1; \ .Lunlikely.tag: -#define UNLIKELY_END(tag) \ - jmp .Llikely.tag; \ +#define UNLIKELY_DONE(cond, tag) \ + j##cond .Llikely.tag + +#define __UNLIKELY_END(tag) \ .subsection 0; \ .Llikely.tag: +#define UNLIKELY_END(tag) \ + UNLIKELY_DONE(mp, tag); \ + __UNLIKELY_END(tag) + #define STACK_CPUINFO_FIELD(field) (STACK_SIZE-CPUINFO_sizeof+CPUINFO_##field) #define GET_STACK_BASE(reg) \ movq $~(STACK_SIZE-1),reg; \ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDlq-00056f-JV; Tue, 10 Sep 2013 02: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 1VJDlp-00056R-BJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:37 +0000 Received: from [85.158.139.211:35859] by server-8.bemta-5.messagelabs.com id 23/95-17437-0058E225; Tue, 10 Sep 2013 02:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378780415!1579970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9948 invoked from network); 10 Sep 2013 02:33:35 -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; 10 Sep 2013 02:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlm-0008JV-QR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlm-00074y-MO for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:34 +0000 Date: Tue, 10 Sep 2013 02:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] SVM: streamline entry.S code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 110b2d6e8aa2a35d8f9d8efc3f3bfda3c49a3855 Author: Jan Beulich AuthorDate: Mon Sep 9 10:24:21 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:24:21 2013 +0200 SVM: streamline entry.S code - fix a bogus "test" with zero immediate - move stuff easily/better done in C into C code - re-arrange code paths so that no redundant GET_CURRENT() would remain on the fast paths - move long latency operations earlier - slightly defer disabling global interrupts on the VM entry path Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/svm/entry.S | 61 +++++++++++++++----------------------- xen/arch/x86/hvm/svm/svm.c | 2 + xen/include/asm-x86/asm_defns.h | 10 +++++- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 1969629..3ee4247 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -32,28 +32,34 @@ #define CLGI .byte 0x0F,0x01,0xDD ENTRY(svm_asm_do_resume) + GET_CURRENT(%rbx) +.Lsvm_do_resume: call svm_intr_assist mov %rsp,%rdi call nsvm_vcpu_switch ASSERT_NOT_IN_ATOMIC - GET_CURRENT(%rbx) - CLGI - mov VCPU_processor(%rbx),%eax - shl $IRQSTAT_shift,%eax lea irq_stat+IRQSTAT_softirq_pending(%rip),%rdx - cmpl $0,(%rdx,%rax,1) + xor %ecx,%ecx + shl $IRQSTAT_shift,%eax + CLGI + cmp %ecx,(%rdx,%rax,1) jne .Lsvm_process_softirqs - testb $0, VCPU_nsvm_hap_enabled(%rbx) -UNLIKELY_START(nz, nsvm_hap) - mov VCPU_nhvm_p2m(%rbx),%rax - test %rax,%rax + cmp %cl,VCPU_nsvm_hap_enabled(%rbx) +UNLIKELY_START(ne, nsvm_hap) + cmp %rcx,VCPU_nhvm_p2m(%rbx) sete %al - andb VCPU_nhvm_guestmode(%rbx),%al - jnz .Lsvm_nsvm_no_p2m -UNLIKELY_END(nsvm_hap) + test VCPU_nhvm_guestmode(%rbx),%al + UNLIKELY_DONE(z, nsvm_hap) + /* + * Someone shot down our nested p2m table; go round again + * and nsvm_vcpu_switch() will fix it for us. + */ + STGI + jmp .Lsvm_do_resume +__UNLIKELY_END(nsvm_hap) call svm_asid_handle_vmrun @@ -72,13 +78,12 @@ UNLIKELY_END(svm_trace) mov UREGS_eflags(%rsp),%rax mov %rax,VMCB_rflags(%rcx) - mov VCPU_svm_vmcb_pa(%rbx),%rax - pop %r15 pop %r14 pop %r13 pop %r12 pop %rbp + mov VCPU_svm_vmcb_pa(%rbx),%rax pop %rbx pop %r11 pop %r10 @@ -92,25 +97,26 @@ UNLIKELY_END(svm_trace) VMRUN + GET_CURRENT(%rax) push %rdi push %rsi push %rdx push %rcx + mov VCPU_svm_vmcb(%rax),%rcx push %rax push %r8 push %r9 push %r10 push %r11 push %rbx + mov %rax,%rbx push %rbp push %r12 push %r13 push %r14 push %r15 - GET_CURRENT(%rbx) movb $0,VCPU_svm_vmcb_in_sync(%rbx) - mov VCPU_svm_vmcb(%rbx),%rcx mov VMCB_rax(%rcx),%rax mov %rax,UREGS_rax(%rsp) mov VMCB_rip(%rcx),%rax @@ -120,33 +126,14 @@ UNLIKELY_END(svm_trace) mov VMCB_rflags(%rcx),%rax mov %rax,UREGS_eflags(%rsp) -#ifndef NDEBUG - mov $0xbeef,%ax - mov %ax,UREGS_error_code(%rsp) - mov %ax,UREGS_entry_vector(%rsp) - mov %ax,UREGS_saved_upcall_mask(%rsp) - mov %ax,UREGS_cs(%rsp) - mov %ax,UREGS_ds(%rsp) - mov %ax,UREGS_es(%rsp) - mov %ax,UREGS_fs(%rsp) - mov %ax,UREGS_gs(%rsp) - mov %ax,UREGS_ss(%rsp) -#endif - STGI .globl svm_stgi_label svm_stgi_label: mov %rsp,%rdi call svm_vmexit_handler - jmp svm_asm_do_resume + jmp .Lsvm_do_resume .Lsvm_process_softirqs: STGI call do_softirq - jmp svm_asm_do_resume - -.Lsvm_nsvm_no_p2m: - /* Someone shot down our nested p2m table; go round again - * and nsvm_vcpu_switch() will fix it for us. */ - STGI - jmp svm_asm_do_resume + jmp .Lsvm_do_resume diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index f74265a..695b53a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2069,6 +2069,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) vintr_t intr; bool_t vcpu_guestmode = 0; + hvm_invalidate_regs_fields(regs); + if ( paging_mode_hap(v->domain) ) v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = vmcb_get_cr3(vmcb); diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 8fc1a2c..25032d5 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -39,11 +39,17 @@ void ret_from_intr(void); .subsection 1; \ .Lunlikely.tag: -#define UNLIKELY_END(tag) \ - jmp .Llikely.tag; \ +#define UNLIKELY_DONE(cond, tag) \ + j##cond .Llikely.tag + +#define __UNLIKELY_END(tag) \ .subsection 0; \ .Llikely.tag: +#define UNLIKELY_END(tag) \ + UNLIKELY_DONE(mp, tag); \ + __UNLIKELY_END(tag) + #define STACK_CPUINFO_FIELD(field) (STACK_SIZE-CPUINFO_sizeof+CPUINFO_##field) #define GET_STACK_BASE(reg) \ movq $~(STACK_SIZE-1),reg; \ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:33:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDm1-00058R-N4; Tue, 10 Sep 2013 02:33:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlz-000588-Vd for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:48 +0000 Received: from [85.158.139.211:36164] by server-3.bemta-5.messagelabs.com id 57/6F-19273-B058E225; Tue, 10 Sep 2013 02:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1378780425!1580011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17004 invoked from network); 10 Sep 2013 02:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlx-0008Jc-1h for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlw-00075L-Ug for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:45 +0000 Date: Tue, 10 Sep 2013 02:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Introduce and use GLOBAL() in asm code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec98ab353db1bb665c3ec2f20007b294f2f51cd8 Author: Andrew Cooper AuthorDate: Mon Sep 9 10:25:40 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:25:40 2013 +0200 x86: Introduce and use GLOBAL() in asm code Also clean up some cases of misused/opencoded ENTRY() Signed-off-by: Andrew Cooper --- xen/arch/x86/acpi/wakeup_prot.S | 10 +++++----- xen/arch/x86/boot/edd.S | 10 ++++------ xen/arch/x86/boot/head.S | 9 +++------ xen/arch/x86/boot/mem.S | 9 ++++----- xen/arch/x86/boot/trampoline.S | 15 +++++---------- xen/arch/x86/boot/video.S | 23 +++++++++++++---------- xen/arch/x86/boot/wakeup.S | 7 ++++--- xen/arch/x86/boot/x86_64.S | 29 +++++++++++------------------ xen/arch/x86/efi/relocs-dummy.S | 5 ++--- xen/arch/x86/hvm/svm/entry.S | 3 +-- xen/arch/x86/x86_64/entry.S | 13 ++++--------- xen/include/asm-x86/config.h | 3 +++ 12 files changed, 59 insertions(+), 77 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a1e706e..def86d2 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -64,9 +64,8 @@ ENTRY(do_suspend_lowlevel) call acpi_enter_sleep_state jmp __ret_point - .align 16 - .globl __ret_point -__ret_point: + +ENTRY(__ret_point) /* mmu_cr4_features contains latest cr4 setting */ mov REF(mmu_cr4_features), GREG(ax) @@ -118,8 +117,9 @@ __ret_point: .data .align 16 - .globl saved_magic -saved_magic: .long 0x9abcdef0 + +GLOBAL(saved_magic) + .long 0x9abcdef0 saved_ss: .word 0 diff --git a/xen/arch/x86/boot/edd.S b/xen/arch/x86/boot/edd.S index 2c8df8c..5c80da6 100644 --- a/xen/arch/x86/boot/edd.S +++ b/xen/arch/x86/boot/edd.S @@ -145,13 +145,11 @@ edd_done: opt_edd: .byte 0 # edd=on/off/skipmbr -.globl boot_edd_info, boot_edd_info_nr -.globl boot_mbr_signature, boot_mbr_signature_nr -boot_edd_info_nr: +GLOBAL(boot_edd_info_nr) .byte 0 -boot_mbr_signature_nr: +GLOBAL(boot_mbr_signature_nr) .byte 0 -boot_mbr_signature: +GLOBAL(boot_mbr_signature) .fill EDD_MBR_SIG_MAX*8,1,0 -boot_edd_info: +GLOBAL(boot_edd_info) .fill 512,1,0 # big enough for a disc sector diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index d3cbddb..b12eefb 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -195,11 +195,9 @@ __start: reloc: #include "reloc.S" - .align 16 - .globl trampoline_start, trampoline_end -trampoline_start: +ENTRY(trampoline_start) #include "trampoline.S" -trampoline_end: +GLOBAL(trampoline_end) .text __high_start: @@ -212,8 +210,7 @@ __high_start: * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte * of physical memory. In any case the VGA hole should be mapped with type UC. */ - .globl l1_identmap -l1_identmap: +GLOBAL(l1_identmap) pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S index 64646205..820aea9 100644 --- a/xen/arch/x86/boot/mem.S +++ b/xen/arch/x86/boot/mem.S @@ -67,12 +67,11 @@ get_memory_map: ret - .globl e820map, e820nr, lowmem_kb, highmem_kb -e820map: +GLOBAL(e820map) .fill E820MAX*20,1,0 -e820nr: +GLOBAL(e820nr) .long 0 -lowmem_kb: +GLOBAL(lowmem_kb) .long 0 -highmem_kb: +GLOBAL(highmem_kb) .long 0 diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index f84ce2a..827f412 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -18,8 +18,7 @@ .long 111b - (off) - .; \ .popsection - .globl trampoline_realmode_entry -trampoline_realmode_entry: +GLOBAL(trampoline_realmode_entry) mov %cs,%ax mov %ax,%ds movb $0xA5,bootsym(trampoline_cpu_started) @@ -57,16 +56,13 @@ trampoline_gdt: .long trampoline_gdt + BOOT_PSEUDORM_DS + 2 - . .popsection - .globl cpuid_ext_features -cpuid_ext_features: +GLOBAL(cpuid_ext_features) .long 0 - .globl trampoline_xen_phys_start -trampoline_xen_phys_start: +GLOBAL(trampoline_xen_phys_start) .long 0 - .globl trampoline_cpu_started -trampoline_cpu_started: +GLOBAL(trampoline_cpu_started) .byte 0 .code32 @@ -206,8 +202,7 @@ trampoline_boot_cpu_entry: skip_realmode: .byte 0 - .globl kbd_shift_flags -kbd_shift_flags: +GLOBAL(kbd_shift_flags) .byte 0 rm_idt: .word 256*4-1, 0, 0 diff --git a/xen/arch/x86/boot/video.S b/xen/arch/x86/boot/video.S index ad6514e..b238bf3 100644 --- a/xen/arch/x86/boot/video.S +++ b/xen/arch/x86/boot/video.S @@ -993,14 +993,17 @@ force_size: .word 0 # Use this size instead of the one in BIOS vars vesa_size: .word 0,0,0 # width x depth x height - .globl boot_vid_info, boot_edid_info, boot_edid_caps /* If we don't run at all, assume basic video mode 3 at 80x25. */ -boot_vid_mode: .word VIDEO_80x25 -boot_vid_info: .byte 0, 0 /* orig_x, orig_y */ - .byte 3 /* text mode 3 */ - .byte 80, 25 /* 80x25 */ - .byte 1 /* isVGA */ - .word 16 /* 8x16 font */ - .fill 0x28,1,0 -boot_edid_info: .fill 128,1,0x13 -boot_edid_caps: .word 0x1313 +GLOBAL(boot_vid_mode) + .word VIDEO_80x25 +GLOBAL(boot_vid_info) + .byte 0, 0 /* orig_x, orig_y */ + .byte 3 /* text mode 3 */ + .byte 80, 25 /* 80x25 */ + .byte 1 /* isVGA */ + .word 16 /* 8x16 font */ + .fill 0x28,1,0 +GLOBAL(boot_edid_info) + .fill 128,1,0x13 +GLOBAL(boot_edid_caps) + .word 0x1313 diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S index b1d4787..a3883c1 100644 --- a/xen/arch/x86/boot/wakeup.S +++ b/xen/arch/x86/boot/wakeup.S @@ -98,9 +98,10 @@ bogus_real_magic: .align 4 real_magic: .long 0x12345678 - .globl video_mode, video_flags -video_mode: .long 0 -video_flags: .long 0 +GLOBAL(video_mode) + .long 0 +GLOBAL(video_flags) + .long 0 trampoline_seg: .word 0 .pushsection .trampoline_seg, "a" .long trampoline_seg - . diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index ed3888d..8f92402 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -84,23 +84,21 @@ multiboot_ptr: .long 0 .word 0 - .globl gdt_descr -gdt_descr: +GLOBAL(gdt_descr) .word LAST_RESERVED_GDT_BYTE .quad boot_cpu_gdt_table - FIRST_RESERVED_GDT_BYTE .word 0,0,0 - .globl idt_descr -idt_descr: +GLOBAL(idt_descr) .word 256*16-1 .quad idt_table -ENTRY(stack_start) +GLOBAL(stack_start) .quad cpu0_stack .section .data.page_aligned, "aw", @progbits .align PAGE_SIZE, 0 -ENTRY(boot_cpu_gdt_table) +GLOBAL(boot_cpu_gdt_table) .quad 0x0000000000000000 /* unused */ .quad 0x00af9a000000ffff /* 0xe008 ring 0 code, 64-bit mode */ .quad 0x00cf92000000ffff /* 0xe010 ring 0 data */ @@ -115,7 +113,7 @@ ENTRY(boot_cpu_gdt_table) .align PAGE_SIZE, 0 /* NB. Even rings != 0 get access to the full 4Gb, as only the */ /* (compatibility) machine->physical mapping table lives there. */ -ENTRY(boot_cpu_compat_gdt_table) +GLOBAL(boot_cpu_compat_gdt_table) .quad 0x0000000000000000 /* unused */ .quad 0x00af9a000000ffff /* 0xe008 ring 0 code, 64-bit mode */ .quad 0x00cf92000000ffff /* 0xe010 ring 0 data */ @@ -128,12 +126,10 @@ ENTRY(boot_cpu_compat_gdt_table) .quad 0x0000910000000000 /* per-CPU entry (limit == cpu) */ .align PAGE_SIZE, 0 - .globl __page_tables_start, __page_tables_end -__page_tables_start: +GLOBAL(__page_tables_start) /* Mapping of first 16 megabytes of memory. */ - .globl l2_identmap -l2_identmap: +GLOBAL(l2_identmap) .quad sym_phys(l1_identmap) + __PAGE_HYPERVISOR pfn = 0 .rept 7 @@ -143,8 +139,7 @@ l2_identmap: .fill 4 * L2_PAGETABLE_ENTRIES - 8, 8, 0 .size l2_identmap, . - l2_identmap - .globl l2_xenmap -l2_xenmap: +GLOBAL(l2_xenmap) idx = 0 .rept 8 .quad sym_phys(__image_base__) + (idx << L2_PAGETABLE_SHIFT) + (PAGE_HYPERVISOR | _PAGE_PSE) @@ -165,8 +160,7 @@ l2_fixmap: .endr .size l2_fixmap, . - l2_fixmap - .globl l3_identmap -l3_identmap: +GLOBAL(l3_identmap) idx = 0 .rept 4 .quad sym_phys(l2_identmap) + (idx << PAGE_SHIFT) + __PAGE_HYPERVISOR @@ -190,8 +184,7 @@ l3_xenmap: .size l3_xenmap, . - l3_xenmap /* Top-level master (and idle-domain) page directory. */ - .globl idle_pg_table -idle_pg_table: +GLOBAL(idle_pg_table) .quad sym_phys(l3_bootmap) + __PAGE_HYPERVISOR idx = 1 .rept L4_PAGETABLE_ENTRIES - 1 @@ -206,4 +199,4 @@ idle_pg_table: .endr .size idle_pg_table, . - idle_pg_table -__page_tables_end: +GLOBAL(__page_tables_end) diff --git a/xen/arch/x86/efi/relocs-dummy.S b/xen/arch/x86/efi/relocs-dummy.S index 36c3006..b14c499 100644 --- a/xen/arch/x86/efi/relocs-dummy.S +++ b/xen/arch/x86/efi/relocs-dummy.S @@ -2,11 +2,10 @@ .section .reloc, "a", @progbits .balign 4 - .globl __base_relocs_start, __base_relocs_end -__base_relocs_start: +GLOBAL(__base_relocs_start) .long 0 .long 8 -__base_relocs_end: +GLOBAL(__base_relocs_end) .globl VIRT_START, ALT_START .equ VIRT_START, XEN_VIRT_START diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 3ee4247..aeddf64 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -127,8 +127,7 @@ UNLIKELY_END(svm_trace) mov %rax,UREGS_eflags(%rsp) STGI -.globl svm_stgi_label -svm_stgi_label: +GLOBAL(svm_stgi_label) mov %rsp,%rdi call svm_vmexit_handler jmp .Lsvm_do_resume diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 5beeccb..f64e871 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -272,8 +272,7 @@ ENTRY(sysenter_entry) pushq $FLAT_USER_SS pushq $0 pushfq - .globl sysenter_eflags_saved -sysenter_eflags_saved: +GLOBAL(sysenter_eflags_saved) pushq $3 /* ring 3 null cs */ pushq $0 /* null rip */ pushq $0 @@ -479,8 +478,7 @@ ENTRY(ret_from_intr) ENTRY(page_fault) movl $TRAP_page_fault,4(%rsp) /* No special register assumptions. */ - .globl handle_exception -handle_exception: +GLOBAL(handle_exception) SAVE_ALL handle_exception_saved: testb $X86_EFLAGS_IF>>8,UREGS_eflags+1(%rsp) @@ -689,11 +687,8 @@ ENTRY(enable_nmis) 1: retq -/* No op trap handler. Required for kexec crash path. This is not - * declared with the ENTRY() macro to avoid wasted alignment space. - */ -.globl trap_nop -trap_nop: +/* No op trap handler. Required for kexec crash path. */ +GLOBAL(trap_nop) iretq diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index f387cd6..cc42a88 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -80,6 +80,9 @@ .globl name; \ ALIGN; \ name: +#define GLOBAL(name) \ + .globl name; \ + name: #endif #define NR_hypercalls 64 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 02:33:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDm1-00058R-N4; Tue, 10 Sep 2013 02:33:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlz-000588-Vd for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:48 +0000 Received: from [85.158.139.211:36164] by server-3.bemta-5.messagelabs.com id 57/6F-19273-B058E225; Tue, 10 Sep 2013 02:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1378780425!1580011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17004 invoked from network); 10 Sep 2013 02:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDlx-0008Jc-1h for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDlw-00075L-Ug for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:45 +0000 Date: Tue, 10 Sep 2013 02:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Introduce and use GLOBAL() in asm code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec98ab353db1bb665c3ec2f20007b294f2f51cd8 Author: Andrew Cooper AuthorDate: Mon Sep 9 10:25:40 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:25:40 2013 +0200 x86: Introduce and use GLOBAL() in asm code Also clean up some cases of misused/opencoded ENTRY() Signed-off-by: Andrew Cooper --- xen/arch/x86/acpi/wakeup_prot.S | 10 +++++----- xen/arch/x86/boot/edd.S | 10 ++++------ xen/arch/x86/boot/head.S | 9 +++------ xen/arch/x86/boot/mem.S | 9 ++++----- xen/arch/x86/boot/trampoline.S | 15 +++++---------- xen/arch/x86/boot/video.S | 23 +++++++++++++---------- xen/arch/x86/boot/wakeup.S | 7 ++++--- xen/arch/x86/boot/x86_64.S | 29 +++++++++++------------------ xen/arch/x86/efi/relocs-dummy.S | 5 ++--- xen/arch/x86/hvm/svm/entry.S | 3 +-- xen/arch/x86/x86_64/entry.S | 13 ++++--------- xen/include/asm-x86/config.h | 3 +++ 12 files changed, 59 insertions(+), 77 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a1e706e..def86d2 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -64,9 +64,8 @@ ENTRY(do_suspend_lowlevel) call acpi_enter_sleep_state jmp __ret_point - .align 16 - .globl __ret_point -__ret_point: + +ENTRY(__ret_point) /* mmu_cr4_features contains latest cr4 setting */ mov REF(mmu_cr4_features), GREG(ax) @@ -118,8 +117,9 @@ __ret_point: .data .align 16 - .globl saved_magic -saved_magic: .long 0x9abcdef0 + +GLOBAL(saved_magic) + .long 0x9abcdef0 saved_ss: .word 0 diff --git a/xen/arch/x86/boot/edd.S b/xen/arch/x86/boot/edd.S index 2c8df8c..5c80da6 100644 --- a/xen/arch/x86/boot/edd.S +++ b/xen/arch/x86/boot/edd.S @@ -145,13 +145,11 @@ edd_done: opt_edd: .byte 0 # edd=on/off/skipmbr -.globl boot_edd_info, boot_edd_info_nr -.globl boot_mbr_signature, boot_mbr_signature_nr -boot_edd_info_nr: +GLOBAL(boot_edd_info_nr) .byte 0 -boot_mbr_signature_nr: +GLOBAL(boot_mbr_signature_nr) .byte 0 -boot_mbr_signature: +GLOBAL(boot_mbr_signature) .fill EDD_MBR_SIG_MAX*8,1,0 -boot_edd_info: +GLOBAL(boot_edd_info) .fill 512,1,0 # big enough for a disc sector diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index d3cbddb..b12eefb 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -195,11 +195,9 @@ __start: reloc: #include "reloc.S" - .align 16 - .globl trampoline_start, trampoline_end -trampoline_start: +ENTRY(trampoline_start) #include "trampoline.S" -trampoline_end: +GLOBAL(trampoline_end) .text __high_start: @@ -212,8 +210,7 @@ __high_start: * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte * of physical memory. In any case the VGA hole should be mapped with type UC. */ - .globl l1_identmap -l1_identmap: +GLOBAL(l1_identmap) pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S index 64646205..820aea9 100644 --- a/xen/arch/x86/boot/mem.S +++ b/xen/arch/x86/boot/mem.S @@ -67,12 +67,11 @@ get_memory_map: ret - .globl e820map, e820nr, lowmem_kb, highmem_kb -e820map: +GLOBAL(e820map) .fill E820MAX*20,1,0 -e820nr: +GLOBAL(e820nr) .long 0 -lowmem_kb: +GLOBAL(lowmem_kb) .long 0 -highmem_kb: +GLOBAL(highmem_kb) .long 0 diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index f84ce2a..827f412 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -18,8 +18,7 @@ .long 111b - (off) - .; \ .popsection - .globl trampoline_realmode_entry -trampoline_realmode_entry: +GLOBAL(trampoline_realmode_entry) mov %cs,%ax mov %ax,%ds movb $0xA5,bootsym(trampoline_cpu_started) @@ -57,16 +56,13 @@ trampoline_gdt: .long trampoline_gdt + BOOT_PSEUDORM_DS + 2 - . .popsection - .globl cpuid_ext_features -cpuid_ext_features: +GLOBAL(cpuid_ext_features) .long 0 - .globl trampoline_xen_phys_start -trampoline_xen_phys_start: +GLOBAL(trampoline_xen_phys_start) .long 0 - .globl trampoline_cpu_started -trampoline_cpu_started: +GLOBAL(trampoline_cpu_started) .byte 0 .code32 @@ -206,8 +202,7 @@ trampoline_boot_cpu_entry: skip_realmode: .byte 0 - .globl kbd_shift_flags -kbd_shift_flags: +GLOBAL(kbd_shift_flags) .byte 0 rm_idt: .word 256*4-1, 0, 0 diff --git a/xen/arch/x86/boot/video.S b/xen/arch/x86/boot/video.S index ad6514e..b238bf3 100644 --- a/xen/arch/x86/boot/video.S +++ b/xen/arch/x86/boot/video.S @@ -993,14 +993,17 @@ force_size: .word 0 # Use this size instead of the one in BIOS vars vesa_size: .word 0,0,0 # width x depth x height - .globl boot_vid_info, boot_edid_info, boot_edid_caps /* If we don't run at all, assume basic video mode 3 at 80x25. */ -boot_vid_mode: .word VIDEO_80x25 -boot_vid_info: .byte 0, 0 /* orig_x, orig_y */ - .byte 3 /* text mode 3 */ - .byte 80, 25 /* 80x25 */ - .byte 1 /* isVGA */ - .word 16 /* 8x16 font */ - .fill 0x28,1,0 -boot_edid_info: .fill 128,1,0x13 -boot_edid_caps: .word 0x1313 +GLOBAL(boot_vid_mode) + .word VIDEO_80x25 +GLOBAL(boot_vid_info) + .byte 0, 0 /* orig_x, orig_y */ + .byte 3 /* text mode 3 */ + .byte 80, 25 /* 80x25 */ + .byte 1 /* isVGA */ + .word 16 /* 8x16 font */ + .fill 0x28,1,0 +GLOBAL(boot_edid_info) + .fill 128,1,0x13 +GLOBAL(boot_edid_caps) + .word 0x1313 diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S index b1d4787..a3883c1 100644 --- a/xen/arch/x86/boot/wakeup.S +++ b/xen/arch/x86/boot/wakeup.S @@ -98,9 +98,10 @@ bogus_real_magic: .align 4 real_magic: .long 0x12345678 - .globl video_mode, video_flags -video_mode: .long 0 -video_flags: .long 0 +GLOBAL(video_mode) + .long 0 +GLOBAL(video_flags) + .long 0 trampoline_seg: .word 0 .pushsection .trampoline_seg, "a" .long trampoline_seg - . diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index ed3888d..8f92402 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -84,23 +84,21 @@ multiboot_ptr: .long 0 .word 0 - .globl gdt_descr -gdt_descr: +GLOBAL(gdt_descr) .word LAST_RESERVED_GDT_BYTE .quad boot_cpu_gdt_table - FIRST_RESERVED_GDT_BYTE .word 0,0,0 - .globl idt_descr -idt_descr: +GLOBAL(idt_descr) .word 256*16-1 .quad idt_table -ENTRY(stack_start) +GLOBAL(stack_start) .quad cpu0_stack .section .data.page_aligned, "aw", @progbits .align PAGE_SIZE, 0 -ENTRY(boot_cpu_gdt_table) +GLOBAL(boot_cpu_gdt_table) .quad 0x0000000000000000 /* unused */ .quad 0x00af9a000000ffff /* 0xe008 ring 0 code, 64-bit mode */ .quad 0x00cf92000000ffff /* 0xe010 ring 0 data */ @@ -115,7 +113,7 @@ ENTRY(boot_cpu_gdt_table) .align PAGE_SIZE, 0 /* NB. Even rings != 0 get access to the full 4Gb, as only the */ /* (compatibility) machine->physical mapping table lives there. */ -ENTRY(boot_cpu_compat_gdt_table) +GLOBAL(boot_cpu_compat_gdt_table) .quad 0x0000000000000000 /* unused */ .quad 0x00af9a000000ffff /* 0xe008 ring 0 code, 64-bit mode */ .quad 0x00cf92000000ffff /* 0xe010 ring 0 data */ @@ -128,12 +126,10 @@ ENTRY(boot_cpu_compat_gdt_table) .quad 0x0000910000000000 /* per-CPU entry (limit == cpu) */ .align PAGE_SIZE, 0 - .globl __page_tables_start, __page_tables_end -__page_tables_start: +GLOBAL(__page_tables_start) /* Mapping of first 16 megabytes of memory. */ - .globl l2_identmap -l2_identmap: +GLOBAL(l2_identmap) .quad sym_phys(l1_identmap) + __PAGE_HYPERVISOR pfn = 0 .rept 7 @@ -143,8 +139,7 @@ l2_identmap: .fill 4 * L2_PAGETABLE_ENTRIES - 8, 8, 0 .size l2_identmap, . - l2_identmap - .globl l2_xenmap -l2_xenmap: +GLOBAL(l2_xenmap) idx = 0 .rept 8 .quad sym_phys(__image_base__) + (idx << L2_PAGETABLE_SHIFT) + (PAGE_HYPERVISOR | _PAGE_PSE) @@ -165,8 +160,7 @@ l2_fixmap: .endr .size l2_fixmap, . - l2_fixmap - .globl l3_identmap -l3_identmap: +GLOBAL(l3_identmap) idx = 0 .rept 4 .quad sym_phys(l2_identmap) + (idx << PAGE_SHIFT) + __PAGE_HYPERVISOR @@ -190,8 +184,7 @@ l3_xenmap: .size l3_xenmap, . - l3_xenmap /* Top-level master (and idle-domain) page directory. */ - .globl idle_pg_table -idle_pg_table: +GLOBAL(idle_pg_table) .quad sym_phys(l3_bootmap) + __PAGE_HYPERVISOR idx = 1 .rept L4_PAGETABLE_ENTRIES - 1 @@ -206,4 +199,4 @@ idle_pg_table: .endr .size idle_pg_table, . - idle_pg_table -__page_tables_end: +GLOBAL(__page_tables_end) diff --git a/xen/arch/x86/efi/relocs-dummy.S b/xen/arch/x86/efi/relocs-dummy.S index 36c3006..b14c499 100644 --- a/xen/arch/x86/efi/relocs-dummy.S +++ b/xen/arch/x86/efi/relocs-dummy.S @@ -2,11 +2,10 @@ .section .reloc, "a", @progbits .balign 4 - .globl __base_relocs_start, __base_relocs_end -__base_relocs_start: +GLOBAL(__base_relocs_start) .long 0 .long 8 -__base_relocs_end: +GLOBAL(__base_relocs_end) .globl VIRT_START, ALT_START .equ VIRT_START, XEN_VIRT_START diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index 3ee4247..aeddf64 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -127,8 +127,7 @@ UNLIKELY_END(svm_trace) mov %rax,UREGS_eflags(%rsp) STGI -.globl svm_stgi_label -svm_stgi_label: +GLOBAL(svm_stgi_label) mov %rsp,%rdi call svm_vmexit_handler jmp .Lsvm_do_resume diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 5beeccb..f64e871 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -272,8 +272,7 @@ ENTRY(sysenter_entry) pushq $FLAT_USER_SS pushq $0 pushfq - .globl sysenter_eflags_saved -sysenter_eflags_saved: +GLOBAL(sysenter_eflags_saved) pushq $3 /* ring 3 null cs */ pushq $0 /* null rip */ pushq $0 @@ -479,8 +478,7 @@ ENTRY(ret_from_intr) ENTRY(page_fault) movl $TRAP_page_fault,4(%rsp) /* No special register assumptions. */ - .globl handle_exception -handle_exception: +GLOBAL(handle_exception) SAVE_ALL handle_exception_saved: testb $X86_EFLAGS_IF>>8,UREGS_eflags+1(%rsp) @@ -689,11 +687,8 @@ ENTRY(enable_nmis) 1: retq -/* No op trap handler. Required for kexec crash path. This is not - * declared with the ENTRY() macro to avoid wasted alignment space. - */ -.globl trap_nop -trap_nop: +/* No op trap handler. Required for kexec crash path. */ +GLOBAL(trap_nop) iretq diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index f387cd6..cc42a88 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -80,6 +80,9 @@ .globl name; \ ALIGN; \ name: +#define GLOBAL(name) \ + .globl name; \ + name: #endif #define NR_hypercalls 64 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 02:34:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDmB-0005AS-QG; Tue, 10 Sep 2013 02:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmA-0005A9-KI for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:58 +0000 Received: from [85.158.137.68:24286] by server-8.bemta-3.messagelabs.com id D8/0D-28652-5158E225; Tue, 10 Sep 2013 02:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378780435!1099141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20375 invoked from network); 10 Sep 2013 02:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDm7-0008Jk-9v for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDm7-00076Q-5W for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:55 +0000 Date: Tue, 10 Sep 2013 02:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a350f3f43bcfac9c1591e28d8e43c505fcb172a5 Author: Jan Beulich AuthorDate: Mon Sep 9 10:40:11 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:40:11 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich --- xen/arch/x86/efi/boot.c | 104 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 9718bd7..055ac13 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -26,6 +26,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + #define SHIM_LOCK_PROTOCOL_GUID \ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } @@ -1434,7 +1437,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1477,6 +1480,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1520,6 +1524,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1527,6 +1532,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1573,6 +1585,8 @@ void __init efi_init_memory(void) !(smfn & pfn_hole_mask) && !((smfn ^ (emfn - 1)) & ~pfn_pdx_bottom_mask) ) { + if ( (unsigned long)mfn_to_virt(emfn - 1) >= HYPERVISOR_VIRT_END ) + prot &= ~_PAGE_GLOBAL; if ( map_pages_to_xen((unsigned long)mfn_to_virt(smfn), smfn, emfn - smfn, prot) == 0 ) desc->VirtualStart = @@ -1581,15 +1595,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1600,20 +1628,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:34:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02: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 1VJDmB-0005AS-QG; Tue, 10 Sep 2013 02:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmA-0005A9-KI for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:58 +0000 Received: from [85.158.137.68:24286] by server-8.bemta-3.messagelabs.com id D8/0D-28652-5158E225; Tue, 10 Sep 2013 02:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378780435!1099141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20375 invoked from network); 10 Sep 2013 02:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDm7-0008Jk-9v for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDm7-00076Q-5W for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:33:55 +0000 Date: Tue, 10 Sep 2013 02:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a350f3f43bcfac9c1591e28d8e43c505fcb172a5 Author: Jan Beulich AuthorDate: Mon Sep 9 10:40:11 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:40:11 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich --- xen/arch/x86/efi/boot.c | 104 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 9718bd7..055ac13 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -26,6 +26,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + #define SHIM_LOCK_PROTOCOL_GUID \ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } @@ -1434,7 +1437,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1477,6 +1480,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1520,6 +1524,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1527,6 +1532,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1573,6 +1585,8 @@ void __init efi_init_memory(void) !(smfn & pfn_hole_mask) && !((smfn ^ (emfn - 1)) & ~pfn_pdx_bottom_mask) ) { + if ( (unsigned long)mfn_to_virt(emfn - 1) >= HYPERVISOR_VIRT_END ) + prot &= ~_PAGE_GLOBAL; if ( map_pages_to_xen((unsigned long)mfn_to_virt(smfn), smfn, emfn - smfn, prot) == 0 ) desc->VirtualStart = @@ -1581,15 +1595,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1600,20 +1628,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:34:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02:34: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 1VJDmL-0005Cg-Ve; Tue, 10 Sep 2013 02:34:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmK-0005CC-BM for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:08 +0000 Received: from [85.158.137.68:21015] by server-2.bemta-3.messagelabs.com id 7F/D2-14467-F158E225; Tue, 10 Sep 2013 02:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378780445!1095082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14500 invoked from network); 10 Sep 2013 02:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmH-0008KM-FD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDmH-00076w-DR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:05 +0000 Date: Tue, 10 Sep 2013 02:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a35137373aa9042424565e5ee76dc0a3bb7642ae Author: Joby Poriyath AuthorDate: Mon Sep 9 10:43:11 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:43:11 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 0d5ef1b..4826b4a 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -187,6 +187,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -247,13 +260,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -283,22 +299,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 02:34:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 02:34: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 1VJDmL-0005Cg-Ve; Tue, 10 Sep 2013 02:34:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmK-0005CC-BM for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:08 +0000 Received: from [85.158.137.68:21015] by server-2.bemta-3.messagelabs.com id 7F/D2-14467-F158E225; Tue, 10 Sep 2013 02:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378780445!1095082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14500 invoked from network); 10 Sep 2013 02:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 02:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJDmH-0008KM-FD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJDmH-00076w-DR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 02:34:05 +0000 Date: Tue, 10 Sep 2013 02:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a35137373aa9042424565e5ee76dc0a3bb7642ae Author: Joby Poriyath AuthorDate: Mon Sep 9 10:43:11 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 10:43:11 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 0d5ef1b..4826b4a 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -187,6 +187,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -247,13 +260,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -283,22 +299,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 03:22: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 1VJEWk-0005yH-Li; Tue, 10 Sep 2013 03:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJEWj-0005yC-Cb for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:05 +0000 Received: from [193.109.254.147:32662] by server-16.bemta-14.messagelabs.com id 88/7C-06264-C509E225; Tue, 10 Sep 2013 03:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1378783323!1732171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19711 invoked from network); 10 Sep 2013 03:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 03:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJEWg-0000NB-T6 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJEWg-0008M3-9k for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:02 +0000 Date: Tue, 10 Sep 2013 03:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] update Xen version to 4.1.6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50a7df0e4eaadccba39813fde3523c355474382a Author: Jan Beulich AuthorDate: Mon Sep 9 14:29:24 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:29:24 2013 +0200 update Xen version to 4.1.6 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 0d3ec61..c5b6566 100644 --- a/Config.mk +++ b/Config.mk @@ -180,7 +180,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6-rc2 +QEMU_TAG ?= xen-4.1.6 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index 81c1e20..6d31962 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .6-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 03:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 03:22: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 1VJEWk-0005yH-Li; Tue, 10 Sep 2013 03:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJEWj-0005yC-Cb for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:05 +0000 Received: from [193.109.254.147:32662] by server-16.bemta-14.messagelabs.com id 88/7C-06264-C509E225; Tue, 10 Sep 2013 03:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1378783323!1732171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19711 invoked from network); 10 Sep 2013 03:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 03:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJEWg-0000NB-T6 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJEWg-0008M3-9k for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 03:22:02 +0000 Date: Tue, 10 Sep 2013 03:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] update Xen version to 4.1.6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50a7df0e4eaadccba39813fde3523c355474382a Author: Jan Beulich AuthorDate: Mon Sep 9 14:29:24 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:29:24 2013 +0200 update Xen version to 4.1.6 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 0d3ec61..c5b6566 100644 --- a/Config.mk +++ b/Config.mk @@ -180,7 +180,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6-rc2 +QEMU_TAG ?= xen-4.1.6 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index 81c1e20..6d31962 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .6-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 05:11:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 05:11: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 1VJGEF-0007w6-Hb; Tue, 10 Sep 2013 05:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJGEE-0007w1-8G for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:06 +0000 Received: from [85.158.137.68:52008] by server-12.bemta-3.messagelabs.com id 38/BC-11891-9E9AE225; Tue, 10 Sep 2013 05:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378789863!1111788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4831 invoked from network); 10 Sep 2013 05:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 05:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJGEB-0001hr-0B for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJGEA-0002wT-DM for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:02 +0000 Date: Tue, 10 Sep 2013 05:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65c2d4191c4a8e2e62949f09d92f4fa5008571f6 Author: Jan Beulich AuthorDate: Mon Sep 9 14:27:41 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:27:41 2013 +0200 update Xen version to 4.2.3 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 11861f4..815eed7 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 ?= qemu-xen-4.2.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.3 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.3-rc2 +QEMU_TAG ?= xen-4.2.3 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index ed26482..d82a2eb 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .3-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 05:11:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 05:11: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 1VJGEF-0007w6-Hb; Tue, 10 Sep 2013 05:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJGEE-0007w1-8G for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:06 +0000 Received: from [85.158.137.68:52008] by server-12.bemta-3.messagelabs.com id 38/BC-11891-9E9AE225; Tue, 10 Sep 2013 05:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378789863!1111788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4831 invoked from network); 10 Sep 2013 05:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 05:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJGEB-0001hr-0B for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJGEA-0002wT-DM for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 05:11:02 +0000 Date: Tue, 10 Sep 2013 05:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65c2d4191c4a8e2e62949f09d92f4fa5008571f6 Author: Jan Beulich AuthorDate: Mon Sep 9 14:27:41 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:27:41 2013 +0200 update Xen version to 4.2.3 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 11861f4..815eed7 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 ?= qemu-xen-4.2.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.3 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.3-rc2 +QEMU_TAG ?= xen-4.2.3 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index ed26482..d82a2eb 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .3-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKJn-0007c0-Fu; Tue, 10 Sep 2013 09:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJl-0007bi-M1 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:05 +0000 Received: from [85.158.137.68:38983] by server-8.bemta-3.messagelabs.com id B7/A7-28652-057EE225; Tue, 10 Sep 2013 09:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378805583!1181765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22823 invoked from network); 10 Sep 2013 09:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJj-0004sK-08 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKJi-0001rU-SS for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:02 +0000 Date: Tue, 10 Sep 2013 09:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fbf3208d9c1a568aeeb61d9f4fbca03b1cfa1f8 Author: Jan Beulich AuthorDate: Mon Sep 9 14:34:12 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:34:12 2013 +0200 xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() Not doing this was found to cause problems with sequences of allocation (multi-page), freeing, and then again allocation of the same page upon boot when interrupts are still disabled (causing the owner field to be non-zero, thus making the allocator attempt a TLB flush and, in its processing, triggering an assertion). Reported-by: Tomasz Wroblewski Signed-off-by: Jan Beulich Tested-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/common/xmalloc_tlsf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index f19fb85..d3bdfa7 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -629,6 +629,7 @@ void xfree(void *p) unsigned int i, order = get_order_from_pages(size); BUG_ON((unsigned long)p & ((PAGE_SIZE << order) - 1)); + PFN_ORDER(virt_to_page(p)) = 0; for ( i = 0; ; ++i ) { if ( !(size & (1 << i)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKJn-0007c0-Fu; Tue, 10 Sep 2013 09:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJl-0007bi-M1 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:05 +0000 Received: from [85.158.137.68:38983] by server-8.bemta-3.messagelabs.com id B7/A7-28652-057EE225; Tue, 10 Sep 2013 09:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378805583!1181765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22823 invoked from network); 10 Sep 2013 09:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJj-0004sK-08 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKJi-0001rU-SS for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:02 +0000 Date: Tue, 10 Sep 2013 09:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0fbf3208d9c1a568aeeb61d9f4fbca03b1cfa1f8 Author: Jan Beulich AuthorDate: Mon Sep 9 14:34:12 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:34:12 2013 +0200 xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() Not doing this was found to cause problems with sequences of allocation (multi-page), freeing, and then again allocation of the same page upon boot when interrupts are still disabled (causing the owner field to be non-zero, thus making the allocator attempt a TLB flush and, in its processing, triggering an assertion). Reported-by: Tomasz Wroblewski Signed-off-by: Jan Beulich Tested-by: Tomasz Wroblewski Acked-by: Keir Fraser --- xen/common/xmalloc_tlsf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index f19fb85..d3bdfa7 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -629,6 +629,7 @@ void xfree(void *p) unsigned int i, order = get_order_from_pages(size); BUG_ON((unsigned long)p & ((PAGE_SIZE << order) - 1)); + PFN_ORDER(virt_to_page(p)) = 0; for ( i = 0; ; ++i ) { if ( !(size & (1 << i)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKK8-0007e0-KD; Tue, 10 Sep 2013 09: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 1VJKK6-0007dj-Sg for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:27 +0000 Received: from [85.158.143.35:8450] by server-2.bemta-4.messagelabs.com id C1/A4-26052-667EE225; Tue, 10 Sep 2013 09:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1378805603!2616396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23811 invoked from network); 10 Sep 2013 09:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKK3-0004sa-EH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKK3-0001sn-BA for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:23 +0000 Date: Tue, 10 Sep 2013 09:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cc1344447a0458df5d222960f2adf1b65084fa8 Author: Jan Beulich AuthorDate: Mon Sep 9 14:36:54 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:36:54 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 874742c..f7b0308 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -618,7 +618,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1351,9 +1351,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c2a04c4..e75918a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1047,11 +1047,8 @@ long arch_do_domctl( struct xen_domctl_vcpuextstate *evc; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1062,15 +1059,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1093,7 +1091,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1101,13 +1099,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1128,20 +1127,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1fcaed0..ebf1838 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -906,14 +906,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -957,7 +955,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -969,20 +969,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -990,11 +990,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1006,47 +1006,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1060,7 +1087,8 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2767,7 +2795,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 0b40b54..58d38b1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -944,8 +944,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 1230a52..7649274 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -137,13 +138,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -232,7 +235,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -262,7 +265,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9db42c82..72e8566 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -817,7 +817,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -842,7 +842,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 7e459d0..c6b8dcc 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -206,13 +206,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -238,8 +238,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->fpu_sse.mxcsr = MXCSR_DEFAULT; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -257,7 +257,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -277,7 +281,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -286,14 +289,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -304,6 +307,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d79464d..909f449 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -456,9 +456,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 083f813..3376418 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -368,7 +368,7 @@ static inline int hvm_event_pending(struct vcpu *v) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 9bea08b..5617963 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -34,7 +34,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -77,11 +76,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKK8-0007e0-KD; Tue, 10 Sep 2013 09: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 1VJKK6-0007dj-Sg for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:27 +0000 Received: from [85.158.143.35:8450] by server-2.bemta-4.messagelabs.com id C1/A4-26052-667EE225; Tue, 10 Sep 2013 09:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1378805603!2616396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23811 invoked from network); 10 Sep 2013 09:33:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKK3-0004sa-EH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKK3-0001sn-BA for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:23 +0000 Date: Tue, 10 Sep 2013 09:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cc1344447a0458df5d222960f2adf1b65084fa8 Author: Jan Beulich AuthorDate: Mon Sep 9 14:36:54 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:36:54 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 874742c..f7b0308 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -618,7 +618,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1351,9 +1351,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c2a04c4..e75918a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1047,11 +1047,8 @@ long arch_do_domctl( struct xen_domctl_vcpuextstate *evc; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1062,15 +1059,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1093,7 +1091,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1101,13 +1099,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1128,20 +1127,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1fcaed0..ebf1838 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -906,14 +906,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -957,7 +955,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -969,20 +969,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -990,11 +990,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1006,47 +1006,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1060,7 +1087,8 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2767,7 +2795,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 0b40b54..58d38b1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -944,8 +944,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 1230a52..7649274 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -137,13 +138,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -232,7 +235,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -262,7 +265,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9db42c82..72e8566 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -817,7 +817,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -842,7 +842,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 7e459d0..c6b8dcc 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -206,13 +206,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -238,8 +238,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->fpu_sse.mxcsr = MXCSR_DEFAULT; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -257,7 +257,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -277,7 +281,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -286,14 +289,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -304,6 +307,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d79464d..909f449 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -456,9 +456,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 083f813..3376418 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -368,7 +368,7 @@ static inline int hvm_event_pending(struct vcpu *v) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 9bea08b..5617963 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -34,7 +34,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -77,11 +76,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:33: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 1VJKKC-0007ea-PT; Tue, 10 Sep 2013 09:33:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKB-0007eQ-EW for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:31 +0000 Received: from [193.109.254.147:59325] by server-5.bemta-14.messagelabs.com id 32/A3-04931-A67EE225; Tue, 10 Sep 2013 09:33:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378805608!1777340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5522 invoked from network); 10 Sep 2013 09:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJt-0004sN-5U for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKJt-0001rs-2v for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:13 +0000 Date: Tue, 10 Sep 2013 09:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: fix tool chain capabilities detection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ad580d8685190585ba27e996be7e1a730d2a317 Author: Jan Beulich AuthorDate: Mon Sep 9 14:35:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:35:29 2013 +0200 EFI: fix tool chain capabilities detection Commit f5a54e92 ("xen: move some arch CFLAGS into the common Rules.mk") transformed CFLAGS assignments to CFLAGS-y ones, which collides with the was xen/arch/x86/efi/Makefile determines whether the tol chain is usable for an EFI build. Transform the block back to using CFLAGS. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/Rules.mk | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index bbfc1ac..736882a 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o -CFLAGS-y += -fno-builtin -fno-common -CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith -CFLAGS-y += -pipe -CFLAGS-y += -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +CFLAGS += -fno-builtin -fno-common +CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith +CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h # Solaris puts stdarg.h &c in the system include directory. ifneq ($(XEN_OS),SunOS) -CFLAGS-y += -nostdinc -iwithprefix include +CFLAGS += -nostdinc -iwithprefix include endif CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:33: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 1VJKKC-0007ea-PT; Tue, 10 Sep 2013 09:33:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKB-0007eQ-EW for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:31 +0000 Received: from [193.109.254.147:59325] by server-5.bemta-14.messagelabs.com id 32/A3-04931-A67EE225; Tue, 10 Sep 2013 09:33:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378805608!1777340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5522 invoked from network); 10 Sep 2013 09:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKJt-0004sN-5U for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKJt-0001rs-2v for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:13 +0000 Date: Tue, 10 Sep 2013 09:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: fix tool chain capabilities detection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ad580d8685190585ba27e996be7e1a730d2a317 Author: Jan Beulich AuthorDate: Mon Sep 9 14:35:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 9 14:35:29 2013 +0200 EFI: fix tool chain capabilities detection Commit f5a54e92 ("xen: move some arch CFLAGS into the common Rules.mk") transformed CFLAGS assignments to CFLAGS-y ones, which collides with the was xen/arch/x86/efi/Makefile determines whether the tol chain is usable for an EFI build. Transform the block back to using CFLAGS. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/Rules.mk | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index bbfc1ac..736882a 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o -CFLAGS-y += -fno-builtin -fno-common -CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith -CFLAGS-y += -pipe -CFLAGS-y += -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +CFLAGS += -fno-builtin -fno-common +CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith +CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h # Solaris puts stdarg.h &c in the system include directory. ifneq ($(XEN_OS),SunOS) -CFLAGS-y += -nostdinc -iwithprefix include +CFLAGS += -nostdinc -iwithprefix include endif CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKKH-0007g2-S9; Tue, 10 Sep 2013 09:33:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKG-0007fV-CJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:36 +0000 Received: from [85.158.139.211:65070] by server-5.bemta-5.messagelabs.com id 4A/70-29992-F67EE225; Tue, 10 Sep 2013 09:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1378805613!1636058!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1159 invoked from network); 10 Sep 2013 09:33:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKD-0004sf-K2 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKD-0001tG-Hu for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:33 +0000 Date: Tue, 10 Sep 2013 09:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hotplug/Linux: add sysconfig tags to xencommons X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b947321c9a742282fb630b6e0f7abf970abd7ec Author: Olaf Hering AuthorDate: Tue Aug 27 15:43:43 2013 +0200 Commit: Ian Campbell CommitDate: Mon Sep 9 13:52:47 2013 +0100 hotplug/Linux: add sysconfig tags to xencommons YaST2 sysconfig can logically group the various sysconfig settings if the files are tagged. Add the missing (YaST specific) tags to xencommons. See for a description http://old-en.opensuse.org/Packaging/SUSE_Package_Conventions/Sysconfig Signed-off-by: Olaf Hering --- tools/hotplug/Linux/init.d/sysconfig.xencommons | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons b/tools/hotplug/Linux/init.d/sysconfig.xencommons index 38ea85a..25f7f00 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons @@ -1,15 +1,31 @@ +## Path: System/Virtualization +## Type: string +## Default: "none" +# # Log xenconsoled messages (cf xl dmesg) #XENCONSOLED_TRACE=[none|guest|hv|all] +## Type: string +## Default: xenstored +# # Select xenstored implementation #XENSTORED=[oxenstored|xenstored] +## Type: string +## Default: Not defined, tracing off +# # Log xenstored messages #XENSTORED_TRACE=[yes|on|1] +## Type: string +## Default: "/var/lib/xenstored" +# # Running xenstored on XENSTORED_ROOTDIR #XENSTORED_ROOTDIR=/var/lib/xenstored +## Type: string +## Default: Not defined, xenbackendd debug mode off +# # Running xenbackendd in debug mode #XENBACKENDD_DEBUG=[yes|on|1] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09: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 1VJKKH-0007g2-S9; Tue, 10 Sep 2013 09:33:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKG-0007fV-CJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:36 +0000 Received: from [85.158.139.211:65070] by server-5.bemta-5.messagelabs.com id 4A/70-29992-F67EE225; Tue, 10 Sep 2013 09:33:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1378805613!1636058!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1159 invoked from network); 10 Sep 2013 09:33:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKD-0004sf-K2 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKD-0001tG-Hu for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:33 +0000 Date: Tue, 10 Sep 2013 09:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hotplug/Linux: add sysconfig tags to xencommons X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b947321c9a742282fb630b6e0f7abf970abd7ec Author: Olaf Hering AuthorDate: Tue Aug 27 15:43:43 2013 +0200 Commit: Ian Campbell CommitDate: Mon Sep 9 13:52:47 2013 +0100 hotplug/Linux: add sysconfig tags to xencommons YaST2 sysconfig can logically group the various sysconfig settings if the files are tagged. Add the missing (YaST specific) tags to xencommons. See for a description http://old-en.opensuse.org/Packaging/SUSE_Package_Conventions/Sysconfig Signed-off-by: Olaf Hering --- tools/hotplug/Linux/init.d/sysconfig.xencommons | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons b/tools/hotplug/Linux/init.d/sysconfig.xencommons index 38ea85a..25f7f00 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons @@ -1,15 +1,31 @@ +## Path: System/Virtualization +## Type: string +## Default: "none" +# # Log xenconsoled messages (cf xl dmesg) #XENCONSOLED_TRACE=[none|guest|hv|all] +## Type: string +## Default: xenstored +# # Select xenstored implementation #XENSTORED=[oxenstored|xenstored] +## Type: string +## Default: Not defined, tracing off +# # Log xenstored messages #XENSTORED_TRACE=[yes|on|1] +## Type: string +## Default: "/var/lib/xenstored" +# # Running xenstored on XENSTORED_ROOTDIR #XENSTORED_ROOTDIR=/var/lib/xenstored +## Type: string +## Default: Not defined, xenbackendd debug mode off +# # Running xenbackendd in debug mode #XENBACKENDD_DEBUG=[yes|on|1] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:33:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKR-0007iM-VT; Tue, 10 Sep 2013 09:33:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKQ-0007hr-V3 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:47 +0000 Received: from [85.158.137.68:48258] by server-5.bemta-3.messagelabs.com id D4/E8-23058-A77EE225; Tue, 10 Sep 2013 09:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378805624!1176867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22729 invoked from network); 10 Sep 2013 09:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKN-0004sp-P3 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKN-0001te-Ma for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:43 +0000 Date: Tue, 10 Sep 2013 09:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: build debug qemu-xen in debug tools builds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e4610ec55751c3d1a4f515ba4041ca6faa16d15 Author: Matthew Daley AuthorDate: Wed Sep 4 01:12:59 2013 +1200 Commit: Ian Campbell CommitDate: Mon Sep 9 14:41:49 2013 +0100 tools: build debug qemu-xen in debug tools builds When building tools in debug mode (debug=y), pass --enable-debug when configuring qemu-xen to enable some debug support (namely, to prevent symbols from being stripped). Signed-off-by: Matthew Daley --- tools/Makefile | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0531f48..066df66 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -173,6 +173,12 @@ qemu-xen-dir-force-update: $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \ fi +ifeq ($(debug),y) +QEMU_XEN_ENABLE_DEBUG := --enable-debug +else +QEMU_XEN_ENABLE_DEBUG := +endif + subdir-all-qemu-xen-dir: qemu-xen-dir-find if test -d $(QEMU_UPSTREAM_URL) ; then \ source=$(QEMU_UPSTREAM_URL); \ @@ -181,6 +187,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find fi; \ cd qemu-xen-dir; \ $$source/configure --enable-xen --target-list=i386-softmmu \ + $(QEMU_XEN_ENABLE_DEBUG) \ --prefix=$(PREFIX) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:33:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:33:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKR-0007iM-VT; Tue, 10 Sep 2013 09:33:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKQ-0007hr-V3 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:47 +0000 Received: from [85.158.137.68:48258] by server-5.bemta-3.messagelabs.com id D4/E8-23058-A77EE225; Tue, 10 Sep 2013 09:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1378805624!1176867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22729 invoked from network); 10 Sep 2013 09:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKN-0004sp-P3 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKN-0001te-Ma for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:43 +0000 Date: Tue, 10 Sep 2013 09:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: build debug qemu-xen in debug tools builds X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e4610ec55751c3d1a4f515ba4041ca6faa16d15 Author: Matthew Daley AuthorDate: Wed Sep 4 01:12:59 2013 +1200 Commit: Ian Campbell CommitDate: Mon Sep 9 14:41:49 2013 +0100 tools: build debug qemu-xen in debug tools builds When building tools in debug mode (debug=y), pass --enable-debug when configuring qemu-xen to enable some debug support (namely, to prevent symbols from being stripped). Signed-off-by: Matthew Daley --- tools/Makefile | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0531f48..066df66 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -173,6 +173,12 @@ qemu-xen-dir-force-update: $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \ fi +ifeq ($(debug),y) +QEMU_XEN_ENABLE_DEBUG := --enable-debug +else +QEMU_XEN_ENABLE_DEBUG := +endif + subdir-all-qemu-xen-dir: qemu-xen-dir-find if test -d $(QEMU_UPSTREAM_URL) ; then \ source=$(QEMU_UPSTREAM_URL); \ @@ -181,6 +187,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find fi; \ cd qemu-xen-dir; \ $$source/configure --enable-xen --target-list=i386-softmmu \ + $(QEMU_XEN_ENABLE_DEBUG) \ --prefix=$(PREFIX) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:34:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKc-0007ki-2R; Tue, 10 Sep 2013 09:33:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKa-0007kG-Iw for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:56 +0000 Received: from [85.158.137.68:41793] by server-2.bemta-3.messagelabs.com id 42/4C-14467-387EE225; Tue, 10 Sep 2013 09:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378805634!1174447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16479 invoked from network); 10 Sep 2013 09:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKX-0004t0-UD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKX-0001u2-Sa for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:53 +0000 Date: Tue, 10 Sep 2013 09:33:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce MPIDR_HWID_MASK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8529ac933e82a900f86a71b58a338461d6027298 Author: Julien Grall AuthorDate: Fri Aug 30 14:30:27 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:44:26 2013 +0100 xen/arm: Introduce MPIDR_HWID_MASK This define will be use later to retrieve the correct hardware CPU ID. Also replace hardcoded mask in arm32/head.S by this define. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 2 +- xen/include/asm-arm/processor.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index b8334e2..79e95b6 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -98,7 +98,7 @@ past_zImage: beq boot_cpu tst r0, #(1<<30) /* Uniprocessor system? */ bne boot_cpu - bics r12, r0, #(0xff << 24) /* Mask out flags to get CPU ID */ + bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 1a4f8d1..808567e 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -12,6 +12,7 @@ #define MPIDR_SMP (1 << 31) #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK 0xffffff /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 09:34:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKc-0007ki-2R; Tue, 10 Sep 2013 09:33:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKa-0007kG-Iw for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:56 +0000 Received: from [85.158.137.68:41793] by server-2.bemta-3.messagelabs.com id 42/4C-14467-387EE225; Tue, 10 Sep 2013 09:33:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1378805634!1174447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16479 invoked from network); 10 Sep 2013 09:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKX-0004t0-UD for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKX-0001u2-Sa for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:33:53 +0000 Date: Tue, 10 Sep 2013 09:33:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce MPIDR_HWID_MASK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8529ac933e82a900f86a71b58a338461d6027298 Author: Julien Grall AuthorDate: Fri Aug 30 14:30:27 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:44:26 2013 +0100 xen/arm: Introduce MPIDR_HWID_MASK This define will be use later to retrieve the correct hardware CPU ID. Also replace hardcoded mask in arm32/head.S by this define. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/head.S | 2 +- xen/include/asm-arm/processor.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index b8334e2..79e95b6 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -98,7 +98,7 @@ past_zImage: beq boot_cpu tst r0, #(1<<30) /* Uniprocessor system? */ bne boot_cpu - bics r12, r0, #(0xff << 24) /* Mask out flags to get CPU ID */ + bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 1a4f8d1..808567e 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -12,6 +12,7 @@ #define MPIDR_SMP (1 << 31) #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK 0xffffff /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 09:34:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKl-0007nL-Qt; Tue, 10 Sep 2013 09:34:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKk-0007mn-OJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:06 +0000 Received: from [85.158.137.68:52504] by server-5.bemta-3.messagelabs.com id 0A/69-23058-D87EE225; Tue, 10 Sep 2013 09:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378805644!1177687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30669 invoked from network); 10 Sep 2013 09:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKi-0004tf-2e for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKi-0001ub-14 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:04 +0000 Date: Tue, 10 Sep 2013 09:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if we can't copy the DTB to dom0 memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffcbfb66eeb38d0f0180d5ac99a3a8b2c8dd9af7 Author: Julien Grall AuthorDate: Wed Sep 4 16:11:57 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:45:50 2013 +0100 xen/arm: Panic if we can't copy the DTB to dom0 memory Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9ca663a..77e2a61 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -535,11 +535,14 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) static void dtb_load(struct kernel_info *kinfo) { void * __user dtb_virt = (void * __user)(register_t)kinfo->dtb_paddr; + unsigned long rc; printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); - raw_copy_to_guest(dtb_virt, kinfo->fdt, fdt_totalsize(kinfo->fdt)); + rc = raw_copy_to_guest(dtb_virt, kinfo->fdt, fdt_totalsize(kinfo->fdt)); + if ( rc != 0 ) + panic("Unable to copy the DTB to dom0 memory (rc = %lu)\n", rc); xfree(kinfo->fdt); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:34:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKl-0007nL-Qt; Tue, 10 Sep 2013 09:34:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKk-0007mn-OJ for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:06 +0000 Received: from [85.158.137.68:52504] by server-5.bemta-3.messagelabs.com id 0A/69-23058-D87EE225; Tue, 10 Sep 2013 09:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1378805644!1177687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30669 invoked from network); 10 Sep 2013 09:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKi-0004tf-2e for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKi-0001ub-14 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:04 +0000 Date: Tue, 10 Sep 2013 09:34:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if we can't copy the DTB to dom0 memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffcbfb66eeb38d0f0180d5ac99a3a8b2c8dd9af7 Author: Julien Grall AuthorDate: Wed Sep 4 16:11:57 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:45:50 2013 +0100 xen/arm: Panic if we can't copy the DTB to dom0 memory Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9ca663a..77e2a61 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -535,11 +535,14 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) static void dtb_load(struct kernel_info *kinfo) { void * __user dtb_virt = (void * __user)(register_t)kinfo->dtb_paddr; + unsigned long rc; printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); - raw_copy_to_guest(dtb_virt, kinfo->fdt, fdt_totalsize(kinfo->fdt)); + rc = raw_copy_to_guest(dtb_virt, kinfo->fdt, fdt_totalsize(kinfo->fdt)); + if ( rc != 0 ) + panic("Unable to copy the DTB to dom0 memory (rc = %lu)\n", rc); xfree(kinfo->fdt); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKKw-0007qj-Tq; Tue, 10 Sep 2013 09:34:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKv-0007qH-41 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:17 +0000 Received: from [85.158.143.35:26192] by server-3.bemta-4.messagelabs.com id 84/BB-08835-897EE225; Tue, 10 Sep 2013 09:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378805654!2590759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11130 invoked from network); 10 Sep 2013 09:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKs-0004tp-Oy for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKs-0001xF-8J for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:14 +0000 Date: Tue, 10 Sep 2013 09:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: fix DT_ROOT_NODE_ADDR_CELLS_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 4d10a505c1eb6feb85292ab944c18e28f5583294 Author: Julien Grall AuthorDate: Mon Sep 9 12:59:07 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:46:51 2013 +0100 xen/dts: fix DT_ROOT_NODE_ADDR_CELLS_DEFAULT The commit dbd1243 "xen/arm: Add helpers to use the device tree" introduced DT_ROOT_NODE_ADDR_CELLS_DEFAULT with is used for default value when bad copy from Linux code. The ePAR (section 2.3.5) says: "If missing, a client program should assume a default value of 2 for #address-cells, and a value of 1 for #size-cells." Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/xen/device_tree.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 402cef2..5cc1905 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -233,7 +233,7 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) /* Default #address and #size cells */ -#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 1 +#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 #define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 #define for_each_property_of_node(dn, pp) \ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 09:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKKw-0007qj-Tq; Tue, 10 Sep 2013 09:34:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKv-0007qH-41 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:17 +0000 Received: from [85.158.143.35:26192] by server-3.bemta-4.messagelabs.com id 84/BB-08835-897EE225; Tue, 10 Sep 2013 09:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1378805654!2590759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11130 invoked from network); 10 Sep 2013 09:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKKs-0004tp-Oy for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKKs-0001xF-8J for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:14 +0000 Date: Tue, 10 Sep 2013 09:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: fix DT_ROOT_NODE_ADDR_CELLS_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 4d10a505c1eb6feb85292ab944c18e28f5583294 Author: Julien Grall AuthorDate: Mon Sep 9 12:59:07 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 9 14:46:51 2013 +0100 xen/dts: fix DT_ROOT_NODE_ADDR_CELLS_DEFAULT The commit dbd1243 "xen/arm: Add helpers to use the device tree" introduced DT_ROOT_NODE_ADDR_CELLS_DEFAULT with is used for default value when bad copy from Linux code. The ePAR (section 2.3.5) says: "If missing, a client program should assume a default value of 2 for #address-cells, and a value of 1 for #size-cells." Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/xen/device_tree.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 402cef2..5cc1905 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -233,7 +233,7 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) /* Default #address and #size cells */ -#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 1 +#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 #define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 #define for_each_property_of_node(dn, pp) \ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 09:34:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKL7-0007tH-0l; Tue, 10 Sep 2013 09:34:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKL5-0007sx-RB for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:28 +0000 Received: from [85.158.143.35:30693] by server-1.bemta-4.messagelabs.com id 92/64-16125-3A7EE225; Tue, 10 Sep 2013 09:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1378805665!2604727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9567 invoked from network); 10 Sep 2013 09:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKL3-0004tv-78 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKL2-0001zU-W5 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:25 +0000 Date: Tue, 10 Sep 2013 09:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: allow user to specify a system seabios binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 906677d6411c3dc579e07967d0137a12392ff314 Author: Fabio Fantoni AuthorDate: Thu Sep 5 12:40:01 2013 +0200 Commit: Ian Campbell CommitDate: Mon Sep 9 14:48:51 2013 +0100 tools: allow user to specify a system seabios binary If this option is given don't bother building seabios ourselves. Likely to be handy for distros who have an existing seabios package which they want to reuse. Signed-off-by: Fabio Fantoni Acked-by: Ian Campbell --- config/Tools.mk.in | 1 + tools/configure | 18 ++++++++++++++++++ tools/configure.ac | 11 +++++++++++ tools/firmware/Makefile | 2 ++ tools/firmware/hvmloader/Makefile | 6 +++++- 5 files changed, 37 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index e388e42..67f5782 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -23,6 +23,7 @@ LD86 := @LD86@ BCC := @BCC@ IASL := @IASL@ FETCHER := @FETCHER@ +SEABIOS_PATH := @seabios_path@ # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ diff --git a/tools/configure b/tools/configure index 4be39fc..d916cb6 100755 --- a/tools/configure +++ b/tools/configure @@ -654,6 +654,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +seabios_path qemu_xen qemu_traditional blktap1 @@ -738,6 +739,7 @@ enable_xend enable_blktap1 enable_qemu_traditional with_system_qemu +with_system_seabios ' ac_precious_vars='build_alias host_alias @@ -1409,6 +1411,9 @@ Optional Packages: Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen device model instead of building and installing our own version + --with-system-seabios[=PATH] + Use system supplied seabios PATH instead of building + and installing our own version Some influential environment variables: CC C compiler command @@ -3727,6 +3732,19 @@ fi +# Check whether --with-system-seabios was given. +if test "${with_system_seabios+set}" = set; then : + withval=$with_system_seabios; + case $withval in + no) seabios_path= ;; + *) seabios_path=$withval ;; + esac + +fi + + + + diff --git a/tools/configure.ac b/tools/configure.ac index 1f57681..2e57bfc 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -97,6 +97,17 @@ AS_IF([test "x$qemu_xen" = "xn"], [ ]) AC_SUBST(qemu_xen) +AC_ARG_WITH([system-seabios], + AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], + [Use system supplied seabios PATH instead of building and installing + our own version]),[ + case $withval in + no) seabios_path= ;; + *) seabios_path=$withval ;; + esac +],[]) +AC_SUBST(seabios_path) + AC_ARG_VAR([PREPEND_INCLUDES], [List of include folders to prepend to CFLAGS (without -I)]) AC_ARG_VAR([PREPEND_LIB], diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index aff8e56..f064765 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -7,7 +7,9 @@ INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := SUBDIRS-$(CONFIG_OVMF) += ovmf +ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir +endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index c6e7376..8ab1429 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -70,7 +70,11 @@ endif ifeq ($(CONFIG_SEABIOS),y) OBJS += seabios.o CFLAGS += -DENABLE_SEABIOS -SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin +ifeq ($(SEABIOS_PATH),) + SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin +else + SEABIOS_ROM := $(SEABIOS_PATH) +endif ROMS += $(SEABIOS_ROM) 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 Sep 10 09:34:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKL7-0007tH-0l; Tue, 10 Sep 2013 09:34:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKL5-0007sx-RB for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:28 +0000 Received: from [85.158.143.35:30693] by server-1.bemta-4.messagelabs.com id 92/64-16125-3A7EE225; Tue, 10 Sep 2013 09:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1378805665!2604727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9567 invoked from network); 10 Sep 2013 09:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKL3-0004tv-78 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKL2-0001zU-W5 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:25 +0000 Date: Tue, 10 Sep 2013 09:34:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: allow user to specify a system seabios binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 906677d6411c3dc579e07967d0137a12392ff314 Author: Fabio Fantoni AuthorDate: Thu Sep 5 12:40:01 2013 +0200 Commit: Ian Campbell CommitDate: Mon Sep 9 14:48:51 2013 +0100 tools: allow user to specify a system seabios binary If this option is given don't bother building seabios ourselves. Likely to be handy for distros who have an existing seabios package which they want to reuse. Signed-off-by: Fabio Fantoni Acked-by: Ian Campbell --- config/Tools.mk.in | 1 + tools/configure | 18 ++++++++++++++++++ tools/configure.ac | 11 +++++++++++ tools/firmware/Makefile | 2 ++ tools/firmware/hvmloader/Makefile | 6 +++++- 5 files changed, 37 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index e388e42..67f5782 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -23,6 +23,7 @@ LD86 := @LD86@ BCC := @BCC@ IASL := @IASL@ FETCHER := @FETCHER@ +SEABIOS_PATH := @seabios_path@ # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ diff --git a/tools/configure b/tools/configure index 4be39fc..d916cb6 100755 --- a/tools/configure +++ b/tools/configure @@ -654,6 +654,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +seabios_path qemu_xen qemu_traditional blktap1 @@ -738,6 +739,7 @@ enable_xend enable_blktap1 enable_qemu_traditional with_system_qemu +with_system_seabios ' ac_precious_vars='build_alias host_alias @@ -1409,6 +1411,9 @@ Optional Packages: Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen device model instead of building and installing our own version + --with-system-seabios[=PATH] + Use system supplied seabios PATH instead of building + and installing our own version Some influential environment variables: CC C compiler command @@ -3727,6 +3732,19 @@ fi +# Check whether --with-system-seabios was given. +if test "${with_system_seabios+set}" = set; then : + withval=$with_system_seabios; + case $withval in + no) seabios_path= ;; + *) seabios_path=$withval ;; + esac + +fi + + + + diff --git a/tools/configure.ac b/tools/configure.ac index 1f57681..2e57bfc 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -97,6 +97,17 @@ AS_IF([test "x$qemu_xen" = "xn"], [ ]) AC_SUBST(qemu_xen) +AC_ARG_WITH([system-seabios], + AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], + [Use system supplied seabios PATH instead of building and installing + our own version]),[ + case $withval in + no) seabios_path= ;; + *) seabios_path=$withval ;; + esac +],[]) +AC_SUBST(seabios_path) + AC_ARG_VAR([PREPEND_INCLUDES], [List of include folders to prepend to CFLAGS (without -I)]) AC_ARG_VAR([PREPEND_LIB], diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index aff8e56..f064765 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -7,7 +7,9 @@ INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := SUBDIRS-$(CONFIG_OVMF) += ovmf +ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir +endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index c6e7376..8ab1429 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -70,7 +70,11 @@ endif ifeq ($(CONFIG_SEABIOS),y) OBJS += seabios.o CFLAGS += -DENABLE_SEABIOS -SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin +ifeq ($(SEABIOS_PATH),) + SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin +else + SEABIOS_ROM := $(SEABIOS_PATH) +endif ROMS += $(SEABIOS_ROM) 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 Sep 10 09:34:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKLN-0007wP-4W; Tue, 10 Sep 2013 09:34:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKLL-0007vp-BN for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:44 +0000 Received: from [85.158.137.68:63495] by server-14.bemta-3.messagelabs.com id 07/51-00990-2B7EE225; Tue, 10 Sep 2013 09:34:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378805675!1182332!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3297 invoked from network); 10 Sep 2013 09:34:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKLD-0004u3-KH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKLD-00020h-GU for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:35 +0000 Date: Tue, 10 Sep 2013 09:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: Regenerate with autoconf 2.69 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de333b694591909787da54a40496fc82c8ba5b62 Author: Ian Campbell AuthorDate: Mon Sep 9 14:52:35 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 9 16:35:03 2013 +0100 configure: Regenerate with autoconf 2.69 This is the version from Debian Wheezy which is what both Ian Jackson and myself run on our workstations. As committers it is useful to minimise regeneration noise. This is purely a run of autogen.sh. I have not tried to build the result. Signed-off-by: Ian Campbell Tested-by: Ian Jackson --- configure | 235 +++++++++++--------- docs/configure | 251 ++++++++++++---------- stubdom/configure | 304 ++++++++++++++------------ tools/config.h.in | 5 + tools/configure | 633 ++++++++++++++++++++++++++++------------------------- 5 files changed, 774 insertions(+), 654 deletions(-) diff --git a/configure b/configure index 86867e6..95133be 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1033,7 +1061,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1084,8 +1112,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1315,9 +1341,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1332,7 +1358,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1590,7 +1616,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1718,7 +1744,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -1734,7 +1760,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1752,7 +1778,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -1767,7 +1793,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2131,10 +2157,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -2202,7 +2239,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -2303,6 +2340,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2498,16 +2536,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -2567,28 +2605,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2610,7 +2636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2664,10 +2690,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2744,7 +2770,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -2775,7 +2801,7 @@ do case $ac_config_target in "./config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES ./config/Toplevel.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -2796,9 +2822,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -2806,12 +2833,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -2833,7 +2861,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -2861,7 +2889,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -2909,7 +2937,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -2941,7 +2969,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -2981,7 +3009,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3000,7 +3028,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -3009,7 +3037,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3035,8 +3063,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3161,21 +3189,22 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/docs/configure b/docs/configure index 0602843..d67b532 100755 --- a/docs/configure +++ b/docs/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Documentation 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1020,7 +1048,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1071,8 +1099,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1299,9 +1325,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Documentation configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1316,7 +1342,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Documentation $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1574,7 +1600,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1710,7 +1736,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. set dummy fig2dev; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FIG2DEV+set}" = set; then : +if ${ac_cv_path_FIG2DEV+:} false; then : $as_echo_n "(cached) " >&6 else case $FIG2DEV in @@ -1724,7 +1750,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FIG2DEV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1759,7 +1785,7 @@ fi set dummy pod2man; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2MAN+set}" = set; then : +if ${ac_cv_path_POD2MAN+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2MAN in @@ -1773,7 +1799,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1808,7 +1834,7 @@ fi set dummy pod2html; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2HTML+set}" = set; then : +if ${ac_cv_path_POD2HTML+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2HTML in @@ -1822,7 +1848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1857,7 +1883,7 @@ fi set dummy pod2text; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2TEXT+set}" = set; then : +if ${ac_cv_path_POD2TEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2TEXT in @@ -1871,7 +1897,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2TEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1908,7 +1934,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MARKDOWN+set}" = set; then : +if ${ac_cv_path_MARKDOWN+:} false; then : $as_echo_n "(cached) " >&6 else case $MARKDOWN in @@ -1922,7 +1948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MARKDOWN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1960,7 +1986,7 @@ fi set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -1974,7 +2000,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2066,10 +2092,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -2137,7 +2174,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -2238,6 +2275,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2433,16 +2471,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -2502,28 +2540,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2545,7 +2571,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor Documentation $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2599,10 +2625,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor Documentation config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2679,7 +2705,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -2710,7 +2736,7 @@ do case $ac_config_target in "../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -2731,9 +2757,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -2741,12 +2768,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -2768,7 +2796,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -2796,7 +2824,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -2844,7 +2872,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -2876,7 +2904,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -2916,7 +2944,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -2935,7 +2963,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -2944,7 +2972,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -2970,8 +2998,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3096,21 +3124,22 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/stubdom/configure b/stubdom/configure index 81eff6d..5b0ce0e 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Stub Domains 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1086,7 +1114,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1137,8 +1165,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1400,9 +1426,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Stub Domains configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1446,7 +1472,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1455,7 +1481,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Stub Domains $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1713,7 +1739,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1841,7 +1867,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -1857,7 +1883,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1875,7 +1901,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -1890,7 +1916,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2277,7 +2303,7 @@ extfiles=$ax_cv_extfiles set dummy wget; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_WGET+set}" = set; then : +if ${ac_cv_path_WGET+:} false; then : $as_echo_n "(cached) " >&6 else case $WGET in @@ -2291,7 +2317,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2324,7 +2350,7 @@ else set dummy ftp; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FTP+set}" = set; then : +if ${ac_cv_path_FTP+:} false; then : $as_echo_n "(cached) " >&6 else case $FTP in @@ -2338,7 +2364,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FTP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2386,7 +2412,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2398,7 +2424,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2426,7 +2452,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2438,7 +2464,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2479,7 +2505,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2491,7 +2517,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2519,7 +2545,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2532,7 +2558,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2578,7 +2604,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2590,7 +2616,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2622,7 +2648,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2634,7 +2660,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2677,7 +2703,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2792,7 +2818,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2835,7 +2861,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2894,7 +2920,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2905,7 +2931,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2946,7 +2972,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2956,7 +2982,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2993,7 +3019,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3071,7 +3097,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3080,8 +3106,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3170,7 +3195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3214,7 +3239,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3234,7 +3259,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3298,7 +3323,7 @@ if test "x$vtpm" = "xy"; then : set dummy cmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CMAKE+set}" = set; then : +if ${ac_cv_path_CMAKE+:} false; then : $as_echo_n "(cached) " >&6 else case $CMAKE in @@ -3312,7 +3337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3351,7 +3376,7 @@ else set dummy cmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CMAKE+set}" = set; then : +if ${ac_cv_path_CMAKE+:} false; then : $as_echo_n "(cached) " >&6 else case $CMAKE in @@ -3365,7 +3390,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3675,10 +3700,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -3746,7 +3782,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -3847,6 +3883,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4042,16 +4079,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -4111,28 +4148,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4154,7 +4179,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor Stub Domains $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4208,10 +4233,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor Stub Domains config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4289,7 +4314,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -4320,7 +4345,7 @@ do case $ac_config_target in "../config/Stubdom.mk") CONFIG_FILES="$CONFIG_FILES ../config/Stubdom.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -4341,9 +4366,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -4351,12 +4377,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -4378,7 +4405,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -4406,7 +4433,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -4454,7 +4481,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -4486,7 +4513,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -4526,7 +4553,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4545,7 +4572,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -4554,7 +4581,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -4580,8 +4607,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -4711,21 +4738,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/tools/config.h.in b/tools/config.h.in index aaa1027..b1c9531 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -81,6 +81,11 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/tools/configure b/tools/configure index d916cb6..0dee92a 100755 --- a/tools/configure +++ b/tools/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Tools 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,14 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -323,6 +359,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -499,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1175,7 +1203,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1226,8 +1254,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1518,9 +1544,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Tools configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1564,7 +1590,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1601,7 +1627,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1614,10 +1640,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1684,7 +1710,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1693,7 +1719,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1734,7 +1760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1748,7 +1774,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1766,7 +1792,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1797,7 +1823,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1811,7 +1837,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1820,7 +1846,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Tools $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2078,7 +2104,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2221,7 +2247,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2237,7 +2263,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2255,7 +2281,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -2270,7 +2296,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2297,7 +2323,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2309,7 +2335,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2337,7 +2363,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2349,7 +2375,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2390,7 +2416,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2402,7 +2428,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2430,7 +2456,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2443,7 +2469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2489,7 +2515,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2501,7 +2527,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2533,7 +2559,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2545,7 +2571,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2588,7 +2614,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2703,7 +2729,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2746,7 +2772,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2805,7 +2831,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2816,7 +2842,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2857,7 +2883,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2867,7 +2893,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2904,7 +2930,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -2982,7 +3008,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -2991,8 +3017,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3087,7 +3112,7 @@ if test "$enable_largefile" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : +if ${ac_cv_sys_largefile_CC+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -3138,7 +3163,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3207,7 +3232,7 @@ rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3274,6 +3299,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -3792,7 +3819,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3804,7 +3831,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3832,7 +3859,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3844,7 +3871,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3885,7 +3912,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3897,7 +3924,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3925,7 +3952,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3938,7 +3965,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3984,7 +4011,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3996,7 +4023,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4028,7 +4055,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4040,7 +4067,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4083,7 +4110,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4112,7 +4139,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4149,7 +4176,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4227,7 +4254,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4236,8 +4263,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4326,7 +4352,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4370,7 +4396,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4390,7 +4416,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4450,7 +4476,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' set dummy bison; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_BISON+set}" = set; then : +if ${ac_cv_path_BISON+:} false; then : $as_echo_n "(cached) " >&6 else case $BISON in @@ -4464,7 +4490,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4490,7 +4516,7 @@ fi set dummy flex; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FLEX+set}" = set; then : +if ${ac_cv_path_FLEX+:} false; then : $as_echo_n "(cached) " >&6 else case $FLEX in @@ -4504,7 +4530,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4530,7 +4556,7 @@ fi set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -4544,7 +4570,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4577,7 +4603,7 @@ if test "x$xapi" = "xy"; then : set dummy curl-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CURL+set}" = set; then : +if ${ac_cv_path_CURL+:} false; then : $as_echo_n "(cached) " >&6 else case $CURL in @@ -4591,7 +4617,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4622,7 +4648,7 @@ fi set dummy xml2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XML+set}" = set; then : +if ${ac_cv_path_XML+:} false; then : $as_echo_n "(cached) " >&6 else case $XML in @@ -4636,7 +4662,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4673,7 +4699,7 @@ if test "x$ocamltools" = "xy"; then : set dummy ${ac_tool_prefix}ocamlc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLC+set}" = set; then : +if ${ac_cv_prog_OCAMLC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLC"; then @@ -4685,7 +4711,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLC="${ac_tool_prefix}ocamlc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4713,7 +4739,7 @@ if test -z "$ac_cv_prog_OCAMLC"; then set dummy ocamlc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OCAMLC+set}" = set; then : +if ${ac_cv_prog_ac_ct_OCAMLC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OCAMLC"; then @@ -4725,7 +4751,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OCAMLC="ocamlc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4784,7 +4810,7 @@ $as_echo "OCaml library path is $OCAMLLIB" >&6; } set dummy ${ac_tool_prefix}ocamlopt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLOPT+set}" = set; then : +if ${ac_cv_prog_OCAMLOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLOPT"; then @@ -4796,7 +4822,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4824,7 +4850,7 @@ if test -z "$ac_cv_prog_OCAMLOPT"; then set dummy ocamlopt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OCAMLOPT+set}" = set; then : +if ${ac_cv_prog_ac_ct_OCAMLOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OCAMLOPT"; then @@ -4836,7 +4862,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OCAMLOPT="ocamlopt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4894,7 +4920,7 @@ $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; } set dummy ${ac_tool_prefix}ocamlc.opt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLCDOTOPT+set}" = set; then : +if ${ac_cv_prog_OCAMLCDOTOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLCDOTOPT"; then @@ -4906,7 +4932,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4934,7 +4960,7 @@ if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then set dummy ocamlc.opt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 09:34:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 09:34: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 1VJKLN-0007wP-4W; Tue, 10 Sep 2013 09:34:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKLL-0007vp-BN for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:44 +0000 Received: from [85.158.137.68:63495] by server-14.bemta-3.messagelabs.com id 07/51-00990-2B7EE225; Tue, 10 Sep 2013 09:34:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378805675!1182332!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3297 invoked from network); 10 Sep 2013 09:34:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 09:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJKLD-0004u3-KH for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJKLD-00020h-GU for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 09:34:35 +0000 Date: Tue, 10 Sep 2013 09:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: Regenerate with autoconf 2.69 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de333b694591909787da54a40496fc82c8ba5b62 Author: Ian Campbell AuthorDate: Mon Sep 9 14:52:35 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 9 16:35:03 2013 +0100 configure: Regenerate with autoconf 2.69 This is the version from Debian Wheezy which is what both Ian Jackson and myself run on our workstations. As committers it is useful to minimise regeneration noise. This is purely a run of autogen.sh. I have not tried to build the result. Signed-off-by: Ian Campbell Tested-by: Ian Jackson --- configure | 235 +++++++++++--------- docs/configure | 251 ++++++++++++---------- stubdom/configure | 304 ++++++++++++++------------ tools/config.h.in | 5 + tools/configure | 633 ++++++++++++++++++++++++++++------------------------- 5 files changed, 774 insertions(+), 654 deletions(-) diff --git a/configure b/configure index 86867e6..95133be 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1033,7 +1061,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1084,8 +1112,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1315,9 +1341,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1332,7 +1358,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1590,7 +1616,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1718,7 +1744,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -1734,7 +1760,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1752,7 +1778,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -1767,7 +1793,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2131,10 +2157,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -2202,7 +2239,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -2303,6 +2340,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2498,16 +2536,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -2567,28 +2605,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2610,7 +2636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2664,10 +2690,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2744,7 +2770,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -2775,7 +2801,7 @@ do case $ac_config_target in "./config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES ./config/Toplevel.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -2796,9 +2822,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -2806,12 +2833,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -2833,7 +2861,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -2861,7 +2889,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -2909,7 +2937,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -2941,7 +2969,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -2981,7 +3009,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3000,7 +3028,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -3009,7 +3037,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3035,8 +3063,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3161,21 +3189,22 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/docs/configure b/docs/configure index 0602843..d67b532 100755 --- a/docs/configure +++ b/docs/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Documentation 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1020,7 +1048,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1071,8 +1099,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1299,9 +1325,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Documentation configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1316,7 +1342,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Documentation $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1574,7 +1600,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1710,7 +1736,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. set dummy fig2dev; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FIG2DEV+set}" = set; then : +if ${ac_cv_path_FIG2DEV+:} false; then : $as_echo_n "(cached) " >&6 else case $FIG2DEV in @@ -1724,7 +1750,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FIG2DEV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1759,7 +1785,7 @@ fi set dummy pod2man; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2MAN+set}" = set; then : +if ${ac_cv_path_POD2MAN+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2MAN in @@ -1773,7 +1799,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1808,7 +1834,7 @@ fi set dummy pod2html; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2HTML+set}" = set; then : +if ${ac_cv_path_POD2HTML+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2HTML in @@ -1822,7 +1848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1857,7 +1883,7 @@ fi set dummy pod2text; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_POD2TEXT+set}" = set; then : +if ${ac_cv_path_POD2TEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $POD2TEXT in @@ -1871,7 +1897,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_POD2TEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1908,7 +1934,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MARKDOWN+set}" = set; then : +if ${ac_cv_path_MARKDOWN+:} false; then : $as_echo_n "(cached) " >&6 else case $MARKDOWN in @@ -1922,7 +1948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MARKDOWN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1960,7 +1986,7 @@ fi set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -1974,7 +2000,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2066,10 +2092,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -2137,7 +2174,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -2238,6 +2275,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2433,16 +2471,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -2502,28 +2540,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2545,7 +2571,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor Documentation $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2599,10 +2625,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor Documentation config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -2679,7 +2705,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -2710,7 +2736,7 @@ do case $ac_config_target in "../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -2731,9 +2757,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -2741,12 +2768,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -2768,7 +2796,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -2796,7 +2824,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -2844,7 +2872,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -2876,7 +2904,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -2916,7 +2944,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -2935,7 +2963,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -2944,7 +2972,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -2970,8 +2998,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3096,21 +3124,22 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/stubdom/configure b/stubdom/configure index 81eff6d..5b0ce0e 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Stub Domains 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,14 +237,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -322,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -443,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -477,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -498,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1086,7 +1114,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1137,8 +1165,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1400,9 +1426,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Stub Domains configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1446,7 +1472,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1455,7 +1481,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Stub Domains $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1713,7 +1739,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1841,7 +1867,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -1857,7 +1883,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1875,7 +1901,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -1890,7 +1916,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2277,7 +2303,7 @@ extfiles=$ax_cv_extfiles set dummy wget; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_WGET+set}" = set; then : +if ${ac_cv_path_WGET+:} false; then : $as_echo_n "(cached) " >&6 else case $WGET in @@ -2291,7 +2317,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2324,7 +2350,7 @@ else set dummy ftp; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FTP+set}" = set; then : +if ${ac_cv_path_FTP+:} false; then : $as_echo_n "(cached) " >&6 else case $FTP in @@ -2338,7 +2364,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FTP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2386,7 +2412,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2398,7 +2424,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2426,7 +2452,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2438,7 +2464,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2479,7 +2505,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2491,7 +2517,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2519,7 +2545,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2532,7 +2558,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2578,7 +2604,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2590,7 +2616,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2622,7 +2648,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2634,7 +2660,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2677,7 +2703,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2792,7 +2818,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2835,7 +2861,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2894,7 +2920,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2905,7 +2931,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2946,7 +2972,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2956,7 +2982,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2993,7 +3019,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3071,7 +3097,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3080,8 +3106,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3170,7 +3195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3214,7 +3239,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3234,7 +3259,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3298,7 +3323,7 @@ if test "x$vtpm" = "xy"; then : set dummy cmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CMAKE+set}" = set; then : +if ${ac_cv_path_CMAKE+:} false; then : $as_echo_n "(cached) " >&6 else case $CMAKE in @@ -3312,7 +3337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3351,7 +3376,7 @@ else set dummy cmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CMAKE+set}" = set; then : +if ${ac_cv_path_CMAKE+:} false; then : $as_echo_n "(cached) " >&6 else case $CMAKE in @@ -3365,7 +3390,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CMAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3675,10 +3700,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -3746,7 +3782,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -3847,6 +3883,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4042,16 +4079,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -4111,28 +4148,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4154,7 +4179,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Xen Hypervisor Stub Domains $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4208,10 +4233,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Xen Hypervisor Stub Domains config.status 4.4 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4289,7 +4314,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -4320,7 +4345,7 @@ do case $ac_config_target in "../config/Stubdom.mk") CONFIG_FILES="$CONFIG_FILES ../config/Stubdom.mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -4341,9 +4366,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -4351,12 +4377,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -4378,7 +4405,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -4406,7 +4433,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -4454,7 +4481,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -4486,7 +4513,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -4526,7 +4553,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4545,7 +4572,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -4554,7 +4581,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -4580,8 +4607,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -4711,21 +4738,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/tools/config.h.in b/tools/config.h.in index aaa1027..b1c9531 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -81,6 +81,11 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/tools/configure b/tools/configure index d916cb6..0dee92a 100755 --- a/tools/configure +++ b/tools/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Xen Hypervisor Tools 4.4. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,14 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -323,6 +359,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -499,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1175,7 +1203,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1226,8 +1254,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1518,9 +1544,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Xen Hypervisor Tools configure 4.4 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1564,7 +1590,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1601,7 +1627,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1614,10 +1640,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1684,7 +1710,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1693,7 +1719,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1734,7 +1760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1748,7 +1774,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1766,7 +1792,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1797,7 +1823,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1811,7 +1837,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1820,7 +1846,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Xen Hypervisor Tools $as_me 4.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2078,7 +2104,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2221,7 +2247,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2237,7 +2263,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2255,7 +2281,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -2270,7 +2296,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2297,7 +2323,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2309,7 +2335,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2337,7 +2363,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2349,7 +2375,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2390,7 +2416,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2402,7 +2428,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2430,7 +2456,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2443,7 +2469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2489,7 +2515,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2501,7 +2527,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2533,7 +2559,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2545,7 +2571,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2588,7 +2614,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2703,7 +2729,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2746,7 +2772,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2805,7 +2831,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2816,7 +2842,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2857,7 +2883,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2867,7 +2893,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2904,7 +2930,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -2982,7 +3008,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -2991,8 +3017,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3087,7 +3112,7 @@ if test "$enable_largefile" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : +if ${ac_cv_sys_largefile_CC+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -3138,7 +3163,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3207,7 +3232,7 @@ rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -3274,6 +3299,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -3792,7 +3819,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3804,7 +3831,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3832,7 +3859,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3844,7 +3871,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3885,7 +3912,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3897,7 +3924,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3925,7 +3952,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3938,7 +3965,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3984,7 +4011,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3996,7 +4023,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4028,7 +4055,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4040,7 +4067,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4083,7 +4110,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4112,7 +4139,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4149,7 +4176,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4227,7 +4254,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4236,8 +4263,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4326,7 +4352,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4370,7 +4396,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4390,7 +4416,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4450,7 +4476,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' set dummy bison; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_BISON+set}" = set; then : +if ${ac_cv_path_BISON+:} false; then : $as_echo_n "(cached) " >&6 else case $BISON in @@ -4464,7 +4490,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4490,7 +4516,7 @@ fi set dummy flex; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FLEX+set}" = set; then : +if ${ac_cv_path_FLEX+:} false; then : $as_echo_n "(cached) " >&6 else case $FLEX in @@ -4504,7 +4530,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4530,7 +4556,7 @@ fi set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : +if ${ac_cv_path_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -4544,7 +4570,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4577,7 +4603,7 @@ if test "x$xapi" = "xy"; then : set dummy curl-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CURL+set}" = set; then : +if ${ac_cv_path_CURL+:} false; then : $as_echo_n "(cached) " >&6 else case $CURL in @@ -4591,7 +4617,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4622,7 +4648,7 @@ fi set dummy xml2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XML+set}" = set; then : +if ${ac_cv_path_XML+:} false; then : $as_echo_n "(cached) " >&6 else case $XML in @@ -4636,7 +4662,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4673,7 +4699,7 @@ if test "x$ocamltools" = "xy"; then : set dummy ${ac_tool_prefix}ocamlc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLC+set}" = set; then : +if ${ac_cv_prog_OCAMLC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLC"; then @@ -4685,7 +4711,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLC="${ac_tool_prefix}ocamlc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4713,7 +4739,7 @@ if test -z "$ac_cv_prog_OCAMLC"; then set dummy ocamlc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OCAMLC+set}" = set; then : +if ${ac_cv_prog_ac_ct_OCAMLC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OCAMLC"; then @@ -4725,7 +4751,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OCAMLC="ocamlc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4784,7 +4810,7 @@ $as_echo "OCaml library path is $OCAMLLIB" >&6; } set dummy ${ac_tool_prefix}ocamlopt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLOPT+set}" = set; then : +if ${ac_cv_prog_OCAMLOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLOPT"; then @@ -4796,7 +4822,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4824,7 +4850,7 @@ if test -z "$ac_cv_prog_OCAMLOPT"; then set dummy ocamlopt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OCAMLOPT+set}" = set; then : +if ${ac_cv_prog_ac_ct_OCAMLOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OCAMLOPT"; then @@ -4836,7 +4862,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OCAMLOPT="ocamlopt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4894,7 +4920,7 @@ $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; } set dummy ${ac_tool_prefix}ocamlc.opt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OCAMLCDOTOPT+set}" = set; then : +if ${ac_cv_prog_OCAMLCDOTOPT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OCAMLCDOTOPT"; then @@ -4906,7 +4932,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4934,7 +4960,7 @@ if test -z "$ac_cv_prog_OCAMLCDOTOPT"; then set dummy ocamlc.opt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 10:22:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5D-0001ZA-Gc; Tue, 10 Sep 2013 10:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5D-0001Z0-2Q for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:07 +0000 Received: from [193.109.254.147:10077] by server-1.bemta-14.messagelabs.com id 15/C2-04740-EC2FE225; Tue, 10 Sep 2013 10:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378808522!1782411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1903 invoked from network); 10 Sep 2013 10:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 10:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL58-0005TR-BR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJL58-0003WF-2c for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:02 +0000 Date: Tue, 10 Sep 2013 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] oxenstored: Fix process.ml build after 070ab4c50593 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bf83fd0745fac6c48ea127fa271c7e2d62b15b5 Author: Ian Jackson AuthorDate: Mon Sep 9 15:30:42 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 9 17:30:53 2013 +0100 oxenstored: Fix process.ml build after 070ab4c50593 This change: 070ab4c505934951f86f42dd8403cf62bc5822f0 "oxenstored: Protect oxenstored from malicious domains" broke the build because it had an unresolved semantic (but not textual) conflict with c69fddbd5dfa3004aaf2d0f2dde00c9ec3dd6d5d "tools/ocaml: Remove log library from tools/ocaml/libs" (which is in 4.2 but not 4.1) Fix this by using the 4.1.x idiom in the new error handling introduced in 070ab4c50593. Signed-off-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/xenstored/process.ml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index bd87646..5c81755 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -372,8 +372,8 @@ let do_input store cons doms con = try Connection.do_input con with Failure exp -> - error "caught exception %s" exp; - error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Logs.error "general" "caught exception %s" exp; + Logs.error "general" "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); Connection.mark_as_bad con; false in -- 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 Tue Sep 10 10:22:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5D-0001ZA-Gc; Tue, 10 Sep 2013 10:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5D-0001Z0-2Q for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:07 +0000 Received: from [193.109.254.147:10077] by server-1.bemta-14.messagelabs.com id 15/C2-04740-EC2FE225; Tue, 10 Sep 2013 10:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1378808522!1782411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1903 invoked from network); 10 Sep 2013 10:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 10:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL58-0005TR-BR for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJL58-0003WF-2c for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:02 +0000 Date: Tue, 10 Sep 2013 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] oxenstored: Fix process.ml build after 070ab4c50593 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bf83fd0745fac6c48ea127fa271c7e2d62b15b5 Author: Ian Jackson AuthorDate: Mon Sep 9 15:30:42 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 9 17:30:53 2013 +0100 oxenstored: Fix process.ml build after 070ab4c50593 This change: 070ab4c505934951f86f42dd8403cf62bc5822f0 "oxenstored: Protect oxenstored from malicious domains" broke the build because it had an unresolved semantic (but not textual) conflict with c69fddbd5dfa3004aaf2d0f2dde00c9ec3dd6d5d "tools/ocaml: Remove log library from tools/ocaml/libs" (which is in 4.2 but not 4.1) Fix this by using the 4.1.x idiom in the new error handling introduced in 070ab4c50593. Signed-off-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/xenstored/process.ml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index bd87646..5c81755 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -372,8 +372,8 @@ let do_input store cons doms con = try Connection.do_input con with Failure exp -> - error "caught exception %s" exp; - error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Logs.error "general" "caught exception %s" exp; + Logs.error "general" "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); Connection.mark_as_bad con; false in -- 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 Tue Sep 10 10:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 10:22:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5N-0001aM-JE; Tue, 10 Sep 2013 10:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5M-0001aD-Q8 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:17 +0000 Received: from [85.158.137.68:36511] by server-5.bemta-3.messagelabs.com id 49/99-23058-8D2FE225; Tue, 10 Sep 2013 10:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1378808534!1196233!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4185 invoked from network); 10 Sep 2013 10:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 10:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5J-0005TU-W9 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJL5J-0003YJ-Oj for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:13 +0000 Message-Id: Date: Tue, 10 Sep 2013 10:22:13 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] evtchn: adjust CPU notifier registration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1378807571 -7200 # Node ID b94250095e987b539baa08c82d0f2861fa3c85fe # Parent f2d05cf62925cc1146c8ac37964b8f8bd82a69c3 evtchn: adjust CPU notifier registration While mostly benign in 2.6.18 (apart from avoiding registration of a notifier that would never do anything useful under !HOTPLUG_CPU), the distinction is quite relevant when backporting the driver to 2.6.16: register_cpu_notifier() is available to modules there even when !HOTPLUG_CPU, and thus no such notifier block must live in .cpuinit.data (or else modules calling register_cpu_notifier() will result in hitting an unmapped page when traversing the linked list of notifiers). Signed-off-by: Jan Beulich --- diff -r f2d05cf62925 -r b94250095e98 drivers/xen/evtchn/evtchn.c --- a/drivers/xen/evtchn/evtchn.c Thu Jun 20 14:38:29 2013 +0200 +++ b/drivers/xen/evtchn/evtchn.c Tue Sep 10 12:06:11 2013 +0200 @@ -492,7 +492,8 @@ static struct miscdevice evtchn_miscdev .fops = &evtchn_fops, }; -static int __cpuinit evtchn_cpu_notify(struct notifier_block *nfb, +#ifdef CONFIG_HOTPLUG_CPU +static int evtchn_cpu_notify(struct notifier_block *nfb, unsigned long action, void *hcpu) { int hotcpu = (unsigned long)hcpu; @@ -522,9 +523,10 @@ static int __cpuinit evtchn_cpu_notify(s return NOTIFY_OK; } -static struct notifier_block __cpuinitdata evtchn_cpu_nfb = { +static struct notifier_block evtchn_cpu_nfb = { .notifier_call = evtchn_cpu_notify }; +#endif static int __init evtchn_init(void) { @@ -543,7 +545,7 @@ static int __init evtchn_init(void) return err; } - register_cpu_notifier(&evtchn_cpu_nfb); + register_hotcpu_notifier(&evtchn_cpu_nfb); printk("Event-channel device installed.\n"); @@ -553,7 +555,7 @@ static int __init evtchn_init(void) static void __exit evtchn_cleanup(void) { misc_deregister(&evtchn_miscdev); - unregister_cpu_notifier(&evtchn_cpu_nfb); + unregister_hotcpu_notifier(&evtchn_cpu_nfb); } module_init(evtchn_init); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 10:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 10:22:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5N-0001aM-JE; Tue, 10 Sep 2013 10:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5M-0001aD-Q8 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:17 +0000 Received: from [85.158.137.68:36511] by server-5.bemta-3.messagelabs.com id 49/99-23058-8D2FE225; Tue, 10 Sep 2013 10:22:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1378808534!1196233!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4185 invoked from network); 10 Sep 2013 10:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 10:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJL5J-0005TU-W9 for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJL5J-0003YJ-Oj for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 10:22:13 +0000 Message-Id: Date: Tue, 10 Sep 2013 10:22:13 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] evtchn: adjust CPU notifier registration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1378807571 -7200 # Node ID b94250095e987b539baa08c82d0f2861fa3c85fe # Parent f2d05cf62925cc1146c8ac37964b8f8bd82a69c3 evtchn: adjust CPU notifier registration While mostly benign in 2.6.18 (apart from avoiding registration of a notifier that would never do anything useful under !HOTPLUG_CPU), the distinction is quite relevant when backporting the driver to 2.6.16: register_cpu_notifier() is available to modules there even when !HOTPLUG_CPU, and thus no such notifier block must live in .cpuinit.data (or else modules calling register_cpu_notifier() will result in hitting an unmapped page when traversing the linked list of notifiers). Signed-off-by: Jan Beulich --- diff -r f2d05cf62925 -r b94250095e98 drivers/xen/evtchn/evtchn.c --- a/drivers/xen/evtchn/evtchn.c Thu Jun 20 14:38:29 2013 +0200 +++ b/drivers/xen/evtchn/evtchn.c Tue Sep 10 12:06:11 2013 +0200 @@ -492,7 +492,8 @@ static struct miscdevice evtchn_miscdev .fops = &evtchn_fops, }; -static int __cpuinit evtchn_cpu_notify(struct notifier_block *nfb, +#ifdef CONFIG_HOTPLUG_CPU +static int evtchn_cpu_notify(struct notifier_block *nfb, unsigned long action, void *hcpu) { int hotcpu = (unsigned long)hcpu; @@ -522,9 +523,10 @@ static int __cpuinit evtchn_cpu_notify(s return NOTIFY_OK; } -static struct notifier_block __cpuinitdata evtchn_cpu_nfb = { +static struct notifier_block evtchn_cpu_nfb = { .notifier_call = evtchn_cpu_notify }; +#endif static int __init evtchn_init(void) { @@ -543,7 +545,7 @@ static int __init evtchn_init(void) return err; } - register_cpu_notifier(&evtchn_cpu_nfb); + register_hotcpu_notifier(&evtchn_cpu_nfb); printk("Event-channel device installed.\n"); @@ -553,7 +555,7 @@ static int __init evtchn_init(void) static void __exit evtchn_cleanup(void) { misc_deregister(&evtchn_miscdev); - unregister_cpu_notifier(&evtchn_cpu_nfb); + unregister_hotcpu_notifier(&evtchn_cpu_nfb); } module_init(evtchn_init); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 23:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 23:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXm3-0004Q1-64; Tue, 10 Sep 2013 23:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXlz-0004Pq-8Q for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:10 +0000 Received: from [85.158.143.35:24338] by server-3.bemta-4.messagelabs.com id 4E/60-08835-A51BF225; Tue, 10 Sep 2013 23:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378857304!269298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5942 invoked from network); 10 Sep 2013 23:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 23:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXlw-0006Xr-HE for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJXlv-0004UC-Hr for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:03 +0000 Date: Tue, 10 Sep 2013 23:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] update Xen version to 4.1.6.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8231a6762ad70aa00f54cb53424b7c850d4c286b Author: Jan Beulich AuthorDate: Tue Sep 10 08:42:18 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 08:42:18 2013 +0200 update Xen version to 4.1.6.1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index c5b6566..baeaaac 100644 --- a/Config.mk +++ b/Config.mk @@ -180,7 +180,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6 +QEMU_TAG ?= xen-4.1.6.1 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index 6d31962..726b5e9 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .6.1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 10 23:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Sep 2013 23:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXm3-0004Q1-64; Tue, 10 Sep 2013 23:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXlz-0004Pq-8Q for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:10 +0000 Received: from [85.158.143.35:24338] by server-3.bemta-4.messagelabs.com id 4E/60-08835-A51BF225; Tue, 10 Sep 2013 23:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1378857304!269298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5942 invoked from network); 10 Sep 2013 23:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2013 23:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJXlw-0006Xr-HE for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJXlv-0004UC-Hr for xen-changelog@lists.xensource.com; Tue, 10 Sep 2013 23:55:03 +0000 Date: Tue, 10 Sep 2013 23:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] update Xen version to 4.1.6.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8231a6762ad70aa00f54cb53424b7c850d4c286b Author: Jan Beulich AuthorDate: Tue Sep 10 08:42:18 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 08:42:18 2013 +0200 update Xen version to 4.1.6.1 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index c5b6566..baeaaac 100644 --- a/Config.mk +++ b/Config.mk @@ -180,7 +180,7 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6 +QEMU_TAG ?= xen-4.1.6.1 # Tue May 14 18:48:49 2013 +0100 # piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. diff --git a/xen/Makefile b/xen/Makefile index 6d31962..726b5e9 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 1 -export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .6.1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXG-0005LD-Co; Wed, 11 Sep 2013 05:00:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXE-0005L6-Id for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:12 +0000 Received: from [85.158.137.68:64922] by server-10.bemta-3.messagelabs.com id 18/ED-30473-BD8FF225; Wed, 11 Sep 2013 05:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378875609!1376202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2618 invoked from network); 11 Sep 2013 05:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXA-0000IK-Sk for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcX6-0005yZ-OY for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:08 +0000 Date: Wed, 11 Sep 2013 05:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: correct char array allocation for xenbus 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 f949cbbeda5dea85810de9eee7613add709e9e91 Author: Matt Wilson AuthorDate: Fri Sep 6 12:52:04 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:54:34 2013 +0100 minios: correct char array allocation for xenbus paths The char arrays used to hold xenbus paths have historically been allocated by manually counting the length longest string constants included in constructing the path. This has led to improperly sized buffers, both too large (with little consequence) and too small (which obviously causes problems). This patch corrects the instances where the length was incorrectly calculated by using strlen() on the longest string constant used in building a xenbus path. A follow-on clean-up patch will change all instances to use strlen(). Signed-off-by: Ben Cressey Cc: Stefano Stabellini Acked-By: Samuel Thibault [msw: split this patch from a larger patch from Ben, reworked to use strlen()] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 2 +- extras/mini-os/console/xenbus.c | 2 +- extras/mini-os/fbfront.c | 10 +++++----- extras/mini-os/netfront.c | 2 +- extras/mini-os/pcifront.c | 7 +++++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index f4283a9..70976f5 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -254,7 +254,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; blkfront_sync(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index e65baf7..1ecfcc5 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -158,7 +158,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 19 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 54a5e67..6eddb3c 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -158,8 +158,8 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 6 + 1]; - char frontpath[strlen(nodename) + 1 + 6 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -240,7 +240,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/request-abs-pointer") + 1]; printk("close kbd: backend at %s\n",dev->backend); @@ -521,7 +521,7 @@ done: { XenbusState state; char path[strlen(dev->backend) + 1 + 14 + 1]; - char frontpath[strlen(nodename) + 1 + 6 + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -632,7 +632,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/feature-update") + 1]; printk("close fb: backend at %s\n",dev->backend); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 6fa68a2..ddf56ea 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -508,7 +508,7 @@ void shutdown_netfront(struct netfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/request-rx-copy") + 1]; printk("close network: backend at %s\n",dev->backend); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index bbe21e0..f9ae768 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -323,7 +323,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; printk("close pci: backend at %s\n",dev->backend); @@ -379,7 +379,10 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev, unsigned int *slot, unsigned long *fun) { - char path[strlen(dev->backend) + 1 + 5 + 10 + 1]; + /* FIXME: the buffer sizing is a little lazy here. 10 extra bytes + should be enough to hold the paths we need to construct, even + if the number of devices is large */ + char path[strlen(dev->backend) + strlen("/num_devs") + 10 + 1]; int i, n; char *s, *msg = NULL; unsigned int dom1, bus1, slot1, fun1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXG-0005LD-Co; Wed, 11 Sep 2013 05:00:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXE-0005L6-Id for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:12 +0000 Received: from [85.158.137.68:64922] by server-10.bemta-3.messagelabs.com id 18/ED-30473-BD8FF225; Wed, 11 Sep 2013 05:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378875609!1376202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2618 invoked from network); 11 Sep 2013 05:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXA-0000IK-Sk for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcX6-0005yZ-OY for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:08 +0000 Date: Wed, 11 Sep 2013 05:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: correct char array allocation for xenbus 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 f949cbbeda5dea85810de9eee7613add709e9e91 Author: Matt Wilson AuthorDate: Fri Sep 6 12:52:04 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:54:34 2013 +0100 minios: correct char array allocation for xenbus paths The char arrays used to hold xenbus paths have historically been allocated by manually counting the length longest string constants included in constructing the path. This has led to improperly sized buffers, both too large (with little consequence) and too small (which obviously causes problems). This patch corrects the instances where the length was incorrectly calculated by using strlen() on the longest string constant used in building a xenbus path. A follow-on clean-up patch will change all instances to use strlen(). Signed-off-by: Ben Cressey Cc: Stefano Stabellini Acked-By: Samuel Thibault [msw: split this patch from a larger patch from Ben, reworked to use strlen()] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 2 +- extras/mini-os/console/xenbus.c | 2 +- extras/mini-os/fbfront.c | 10 +++++----- extras/mini-os/netfront.c | 2 +- extras/mini-os/pcifront.c | 7 +++++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index f4283a9..70976f5 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -254,7 +254,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; blkfront_sync(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index e65baf7..1ecfcc5 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -158,7 +158,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 19 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 54a5e67..6eddb3c 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -158,8 +158,8 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 6 + 1]; - char frontpath[strlen(nodename) + 1 + 6 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -240,7 +240,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/request-abs-pointer") + 1]; printk("close kbd: backend at %s\n",dev->backend); @@ -521,7 +521,7 @@ done: { XenbusState state; char path[strlen(dev->backend) + 1 + 14 + 1]; - char frontpath[strlen(nodename) + 1 + 6 + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -632,7 +632,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/feature-update") + 1]; printk("close fb: backend at %s\n",dev->backend); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 6fa68a2..ddf56ea 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -508,7 +508,7 @@ void shutdown_netfront(struct netfront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/request-rx-copy") + 1]; printk("close network: backend at %s\n",dev->backend); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index bbe21e0..f9ae768 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -323,7 +323,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; printk("close pci: backend at %s\n",dev->backend); @@ -379,7 +379,10 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev, unsigned int *slot, unsigned long *fun) { - char path[strlen(dev->backend) + 1 + 5 + 10 + 1]; + /* FIXME: the buffer sizing is a little lazy here. 10 extra bytes + should be enough to hold the paths we need to construct, even + if the number of devices is large */ + char path[strlen(dev->backend) + strlen("/num_devs") + 10 + 1]; int i, n; char *s, *msg = NULL; unsigned int dom1, bus1, slot1, fun1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXQ-0005M5-H0; Wed, 11 Sep 2013 05:00:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXO-0005Lj-Rj for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:23 +0000 Received: from [193.109.254.147:28228] by server-8.bemta-14.messagelabs.com id F8/40-14324-6E8FF225; Wed, 11 Sep 2013 05:00:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1378875620!1931265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6362 invoked from network); 11 Sep 2013 05:00: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; 11 Sep 2013 05:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXM-0000IN-2X for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXL-000603-Pl for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:19 +0000 Date: Wed, 11 Sep 2013 05:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: clean up allocation of char arrays used for xenbus 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 83789acac046c93170f00c1c8fc2c1452ff315a1 Author: Matt Wilson AuthorDate: Fri Sep 6 12:52:05 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:05 2013 +0100 minios: clean up allocation of char arrays used for xenbus paths This patch cleans up instances of char array allocation where string lengths were manually counted to use strlen() instead. There are no functional changes in this patch. Signed-off-by: Matt Wilson Cc: Stefano Stabellini Acked-By: Samuel Thibault --- extras/mini-os/blkfront.c | 6 +++--- extras/mini-os/console/xenbus.c | 4 ++-- extras/mini-os/fbfront.c | 10 +++++----- extras/mini-os/netfront.c | 4 ++-- extras/mini-os/pcifront.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 70976f5..73837f6 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -99,7 +99,7 @@ struct blkfront_dev *init_blkfront(char *_nodename, struct blkfront_info *info) struct blkfront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* BLKFRONT for %s **********\n\n\n", nodename); @@ -189,7 +189,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 19 + 1]; + char path[strlen(dev->backend) + strlen("/feature-flush-cache") + 1]; snprintf(path, sizeof(path), "%s/mode", dev->backend); msg = xenbus_read(XBT_NIL, path, &c); if (msg) { @@ -253,7 +253,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; blkfront_sync(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 1ecfcc5..23d4d32 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -18,8 +18,8 @@ void free_consfront(struct consfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char nodename[strlen(dev->nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 6eddb3c..9148496 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -75,7 +75,7 @@ struct kbdfront_dev *init_kbdfront(char *_nodename, int abs_pointer) char* nodename = _nodename ? _nodename : "device/vkbd/0"; struct kbdfront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* KBDFRONT for %s **********\n\n\n", nodename); @@ -239,7 +239,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/request-abs-pointer") + 1]; printk("close kbd: backend at %s\n",dev->backend); @@ -413,7 +413,7 @@ struct fbfront_dev *init_fbfront(char *_nodename, unsigned long *mfns, int width unsigned long mapped; char* nodename = _nodename ? _nodename : "device/vfb/0"; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* FBFRONT for %s **********\n\n\n", nodename); @@ -520,7 +520,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 14 + 1]; + char path[strlen(dev->backend) + strlen("/request-update") + 1]; char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -631,7 +631,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/feature-update") + 1]; printk("close fb: backend at %s\n",dev->backend); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index ddf56ea..7947fc2 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -441,7 +441,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); @@ -507,7 +507,7 @@ void shutdown_netfront(struct netfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/request-rx-copy") + 1]; printk("close network: backend at %s\n",dev->backend); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index f9ae768..e6a5f4e 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -149,7 +149,7 @@ struct pcifront_dev *init_pcifront(char *_nodename) struct pcifront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; if (!_nodename && pcidev) return pcidev; @@ -237,8 +237,8 @@ done: printk("backend at %s\n", dev->backend); { - char path[strlen(dev->backend) + 1 + 5 + 1]; - char frontpath[strlen(nodename) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; XenbusState state; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -322,7 +322,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; printk("close pci: backend at %s\n",dev->backend); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXQ-0005M5-H0; Wed, 11 Sep 2013 05:00:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXO-0005Lj-Rj for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:23 +0000 Received: from [193.109.254.147:28228] by server-8.bemta-14.messagelabs.com id F8/40-14324-6E8FF225; Wed, 11 Sep 2013 05:00:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1378875620!1931265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6362 invoked from network); 11 Sep 2013 05:00: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; 11 Sep 2013 05:00:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXM-0000IN-2X for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXL-000603-Pl for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:19 +0000 Date: Wed, 11 Sep 2013 05:00:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: clean up allocation of char arrays used for xenbus 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 83789acac046c93170f00c1c8fc2c1452ff315a1 Author: Matt Wilson AuthorDate: Fri Sep 6 12:52:05 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:05 2013 +0100 minios: clean up allocation of char arrays used for xenbus paths This patch cleans up instances of char array allocation where string lengths were manually counted to use strlen() instead. There are no functional changes in this patch. Signed-off-by: Matt Wilson Cc: Stefano Stabellini Acked-By: Samuel Thibault --- extras/mini-os/blkfront.c | 6 +++--- extras/mini-os/console/xenbus.c | 4 ++-- extras/mini-os/fbfront.c | 10 +++++----- extras/mini-os/netfront.c | 4 ++-- extras/mini-os/pcifront.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 70976f5..73837f6 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -99,7 +99,7 @@ struct blkfront_dev *init_blkfront(char *_nodename, struct blkfront_info *info) struct blkfront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* BLKFRONT for %s **********\n\n\n", nodename); @@ -189,7 +189,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 19 + 1]; + char path[strlen(dev->backend) + strlen("/feature-flush-cache") + 1]; snprintf(path, sizeof(path), "%s/mode", dev->backend); msg = xenbus_read(XBT_NIL, path, &c); if (msg) { @@ -253,7 +253,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; blkfront_sync(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 1ecfcc5..23d4d32 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -18,8 +18,8 @@ void free_consfront(struct consfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; - char nodename[strlen(dev->nodename) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char nodename[strlen(dev->nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 6eddb3c..9148496 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -75,7 +75,7 @@ struct kbdfront_dev *init_kbdfront(char *_nodename, int abs_pointer) char* nodename = _nodename ? _nodename : "device/vkbd/0"; struct kbdfront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* KBDFRONT for %s **********\n\n\n", nodename); @@ -239,7 +239,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/request-abs-pointer") + 1]; printk("close kbd: backend at %s\n",dev->backend); @@ -413,7 +413,7 @@ struct fbfront_dev *init_fbfront(char *_nodename, unsigned long *mfns, int width unsigned long mapped; char* nodename = _nodename ? _nodename : "device/vfb/0"; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; printk("******************* FBFRONT for %s **********\n\n\n", nodename); @@ -520,7 +520,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 14 + 1]; + char path[strlen(dev->backend) + strlen("/request-update") + 1]; char frontpath[strlen(nodename) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -631,7 +631,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/feature-update") + 1]; printk("close fb: backend at %s\n",dev->backend); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index ddf56ea..7947fc2 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -441,7 +441,7 @@ done: { XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); @@ -507,7 +507,7 @@ void shutdown_netfront(struct netfront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/request-rx-copy") + 1]; printk("close network: backend at %s\n",dev->backend); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index f9ae768..e6a5f4e 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -149,7 +149,7 @@ struct pcifront_dev *init_pcifront(char *_nodename) struct pcifront_dev *dev; - char path[strlen(nodename) + 1 + 10 + 1]; + char path[strlen(nodename) + strlen("/backend-id") + 1]; if (!_nodename && pcidev) return pcidev; @@ -237,8 +237,8 @@ done: printk("backend at %s\n", dev->backend); { - char path[strlen(dev->backend) + 1 + 5 + 1]; - char frontpath[strlen(nodename) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; + char frontpath[strlen(nodename) + strlen("/state") + 1]; XenbusState state; snprintf(path, sizeof(path), "%s/state", dev->backend); @@ -322,7 +322,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) char* err = NULL; XenbusState state; - char path[strlen(dev->backend) + 1 + 5 + 1]; + char path[strlen(dev->backend) + strlen("/state") + 1]; char nodename[strlen(dev->nodename) + strlen("/event-channel") + 1]; printk("close pci: backend at %s\n",dev->backend); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXZ-0005NG-Kd; Wed, 11 Sep 2013 05:00:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXZ-0005N6-8h for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:33 +0000 Received: from [85.158.143.35:45569] by server-1.bemta-4.messagelabs.com id E5/41-16125-0F8FF225; Wed, 11 Sep 2013 05:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378875630!1922465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22030 invoked from network); 11 Sep 2013 05:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXW-0000IV-DY for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXW-00060o-BE for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:30 +0000 Date: Wed, 11 Sep 2013 05:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: clean up unneeded "err = NULL" in frontend drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319e8ee03c88002cf7a3f4da49b3ecbc29eb698e Author: Ben Cressey AuthorDate: Fri Sep 6 12:52:06 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:10 2013 +0100 minios: clean up unneeded "err = NULL" in frontend drivers This patch removes cases where the error message pointer is already NULL and is then set to NULL. These are harmless, but suggest incorrect practice: the pointer should be passed to free() to deallocate memory prior to reassignment. There are no functional changes in this patch. Signed-off-by: Ben Cressey Reviewed-by: Matt Wilson Cc: Stefano Stabellini Acked-by: Samuel Thibault [msw: split a larger patch from Ben into this cleanup patch] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 1 - extras/mini-os/fbfront.c | 3 --- extras/mini-os/netfront.c | 1 - extras/mini-os/pcifront.c | 1 - 4 files changed, 0 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 73837f6..dd5e95f 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -289,7 +289,6 @@ void shutdown_blkfront(struct blkfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 9148496..8b4466a 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -272,7 +272,6 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) XenbusStateInitialising, err); goto close_kbdfront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); @@ -664,8 +663,6 @@ void shutdown_fbfront(struct fbfront_dev *dev) XenbusStateInitialising, err); goto close_fbfront; } - - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 7947fc2..dc29f14 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -541,7 +541,6 @@ void shutdown_netfront(struct netfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index e6a5f4e..df300b5 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -355,7 +355,6 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusStateInitialising, err); goto close_pcifront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXZ-0005NG-Kd; Wed, 11 Sep 2013 05:00:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXZ-0005N6-8h for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:33 +0000 Received: from [85.158.143.35:45569] by server-1.bemta-4.messagelabs.com id E5/41-16125-0F8FF225; Wed, 11 Sep 2013 05:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1378875630!1922465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22030 invoked from network); 11 Sep 2013 05:00:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXW-0000IV-DY for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXW-00060o-BE for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:30 +0000 Date: Wed, 11 Sep 2013 05:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: clean up unneeded "err = NULL" in frontend drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 319e8ee03c88002cf7a3f4da49b3ecbc29eb698e Author: Ben Cressey AuthorDate: Fri Sep 6 12:52:06 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:10 2013 +0100 minios: clean up unneeded "err = NULL" in frontend drivers This patch removes cases where the error message pointer is already NULL and is then set to NULL. These are harmless, but suggest incorrect practice: the pointer should be passed to free() to deallocate memory prior to reassignment. There are no functional changes in this patch. Signed-off-by: Ben Cressey Reviewed-by: Matt Wilson Cc: Stefano Stabellini Acked-by: Samuel Thibault [msw: split a larger patch from Ben into this cleanup patch] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 1 - extras/mini-os/fbfront.c | 3 --- extras/mini-os/netfront.c | 1 - extras/mini-os/pcifront.c | 1 - 4 files changed, 0 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index 73837f6..dd5e95f 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -289,7 +289,6 @@ void shutdown_blkfront(struct blkfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 9148496..8b4466a 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -272,7 +272,6 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) XenbusStateInitialising, err); goto close_kbdfront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); @@ -664,8 +663,6 @@ void shutdown_fbfront(struct fbfront_dev *dev) XenbusStateInitialising, err); goto close_fbfront; } - - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 7947fc2..dc29f14 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -541,7 +541,6 @@ void shutdown_netfront(struct netfront_dev *dev) XenbusStateInitialising, err); goto close; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index e6a5f4e..df300b5 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -355,7 +355,6 @@ void shutdown_pcifront(struct pcifront_dev *dev) XenbusStateInitialising, err); goto close_pcifront; } - err = NULL; state = xenbus_read_integer(path); while (err == NULL && (state < XenbusStateInitWait || state >= XenbusStateClosed)) err = xenbus_wait_for_state_change(path, &state, &dev->events); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXk-0005Ou-SY; Wed, 11 Sep 2013 05:00:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXj-0005Ob-Ha for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:43 +0000 Received: from [193.109.254.147:29476] by server-15.bemta-14.messagelabs.com id 3C/2C-10716-AF8FF225; Wed, 11 Sep 2013 05:00:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1378875640!1936370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28295 invoked from network); 11 Sep 2013 05:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXg-0000Ib-QA for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXg-00061h-L6 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:40 +0000 Date: Wed, 11 Sep 2013 05:00:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: fix xenbus_rm() calls in frontend drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a320c05b828275c19ae5b816715be8453ea2f190 Author: Ben Cressey AuthorDate: Fri Sep 6 12:52:07 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:17 2013 +0100 minios: fix xenbus_rm() calls in frontend drivers The commit "minios: refactor xenbus state machine" caused "/state" to be appended to the local value of nodename. Previously the nodename variable pointed to dev->nodename. The xenbus_rm() calls were not updated to reflect this change, and refer to paths that do not exist. For example, shutdown_blkfront() for vbd 2049 would issue these calls: xenbus_rm(XBT_NIL, "device/vbd/2049/state/ring-ref"); xenbus_rm(XBT_NIL, "device/vbd/2049/state/event-channel"); This patch restores the previous behavior, issuing these calls instead: xenbus_rm(XBT_NIL, "device/vbd/2049/ring-ref"); xenbus_rm(XBT_NIL, "device/vbd/2049/event-channel"); This causes frontend drivers to not be properly reset when PV-GRUB exists. Some PV Linux drivers fail to re-initialize frontend devices if PV-GRUB leaves them in this state. Signed-off-by: Ben Cressey Reviewed-by: Matt Wilson Cc: Stefano Stabellini Acked-by: Samuel Thibault [msw: adjusted commit message to include consequences, split out changes into separate patches] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 8 ++++---- extras/mini-os/fbfront.c | 28 ++++++++++++++-------------- extras/mini-os/netfront.c | 16 ++++++++-------- extras/mini-os/pcifront.c | 8 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index dd5e95f..ddcf665 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -297,10 +297,10 @@ close: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_blkfront(dev); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 8b4466a..3d0b8f5 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -280,12 +280,12 @@ close_kbdfront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/page-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/request-abs-pointer", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_kbdfront(dev); @@ -671,14 +671,14 @@ close_fbfront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/page-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/protocol", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/feature-update", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_fbfront(dev); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index dc29f14..4e087a5 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -549,14 +549,14 @@ close: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/tx-ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/rx-ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/request-rx-copy", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_netfront(dev); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index df300b5..cdf9c9b 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -363,10 +363,10 @@ close_pcifront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/info-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_pcifront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:00:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:00:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXk-0005Ou-SY; Wed, 11 Sep 2013 05:00:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXj-0005Ob-Ha for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:43 +0000 Received: from [193.109.254.147:29476] by server-15.bemta-14.messagelabs.com id 3C/2C-10716-AF8FF225; Wed, 11 Sep 2013 05:00:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1378875640!1936370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28295 invoked from network); 11 Sep 2013 05:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXg-0000Ib-QA for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXg-00061h-L6 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:40 +0000 Date: Wed, 11 Sep 2013 05:00:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] minios: fix xenbus_rm() calls in frontend drivers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a320c05b828275c19ae5b816715be8453ea2f190 Author: Ben Cressey AuthorDate: Fri Sep 6 12:52:07 2013 -0700 Commit: Ian Campbell CommitDate: Tue Sep 10 10:55:17 2013 +0100 minios: fix xenbus_rm() calls in frontend drivers The commit "minios: refactor xenbus state machine" caused "/state" to be appended to the local value of nodename. Previously the nodename variable pointed to dev->nodename. The xenbus_rm() calls were not updated to reflect this change, and refer to paths that do not exist. For example, shutdown_blkfront() for vbd 2049 would issue these calls: xenbus_rm(XBT_NIL, "device/vbd/2049/state/ring-ref"); xenbus_rm(XBT_NIL, "device/vbd/2049/state/event-channel"); This patch restores the previous behavior, issuing these calls instead: xenbus_rm(XBT_NIL, "device/vbd/2049/ring-ref"); xenbus_rm(XBT_NIL, "device/vbd/2049/event-channel"); This causes frontend drivers to not be properly reset when PV-GRUB exists. Some PV Linux drivers fail to re-initialize frontend devices if PV-GRUB leaves them in this state. Signed-off-by: Ben Cressey Reviewed-by: Matt Wilson Cc: Stefano Stabellini Acked-by: Samuel Thibault [msw: adjusted commit message to include consequences, split out changes into separate patches] Signed-off-by: Matt Wilson --- extras/mini-os/blkfront.c | 8 ++++---- extras/mini-os/fbfront.c | 28 ++++++++++++++-------------- extras/mini-os/netfront.c | 16 ++++++++-------- extras/mini-os/pcifront.c | 8 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index dd5e95f..ddcf665 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -297,10 +297,10 @@ close: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_blkfront(dev); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 8b4466a..3d0b8f5 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -280,12 +280,12 @@ close_kbdfront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/page-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/request-abs-pointer", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_kbdfront(dev); @@ -671,14 +671,14 @@ close_fbfront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/page-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/protocol", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/feature-update", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_fbfront(dev); diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index dc29f14..4e087a5 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -549,14 +549,14 @@ close: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/tx-ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/rx-ring-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/request-rx-copy", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_netfront(dev); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index df300b5..cdf9c9b 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -363,10 +363,10 @@ close_pcifront: if (err) free(err); xenbus_unwatch_path_token(XBT_NIL, path, path); - snprintf(path, sizeof(path), "%s/info-ref", nodename); - xenbus_rm(XBT_NIL, path); - snprintf(path, sizeof(path), "%s/event-channel", nodename); - xenbus_rm(XBT_NIL, path); + snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); + xenbus_rm(XBT_NIL, nodename); + snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); + xenbus_rm(XBT_NIL, nodename); if (!err) free_pcifront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXv-0005Qs-4I; Wed, 11 Sep 2013 05:00:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXt-0005QT-NC for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:53 +0000 Received: from [193.109.254.147:18117] by server-13.bemta-14.messagelabs.com id E0/99-01215-509FF225; Wed, 11 Sep 2013 05:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1378875651!1936399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29763 invoked from network); 11 Sep 2013 05:00:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXr-0000Ih-2m for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXr-00062w-0U for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:51 +0000 Date: Wed, 11 Sep 2013 05:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Introduce __initconst to store initial const data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 887915680a701a2e258676a6c97ae0599ac9e3fe Author: Julien Grall AuthorDate: Wed Aug 28 15:47:16 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:01:08 2013 +0100 xen: Introduce __initconst to store initial const data It's possible to have 2 type (const and non-const) of data in the same compilation unit. Using only __initdata will result to a compilation error: error: $variablename causes as section tupe conflict with $variablename2 because a section containing const variables is marked read only and so cannot contain non-const variables. Signed-off-by: Julien Grall Acked-by: Ian Cambell CC: Jan Beulich CC: Keir Fraser --- xen/include/xen/init.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index b602577..9d481b3 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -10,6 +10,7 @@ #define __init __text_section(".init.text") #define __exit __text_section(".exit.text") #define __initdata __section(".init.data") +#define __initconst __section(".init.rodata") #define __exitdata __used_section(".exit.data") #define __initsetup __used_section(".init.setup") #define __init_call(lvl) __used_section(".initcall" lvl ".init") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXv-0005Qs-4I; Wed, 11 Sep 2013 05:00:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXt-0005QT-NC for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:53 +0000 Received: from [193.109.254.147:18117] by server-13.bemta-14.messagelabs.com id E0/99-01215-509FF225; Wed, 11 Sep 2013 05:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1378875651!1936399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29763 invoked from network); 11 Sep 2013 05:00:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcXr-0000Ih-2m for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcXr-00062w-0U for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:00:51 +0000 Date: Wed, 11 Sep 2013 05:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Introduce __initconst to store initial const data X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 887915680a701a2e258676a6c97ae0599ac9e3fe Author: Julien Grall AuthorDate: Wed Aug 28 15:47:16 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:01:08 2013 +0100 xen: Introduce __initconst to store initial const data It's possible to have 2 type (const and non-const) of data in the same compilation unit. Using only __initdata will result to a compilation error: error: $variablename causes as section tupe conflict with $variablename2 because a section containing const variables is marked read only and so cannot contain non-const variables. Signed-off-by: Julien Grall Acked-by: Ian Cambell CC: Jan Beulich CC: Keir Fraser --- xen/include/xen/init.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index b602577..9d481b3 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -10,6 +10,7 @@ #define __init __text_section(".init.text") #define __exit __text_section(".exit.text") #define __initdata __section(".init.data") +#define __initconst __section(".init.rodata") #define __exitdata __used_section(".exit.data") #define __initsetup __used_section(".init.setup") #define __init_call(lvl) __used_section(".initcall" lvl ".init") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY5-0005Sp-8g; Wed, 11 Sep 2013 05:01:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY3-0005SO-RN for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:04 +0000 Received: from [193.109.254.147:30556] by server-1.bemta-14.messagelabs.com id 6C/D3-04740-F09FF225; Wed, 11 Sep 2013 05:01:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1378875661!1927069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8744 invoked from network); 11 Sep 2013 05:01:02 -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; 11 Sep 2013 05:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY1-0000Iq-8a for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcY1-00063e-6V for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:01 +0000 Date: Wed, 11 Sep 2013 05:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Don't check the number of address and size cells in process_cpu_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50718fc3c5981df5c393a97b7b5a0dcc9ba78004 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:17 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:04:44 2013 +0100 xen/dts: Don't check the number of address and size cells in process_cpu_node CPU nodes are not required to have #address-cells == 1 and #size-cells == 0, so don't check for that (see Linux Documentation/devicetree/booting-without-of.txt Section III.5.a). In some OMAP5 device, tree, these 2 properties are not correctly set. Therefore, Xen will only able to handle 1 CPU. Signed-off-by: Julien Grall Acked-by: Ian Campbell CC: andrii.anisov@globallogic.com CC: baozich@gmail.com --- xen/common/device_tree.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3a3c99c..c4f0f2c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -414,12 +414,6 @@ static void __init process_cpu_node(const void *fdt, int node, const u32 *cell; paddr_t start, size; - if ( address_cells != 1 || size_cells != 0 ) - { - early_printk("fdt: node `%s': invalid #address-cells or #size-cells", - name); - return; - } prop = fdt_get_property(fdt, node, "reg", NULL); if ( !prop ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY5-0005Sp-8g; Wed, 11 Sep 2013 05:01:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY3-0005SO-RN for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:04 +0000 Received: from [193.109.254.147:30556] by server-1.bemta-14.messagelabs.com id 6C/D3-04740-F09FF225; Wed, 11 Sep 2013 05:01:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1378875661!1927069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8744 invoked from network); 11 Sep 2013 05:01:02 -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; 11 Sep 2013 05:01:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcY1-0000Iq-8a for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcY1-00063e-6V for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:01 +0000 Date: Wed, 11 Sep 2013 05:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Don't check the number of address and size cells in process_cpu_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50718fc3c5981df5c393a97b7b5a0dcc9ba78004 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:17 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:04:44 2013 +0100 xen/dts: Don't check the number of address and size cells in process_cpu_node CPU nodes are not required to have #address-cells == 1 and #size-cells == 0, so don't check for that (see Linux Documentation/devicetree/booting-without-of.txt Section III.5.a). In some OMAP5 device, tree, these 2 properties are not correctly set. Therefore, Xen will only able to handle 1 CPU. Signed-off-by: Julien Grall Acked-by: Ian Campbell CC: andrii.anisov@globallogic.com CC: baozich@gmail.com --- xen/common/device_tree.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3a3c99c..c4f0f2c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -414,12 +414,6 @@ static void __init process_cpu_node(const void *fdt, int node, const u32 *cell; paddr_t start, size; - if ( address_cells != 1 || size_cells != 0 ) - { - early_printk("fdt: node `%s': invalid #address-cells or #size-cells", - name); - return; - } prop = fdt_get_property(fdt, node, "reg", NULL); if ( !prop ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYG-0005VT-Bp; Wed, 11 Sep 2013 05:01:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYE-0005Ux-Em for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:14 +0000 Received: from [85.158.137.68:17578] by server-12.bemta-3.messagelabs.com id 4B/4D-11891-919FF225; Wed, 11 Sep 2013 05:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378875672!1378932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4030 invoked from network); 11 Sep 2013 05:01:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYB-0000JW-Q9 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYB-00064W-Cm for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:11 +0000 Date: Wed, 11 Sep 2013 05:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Move __PSCI* from traps.c to the header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6fb0c4b80b129ba2bf946de2db170ec99c7b114 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:01 2013 +0100 xen/arm: Move __PSCI* from traps.c to the header These defines will be used to create the fake PSCI node in dom0 device tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 5 ----- xen/include/asm-arm/psci.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index a30797c..0e9a141 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -848,11 +848,6 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL_ARM(vcpu_op, 3), }; -#define __PSCI_cpu_suspend 0 -#define __PSCI_cpu_off 1 -#define __PSCI_cpu_on 2 -#define __PSCI_migrate 3 - typedef int (*arm_psci_fn_t)(uint32_t, register_t); typedef struct { diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index 67d4c35..fdba636 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -6,6 +6,11 @@ #define PSCI_EINVAL -2 #define PSCI_DENIED -3 +#define __PSCI_cpu_suspend 0 +#define __PSCI_cpu_off 1 +#define __PSCI_cpu_on 2 +#define __PSCI_migrate 3 + int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); int do_psci_cpu_off(uint32_t power_state); int do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYG-0005VT-Bp; Wed, 11 Sep 2013 05:01:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYE-0005Ux-Em for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:14 +0000 Received: from [85.158.137.68:17578] by server-12.bemta-3.messagelabs.com id 4B/4D-11891-919FF225; Wed, 11 Sep 2013 05:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1378875672!1378932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4030 invoked from network); 11 Sep 2013 05:01:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:01:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYB-0000JW-Q9 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYB-00064W-Cm for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:11 +0000 Date: Wed, 11 Sep 2013 05:01:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Move __PSCI* from traps.c to the header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6fb0c4b80b129ba2bf946de2db170ec99c7b114 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:01 2013 +0100 xen/arm: Move __PSCI* from traps.c to the header These defines will be used to create the fake PSCI node in dom0 device tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 5 ----- xen/include/asm-arm/psci.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index a30797c..0e9a141 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -848,11 +848,6 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL_ARM(vcpu_op, 3), }; -#define __PSCI_cpu_suspend 0 -#define __PSCI_cpu_off 1 -#define __PSCI_cpu_on 2 -#define __PSCI_migrate 3 - typedef int (*arm_psci_fn_t)(uint32_t, register_t); typedef struct { diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index 67d4c35..fdba636 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -6,6 +6,11 @@ #define PSCI_EINVAL -2 #define PSCI_DENIED -3 +#define __PSCI_cpu_suspend 0 +#define __PSCI_cpu_off 1 +#define __PSCI_cpu_on 2 +#define __PSCI_migrate 3 + int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); int do_psci_cpu_off(uint32_t power_state); int do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01: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 1VJcYQ-0005Xb-F3; Wed, 11 Sep 2013 05:01:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYO-0005X9-KR for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:24 +0000 Received: from [85.158.139.211:44767] by server-11.bemta-5.messagelabs.com id A1/89-10409-329FF225; Wed, 11 Sep 2013 05:01:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378875682!1826297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22967 invoked from network); 11 Sep 2013 05:01:23 -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; 11 Sep 2013 05:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYM-0000Jc-1M for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYL-00065M-Uj for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:22 +0000 Date: Wed, 11 Sep 2013 05:01:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Add new string function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bc02f74af03e65b5bb62450c1be43ea0f5d2989 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:20 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:01 2013 +0100 xen: Add new string function Add strcasecmp. The code is copied from Linux. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/string.c | 15 +++++++++++++++ xen/include/xen/string.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/common/string.c b/xen/common/string.c index db9d9d5..9a5a4ba 100644 --- a/xen/common/string.c +++ b/xen/common/string.c @@ -41,6 +41,21 @@ int strnicmp(const char *s1, const char *s2, size_t len) } #endif +#ifndef __HAVE_ARCH_STRCASECMP +int strcasecmp(const char *s1, const char *s2) +{ + int c1, c2; + + do + { + c1 = tolower(*s1++); + c2 = tolower(*s2++); + } while ( c1 == c2 && c1 != 0 ); + + return c1 - c2; +} +#endif + #ifndef __HAVE_ARCH_STRLCPY /** * strlcpy - Copy a %NUL terminated string into a sized buffer diff --git a/xen/include/xen/string.h b/xen/include/xen/string.h index f26b994..f35934e 100644 --- a/xen/include/xen/string.h +++ b/xen/include/xen/string.h @@ -43,6 +43,9 @@ extern int strncmp(const char *,const char *,__kernel_size_t); #ifndef __HAVE_ARCH_STRNICMP extern int strnicmp(const char *, const char *, __kernel_size_t); #endif +#ifndef __HAVE_ARCH_STRCASECMP +extern int strcasecmp(const char *, const char *); +#endif #ifndef __HAVE_ARCH_STRCHR extern char * strchr(const char *,int); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01: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 1VJcYQ-0005Xb-F3; Wed, 11 Sep 2013 05:01:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYO-0005X9-KR for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:24 +0000 Received: from [85.158.139.211:44767] by server-11.bemta-5.messagelabs.com id A1/89-10409-329FF225; Wed, 11 Sep 2013 05:01:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1378875682!1826297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22967 invoked from network); 11 Sep 2013 05:01:23 -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; 11 Sep 2013 05:01:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYM-0000Jc-1M for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYL-00065M-Uj for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:22 +0000 Date: Wed, 11 Sep 2013 05:01:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Add new string function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6bc02f74af03e65b5bb62450c1be43ea0f5d2989 Author: Julien Grall AuthorDate: Wed Aug 28 15:47:20 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:01 2013 +0100 xen: Add new string function Add strcasecmp. The code is copied from Linux. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/string.c | 15 +++++++++++++++ xen/include/xen/string.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/common/string.c b/xen/common/string.c index db9d9d5..9a5a4ba 100644 --- a/xen/common/string.c +++ b/xen/common/string.c @@ -41,6 +41,21 @@ int strnicmp(const char *s1, const char *s2, size_t len) } #endif +#ifndef __HAVE_ARCH_STRCASECMP +int strcasecmp(const char *s1, const char *s2) +{ + int c1, c2; + + do + { + c1 = tolower(*s1++); + c2 = tolower(*s2++); + } while ( c1 == c2 && c1 != 0 ); + + return c1 - c2; +} +#endif + #ifndef __HAVE_ARCH_STRLCPY /** * strlcpy - Copy a %NUL terminated string into a sized buffer diff --git a/xen/include/xen/string.h b/xen/include/xen/string.h index f26b994..f35934e 100644 --- a/xen/include/xen/string.h +++ b/xen/include/xen/string.h @@ -43,6 +43,9 @@ extern int strncmp(const char *,const char *,__kernel_size_t); #ifndef __HAVE_ARCH_STRNICMP extern int strnicmp(const char *, const char *, __kernel_size_t); #endif +#ifndef __HAVE_ARCH_STRCASECMP +extern int strcasecmp(const char *, const char *); +#endif #ifndef __HAVE_ARCH_STRCHR extern char * strchr(const char *,int); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01: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 1VJcYa-0005Zl-Hu; Wed, 11 Sep 2013 05:01:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYY-0005ZL-SG for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:35 +0000 Received: from [85.158.143.35:63844] by server-3.bemta-4.messagelabs.com id AE/92-08835-E29FF225; Wed, 11 Sep 2013 05:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1378875692!2835351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7066 invoked from network); 11 Sep 2013 05:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYW-0000Jk-9Z for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYW-000665-5r for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:32 +0000 Date: Wed, 11 Sep 2013 05:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/pm: Fix NULL pointer checks. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bd26ee30d01c36cb94f9a246bf03e8b4f902da9 Author: Andrew Cooper AuthorDate: Tue Sep 10 10:29:39 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxc/pm: Fix NULL pointer checks. Discovered by Coverity, CIDs 1054968 1054969 1054970 1054971 1054972 1054973 10549704 This was broken by c/s 5cc436c1d2b3b0 which did a blanket change of 'int xc_handle' -> 'xc_interface *xch'. The types got updated, but error conditions were left as-were. (I suspect some sed was involved originally) Also while playing around in this area, fix up some of the bracketing style to match the Xen coding style. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson --- tools/libxc/xc_pm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index fa9b246..ea1e251 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -285,7 +285,7 @@ int xc_set_cpufreq_gov(xc_interface *xch, int cpuid, char *govname) DECLARE_SYSCTL; char *scaling_governor = sysctl.u.pm_op.u.set_gov.scaling_governor; - if ( (xch < 0) || (!govname) ) + if ( !xch || !govname ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -302,7 +302,7 @@ int xc_set_cpufreq_para(xc_interface *xch, int cpuid, { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -319,7 +319,7 @@ int xc_get_cpufreq_avgfreq(xc_interface *xch, int cpuid, int *avg_freq) int ret = 0; DECLARE_SYSCTL; - if ( (xch < 0) || (!avg_freq) ) + if ( !xch || !avg_freq ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -384,7 +384,7 @@ int xc_get_cpuidle_max_cstate(xc_interface *xch, uint32_t *value) int rc; DECLARE_SYSCTL; - if ( xch < 0 || !value ) + if ( !xch || !value ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -401,7 +401,7 @@ int xc_set_cpuidle_max_cstate(xc_interface *xch, uint32_t value) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -416,7 +416,7 @@ int xc_enable_turbo(xc_interface *xch, int cpuid) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -429,7 +429,7 @@ int xc_disable_turbo(xc_interface *xch, int cpuid) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_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 Wed Sep 11 05:01:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01: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 1VJcYa-0005Zl-Hu; Wed, 11 Sep 2013 05:01:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYY-0005ZL-SG for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:35 +0000 Received: from [85.158.143.35:63844] by server-3.bemta-4.messagelabs.com id AE/92-08835-E29FF225; Wed, 11 Sep 2013 05:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1378875692!2835351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7066 invoked from network); 11 Sep 2013 05:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:01:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYW-0000Jk-9Z for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYW-000665-5r for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:32 +0000 Date: Wed, 11 Sep 2013 05:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/pm: Fix NULL pointer checks. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bd26ee30d01c36cb94f9a246bf03e8b4f902da9 Author: Andrew Cooper AuthorDate: Tue Sep 10 10:29:39 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxc/pm: Fix NULL pointer checks. Discovered by Coverity, CIDs 1054968 1054969 1054970 1054971 1054972 1054973 10549704 This was broken by c/s 5cc436c1d2b3b0 which did a blanket change of 'int xc_handle' -> 'xc_interface *xch'. The types got updated, but error conditions were left as-were. (I suspect some sed was involved originally) Also while playing around in this area, fix up some of the bracketing style to match the Xen coding style. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson --- tools/libxc/xc_pm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index fa9b246..ea1e251 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -285,7 +285,7 @@ int xc_set_cpufreq_gov(xc_interface *xch, int cpuid, char *govname) DECLARE_SYSCTL; char *scaling_governor = sysctl.u.pm_op.u.set_gov.scaling_governor; - if ( (xch < 0) || (!govname) ) + if ( !xch || !govname ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -302,7 +302,7 @@ int xc_set_cpufreq_para(xc_interface *xch, int cpuid, { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -319,7 +319,7 @@ int xc_get_cpufreq_avgfreq(xc_interface *xch, int cpuid, int *avg_freq) int ret = 0; DECLARE_SYSCTL; - if ( (xch < 0) || (!avg_freq) ) + if ( !xch || !avg_freq ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -384,7 +384,7 @@ int xc_get_cpuidle_max_cstate(xc_interface *xch, uint32_t *value) int rc; DECLARE_SYSCTL; - if ( xch < 0 || !value ) + if ( !xch || !value ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -401,7 +401,7 @@ int xc_set_cpuidle_max_cstate(xc_interface *xch, uint32_t value) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -416,7 +416,7 @@ int xc_enable_turbo(xc_interface *xch, int cpuid) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_op; @@ -429,7 +429,7 @@ int xc_disable_turbo(xc_interface *xch, int cpuid) { DECLARE_SYSCTL; - if ( xch < 0 ) + if ( !xch ) return -EINVAL; sysctl.cmd = XEN_SYSCTL_pm_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 Wed Sep 11 05:01:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYk-0005c1-Kb; Wed, 11 Sep 2013 05:01:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYj-0005bi-9A for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:45 +0000 Received: from [85.158.139.211:59401] by server-1.bemta-5.messagelabs.com id E3/0D-26518-839FF225; Wed, 11 Sep 2013 05:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378875702!1831514!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17333 invoked from network); 11 Sep 2013 05:01:43 -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; 11 Sep 2013 05:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYg-0000Ju-GX for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYg-00066u-ES for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:42 +0000 Date: Wed, 11 Sep 2013 05:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add LIBXL_SHUTDOWN_REASON_UNKNOWN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11c76da7ba0ecbbf7761e9245b5297bb6395e41d Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:49 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: Add LIBXL_SHUTDOWN_REASON_UNKNOWN libxl_dominfo.shutdown_reason is valid iff (shutdown||dying). This is a bit annoying when generating language bindings since it needs all sorts of special casing. Just introduce an explicit value instead. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_types.idl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 81785df..7fba2ee 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -526,7 +526,7 @@ static void xcinfo2xlinfo(const xc_domaininfo_t *xcinfo, if (xlinfo->shutdown || xlinfo->dying) xlinfo->shutdown_reason = (xcinfo->flags>>XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; else - xlinfo->shutdown_reason = ~0; + xlinfo->shutdown_reason = LIBXL_SHUTDOWN_REASON_UNKNOWN; xlinfo->outstanding_memkb = PAGE_TO_MEMKB(xcinfo->outstanding_pages); xlinfo->current_memkb = PAGE_TO_MEMKB(xcinfo->tot_pages); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 85341a0..0b0a3eb 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -118,14 +118,15 @@ libxl_scheduler = Enumeration("scheduler", [ (7, "arinc653"), ]) -# Consistent with SHUTDOWN_* in sched.h +# Consistent with SHUTDOWN_* in sched.h (apart from UNKNOWN) libxl_shutdown_reason = Enumeration("shutdown_reason", [ + (-1, "unknown"), (0, "poweroff"), (1, "reboot"), (2, "suspend"), (3, "crash"), (4, "watchdog"), - ]) + ], init_val = "LIBXL_SHUTDOWN_REASON_UNKNOWN") libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYk-0005c1-Kb; Wed, 11 Sep 2013 05:01:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYj-0005bi-9A for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:45 +0000 Received: from [85.158.139.211:59401] by server-1.bemta-5.messagelabs.com id E3/0D-26518-839FF225; Wed, 11 Sep 2013 05:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1378875702!1831514!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17333 invoked from network); 11 Sep 2013 05:01:43 -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; 11 Sep 2013 05:01:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYg-0000Ju-GX for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYg-00066u-ES for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:42 +0000 Date: Wed, 11 Sep 2013 05:01:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add LIBXL_SHUTDOWN_REASON_UNKNOWN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11c76da7ba0ecbbf7761e9245b5297bb6395e41d Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:49 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: Add LIBXL_SHUTDOWN_REASON_UNKNOWN libxl_dominfo.shutdown_reason is valid iff (shutdown||dying). This is a bit annoying when generating language bindings since it needs all sorts of special casing. Just introduce an explicit value instead. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_types.idl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 81785df..7fba2ee 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -526,7 +526,7 @@ static void xcinfo2xlinfo(const xc_domaininfo_t *xcinfo, if (xlinfo->shutdown || xlinfo->dying) xlinfo->shutdown_reason = (xcinfo->flags>>XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; else - xlinfo->shutdown_reason = ~0; + xlinfo->shutdown_reason = LIBXL_SHUTDOWN_REASON_UNKNOWN; xlinfo->outstanding_memkb = PAGE_TO_MEMKB(xcinfo->outstanding_pages); xlinfo->current_memkb = PAGE_TO_MEMKB(xcinfo->tot_pages); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 85341a0..0b0a3eb 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -118,14 +118,15 @@ libxl_scheduler = Enumeration("scheduler", [ (7, "arinc653"), ]) -# Consistent with SHUTDOWN_* in sched.h +# Consistent with SHUTDOWN_* in sched.h (apart from UNKNOWN) libxl_shutdown_reason = Enumeration("shutdown_reason", [ + (-1, "unknown"), (0, "poweroff"), (1, "reboot"), (2, "suspend"), (3, "crash"), (4, "watchdog"), - ]) + ], init_val = "LIBXL_SHUTDOWN_REASON_UNKNOWN") libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYu-0005eA-Nz; Wed, 11 Sep 2013 05:01:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYt-0005dh-5N for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:55 +0000 Received: from [193.109.254.147:65394] by server-9.bemta-14.messagelabs.com id 6A/4A-30026-249FF225; Wed, 11 Sep 2013 05:01:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378875712!900273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28647 invoked from network); 11 Sep 2013 05:01:53 -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; 11 Sep 2013 05:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYq-0000K3-NJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYq-00068M-Ki for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:52 +0000 Date: Wed, 11 Sep 2013 05:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: add domain_type field to libxl_dominfo struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit decd97c976ffe5655c8d98adf34d6501c12e0aae Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:51 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: idl: add domain_type field to libxl_dominfo struct This allows a toolstack to find out whether a VM has booted as PV or HVM. Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_types.idl | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7fba2ee..1bce4bb 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -537,6 +537,8 @@ static void xcinfo2xlinfo(const xc_domaininfo_t *xcinfo, xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; xlinfo->vcpu_online = xcinfo->nr_online_vcpus; xlinfo->cpupool = xcinfo->cpupool; + xlinfo->domain_type = (xcinfo->flags & XEN_DOMINF_hvm_guest) ? + LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; } libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 0b0a3eb..ebbeb66 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -209,6 +209,7 @@ libxl_dominfo = Struct("dominfo",[ ("vcpu_max_id", uint32), ("vcpu_online", uint32), ("cpupool", uint32), + ("domain_type", libxl_domain_type), ], dir=DIR_OUT) libxl_cpupoolinfo = Struct("cpupoolinfo", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:01:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:01:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYu-0005eA-Nz; Wed, 11 Sep 2013 05:01:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYt-0005dh-5N for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:55 +0000 Received: from [193.109.254.147:65394] by server-9.bemta-14.messagelabs.com id 6A/4A-30026-249FF225; Wed, 11 Sep 2013 05:01:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1378875712!900273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28647 invoked from network); 11 Sep 2013 05:01:53 -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; 11 Sep 2013 05:01:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcYq-0000K3-NJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcYq-00068M-Ki for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:01:52 +0000 Date: Wed, 11 Sep 2013 05:01:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: add domain_type field to libxl_dominfo struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit decd97c976ffe5655c8d98adf34d6501c12e0aae Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:51 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: idl: add domain_type field to libxl_dominfo struct This allows a toolstack to find out whether a VM has booted as PV or HVM. Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_types.idl | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7fba2ee..1bce4bb 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -537,6 +537,8 @@ static void xcinfo2xlinfo(const xc_domaininfo_t *xcinfo, xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; xlinfo->vcpu_online = xcinfo->nr_online_vcpus; xlinfo->cpupool = xcinfo->cpupool; + xlinfo->domain_type = (xcinfo->flags & XEN_DOMINF_hvm_guest) ? + LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; } libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 0b0a3eb..ebbeb66 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -209,6 +209,7 @@ libxl_dominfo = Struct("dominfo",[ ("vcpu_max_id", uint32), ("vcpu_online", uint32), ("cpupool", uint32), + ("domain_type", libxl_domain_type), ], dir=DIR_OUT) libxl_cpupoolinfo = Struct("cpupoolinfo", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZ4-0005gE-RK; Wed, 11 Sep 2013 05:02:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZ3-0005fy-Fw for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:05 +0000 Received: from [85.158.137.68:12812] by server-9.bemta-3.messagelabs.com id FE/47-15303-C49FF225; Wed, 11 Sep 2013 05:02:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378875723!1366795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9671 invoked from network); 11 Sep 2013 05:02:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZ0-0000Kc-Tt for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZ0-00069E-R4 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:02 +0000 Date: Wed, 11 Sep 2013 05:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: complete some enums in the IDL with their defaults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 166bb0fe37f3b49c4825c4dce1e33251c9b7c784 Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:52 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: idl: complete some enums in the IDL with their defaults There are several enums in the IDL that are initialised to 0, while the value 0 is not part of the enum itself. This creates problems for language bindings generated from the IDL, such as the OCaml ones. Added an explicit (0, "UNKNOWN") enum value where appropriate, or used init_val to default to a sensible value. Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl_types.idl | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ebbeb66..10f95f4 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -32,14 +32,16 @@ libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), (2, "PV"), - ]) + ], init_val = -1) libxl_device_model_version = Enumeration("device_model_version", [ + (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) libxl_console_type = Enumeration("console_type", [ + (0, "UNKNOWN"), (1, "SERIAL"), (2, "PV"), ]) @@ -61,6 +63,7 @@ libxl_disk_backend = Enumeration("disk_backend", [ ]) libxl_nic_type = Enumeration("nic_type", [ + (0, "UNKNOWN"), (1, "VIF_IOEMU"), (2, "VIF"), ]) @@ -75,7 +78,7 @@ libxl_action_on_shutdown = Enumeration("action_on_shutdown", [ (5, "COREDUMP_DESTROY"), (6, "COREDUMP_RESTART"), - ]) + ], init_val = 1) libxl_trigger = Enumeration("trigger", [ (0, "UNKNOWN"), @@ -96,6 +99,7 @@ libxl_tsc_mode = Enumeration("tsc_mode", [ # Consistent with the values defined for HVM_PARAM_TIMER_MODE. libxl_timer_mode = Enumeration("timer_mode", [ + (-1, "unknown"), (0, "delay_for_missed_ticks"), (1, "no_delay_for_missed_ticks"), (2, "no_missed_ticks_pending"), @@ -103,6 +107,7 @@ libxl_timer_mode = Enumeration("timer_mode", [ ], init_val = "LIBXL_TIMER_MODE_DEFAULT") libxl_bios_type = Enumeration("bios_type", [ + (0, "unknown"), (1, "rombios"), (2, "seabios"), (3, "ovmf"), @@ -131,7 +136,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), - ], init_val = 0) + ], init_val = 1) libxl_vendor_device = Enumeration("vendor_device", [ (0, "NONE"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZ4-0005gE-RK; Wed, 11 Sep 2013 05:02:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZ3-0005fy-Fw for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:05 +0000 Received: from [85.158.137.68:12812] by server-9.bemta-3.messagelabs.com id FE/47-15303-C49FF225; Wed, 11 Sep 2013 05:02:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1378875723!1366795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9671 invoked from network); 11 Sep 2013 05:02:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZ0-0000Kc-Tt for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZ0-00069E-R4 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:02 +0000 Date: Wed, 11 Sep 2013 05:02:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: complete some enums in the IDL with their defaults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 166bb0fe37f3b49c4825c4dce1e33251c9b7c784 Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:52 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: idl: complete some enums in the IDL with their defaults There are several enums in the IDL that are initialised to 0, while the value 0 is not part of the enum itself. This creates problems for language bindings generated from the IDL, such as the OCaml ones. Added an explicit (0, "UNKNOWN") enum value where appropriate, or used init_val to default to a sensible value. Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/libxl_types.idl | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ebbeb66..10f95f4 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -32,14 +32,16 @@ libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), (2, "PV"), - ]) + ], init_val = -1) libxl_device_model_version = Enumeration("device_model_version", [ + (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) libxl_console_type = Enumeration("console_type", [ + (0, "UNKNOWN"), (1, "SERIAL"), (2, "PV"), ]) @@ -61,6 +63,7 @@ libxl_disk_backend = Enumeration("disk_backend", [ ]) libxl_nic_type = Enumeration("nic_type", [ + (0, "UNKNOWN"), (1, "VIF_IOEMU"), (2, "VIF"), ]) @@ -75,7 +78,7 @@ libxl_action_on_shutdown = Enumeration("action_on_shutdown", [ (5, "COREDUMP_DESTROY"), (6, "COREDUMP_RESTART"), - ]) + ], init_val = 1) libxl_trigger = Enumeration("trigger", [ (0, "UNKNOWN"), @@ -96,6 +99,7 @@ libxl_tsc_mode = Enumeration("tsc_mode", [ # Consistent with the values defined for HVM_PARAM_TIMER_MODE. libxl_timer_mode = Enumeration("timer_mode", [ + (-1, "unknown"), (0, "delay_for_missed_ticks"), (1, "no_delay_for_missed_ticks"), (2, "no_missed_ticks_pending"), @@ -103,6 +107,7 @@ libxl_timer_mode = Enumeration("timer_mode", [ ], init_val = "LIBXL_TIMER_MODE_DEFAULT") libxl_bios_type = Enumeration("bios_type", [ + (0, "unknown"), (1, "rombios"), (2, "seabios"), (3, "ovmf"), @@ -131,7 +136,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), - ], init_val = 0) + ], init_val = 1) libxl_vendor_device = Enumeration("vendor_device", [ (0, "NONE"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZF-0005iR-0w; Wed, 11 Sep 2013 05:02:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZD-0005i2-IH for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:15 +0000 Received: from [85.158.143.35:6610] by server-3.bemta-4.messagelabs.com id A0/03-08835-659FF225; Wed, 11 Sep 2013 05:02:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378875733!2831486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26775 invoked from network); 11 Sep 2013 05:02:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZB-0000Ki-3v for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZB-00069z-15 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:13 +0000 Date: Wed, 11 Sep 2013 05:02:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: fix code intended to output comments before definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb786f709249666e1f7364706f94be1a6c4e04da Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:53 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: ocaml: fix code intended to output comments before definitions I'm not sure how useful these comments actually are but erred on the side of fixing rather than removing. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/ocaml/libs/xl/genwrap.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index ea978bf..5757218 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -79,12 +79,14 @@ def gen_ocaml_ml(ty, interface, indent=""): s = ("""(* %s interface *)\n""" % ty.typename) else: s = ("""(* %s implementation *)\n""" % ty.typename) + if isinstance(ty, idl.Enumeration): - s = "type %s = \n" % ty.rawname + s += "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname elif isinstance(ty, idl.Aggregate): - s = "" + s += "" + if ty.typename is None: raise NotImplementedError("%s has no typename" % type(ty)) 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 Wed Sep 11 05:02:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZF-0005iR-0w; Wed, 11 Sep 2013 05:02:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZD-0005i2-IH for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:15 +0000 Received: from [85.158.143.35:6610] by server-3.bemta-4.messagelabs.com id A0/03-08835-659FF225; Wed, 11 Sep 2013 05:02:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1378875733!2831486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26775 invoked from network); 11 Sep 2013 05:02:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZB-0000Ki-3v for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZB-00069z-15 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:13 +0000 Date: Wed, 11 Sep 2013 05:02:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: fix code intended to output comments before definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb786f709249666e1f7364706f94be1a6c4e04da Author: Rob Hoes AuthorDate: Thu Aug 22 11:50:53 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 10 11:44:02 2013 +0100 libxl: ocaml: fix code intended to output comments before definitions I'm not sure how useful these comments actually are but erred on the side of fixing rather than removing. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/ocaml/libs/xl/genwrap.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index ea978bf..5757218 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -79,12 +79,14 @@ def gen_ocaml_ml(ty, interface, indent=""): s = ("""(* %s interface *)\n""" % ty.typename) else: s = ("""(* %s implementation *)\n""" % ty.typename) + if isinstance(ty, idl.Enumeration): - s = "type %s = \n" % ty.rawname + s += "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname elif isinstance(ty, idl.Aggregate): - s = "" + s += "" + if ty.typename is None: raise NotImplementedError("%s has no typename" % type(ty)) 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 Wed Sep 11 05:02:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZP-0005kY-4a; Wed, 11 Sep 2013 05:02:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZN-0005kD-Vb for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:26 +0000 Received: from [85.158.137.68:33981] by server-4.bemta-3.messagelabs.com id 64/B6-13758-169FF225; Wed, 11 Sep 2013 05:02:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1378875743!1361040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21119 invoked from network); 11 Sep 2013 05:02:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZL-0000Ks-9k for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZL-0006Ai-7h for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:23 +0000 Date: Wed, 11 Sep 2013 05:02:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libelf: add hvm callback vector feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30832c06a8d1f9caff0987654ef9e24d59469d9a Author: Mukesh Rathor AuthorDate: Tue Sep 10 16:38:43 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:38:43 2013 +0200 libelf: add hvm callback vector feature Add XENFEAT_hvm_callback_vector to elf_xen_feature_names so we can ensure the kernel supports all features required for PVH mode when building a PVH domU here. Note, hvm callback is required for PVH. Signed-off-by: Mukesh Rathor Acked-by: Ian Campbell --- xen/common/libelf/libelf-dominfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index e79b339..25dd892 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -27,6 +27,7 @@ static const char *const elf_xen_feature_names[] = { [XENFEAT_auto_translated_physmap] = "auto_translated_physmap", [XENFEAT_supervisor_mode_kernel] = "supervisor_mode_kernel", [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb", + [XENFEAT_hvm_callback_vector] = "hvm_callback_vector", [XENFEAT_dom0] = "dom0" }; static const unsigned elf_xen_features = -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZP-0005kY-4a; Wed, 11 Sep 2013 05:02:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZN-0005kD-Vb for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:26 +0000 Received: from [85.158.137.68:33981] by server-4.bemta-3.messagelabs.com id 64/B6-13758-169FF225; Wed, 11 Sep 2013 05:02:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1378875743!1361040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21119 invoked from network); 11 Sep 2013 05:02:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZL-0000Ks-9k for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZL-0006Ai-7h for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:23 +0000 Date: Wed, 11 Sep 2013 05:02:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libelf: add hvm callback vector feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 30832c06a8d1f9caff0987654ef9e24d59469d9a Author: Mukesh Rathor AuthorDate: Tue Sep 10 16:38:43 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:38:43 2013 +0200 libelf: add hvm callback vector feature Add XENFEAT_hvm_callback_vector to elf_xen_feature_names so we can ensure the kernel supports all features required for PVH mode when building a PVH domU here. Note, hvm callback is required for PVH. Signed-off-by: Mukesh Rathor Acked-by: Ian Campbell --- xen/common/libelf/libelf-dominfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index e79b339..25dd892 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -27,6 +27,7 @@ static const char *const elf_xen_feature_names[] = { [XENFEAT_auto_translated_physmap] = "auto_translated_physmap", [XENFEAT_supervisor_mode_kernel] = "supervisor_mode_kernel", [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb", + [XENFEAT_hvm_callback_vector] = "hvm_callback_vector", [XENFEAT_dom0] = "dom0" }; static const unsigned elf_xen_features = -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZa-0005mi-7l; Wed, 11 Sep 2013 05:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZY-0005mR-Om for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:37 +0000 Received: from [85.158.139.211:59788] by server-15.bemta-5.messagelabs.com id AB/AB-01145-C69FF225; Wed, 11 Sep 2013 05:02:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1378875753!1816798!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26616 invoked from network); 11 Sep 2013 05:02:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZV-0000L0-GF for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZV-0006CQ-DL for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:33 +0000 Date: Wed, 11 Sep 2013 05:02:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: buffer and show origin of guest PV writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48d50de8e086e6669979889fb58dbf1092d10347 Author: Daniel De Graaf AuthorDate: Tue Sep 10 16:39:46 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:39:46 2013 +0200 console: buffer and show origin of guest PV writes Guests other than domain 0 using the console output have previously been controlled by the VERBOSE #define, but with no designation of which guest's output was on the console. This patch converts the HVM output buffering to be used by all domains except the hardware domain (dom0): stripping non-printable characters, line buffering the output, and prefixing it with the domain ID. This is especially useful for debugging stub domains during early boot. Signed-off-by: Daniel De Graaf Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 27 ++++------- xen/common/domain.c | 8 +++ xen/drivers/char/console.c | 93 +++++++++++++++++++++++++++++++------- xen/include/asm-x86/hvm/domain.h | 6 --- xen/include/xen/lib.h | 2 + xen/include/xen/sched.h | 6 +++ 6 files changed, 102 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ebf1838..8fd218e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -485,8 +485,7 @@ static int hvm_set_ioreq_page( static int hvm_print_line( int dir, uint32_t port, uint32_t bytes, uint32_t *val) { - struct vcpu *curr = current; - struct hvm_domain *hd = &curr->domain->arch.hvm_domain; + struct domain *cd = current->domain; char c = *val; BUG_ON(bytes != 1); @@ -495,17 +494,16 @@ static int hvm_print_line( if ( !isprint(c) && (c != '\n') && (c != '\t') ) return X86EMUL_OKAY; - spin_lock(&hd->pbuf_lock); - hd->pbuf[hd->pbuf_idx++] = c; - if ( (hd->pbuf_idx == (HVM_PBUF_SIZE - 2)) || (c == '\n') ) + spin_lock(&cd->pbuf_lock); + if ( c != '\n' ) + cd->pbuf[cd->pbuf_idx++] = c; + if ( (cd->pbuf_idx == (DOMAIN_PBUF_SIZE - 1)) || (c == '\n') ) { - if ( c != '\n' ) - hd->pbuf[hd->pbuf_idx++] = '\n'; - hd->pbuf[hd->pbuf_idx] = '\0'; - printk(XENLOG_G_DEBUG "HVM%u: %s", curr->domain->domain_id, hd->pbuf); - hd->pbuf_idx = 0; + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s\n", cd->pbuf); + cd->pbuf_idx = 0; } - spin_unlock(&hd->pbuf_lock); + spin_unlock(&cd->pbuf_lock); return X86EMUL_OKAY; } @@ -521,19 +519,16 @@ int hvm_domain_initialise(struct domain *d) return -EINVAL; } - spin_lock_init(&d->arch.hvm_domain.pbuf_lock); spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); - d->arch.hvm_domain.pbuf = xzalloc_array(char, HVM_PBUF_SIZE); d->arch.hvm_domain.params = xzalloc_array(uint64_t, HVM_NR_PARAMS); d->arch.hvm_domain.io_handler = xmalloc(struct hvm_io_handler); rc = -ENOMEM; - if ( !d->arch.hvm_domain.pbuf || !d->arch.hvm_domain.params || - !d->arch.hvm_domain.io_handler ) + if ( !d->arch.hvm_domain.params || !d->arch.hvm_domain.io_handler ) goto fail0; d->arch.hvm_domain.io_handler->num_slot = 0; @@ -578,7 +573,6 @@ int hvm_domain_initialise(struct domain *d) fail0: xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); - xfree(d->arch.hvm_domain.pbuf); return rc; } @@ -603,7 +597,6 @@ void hvm_domain_relinquish_resources(struct domain *d) xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); - xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) diff --git a/xen/common/domain.c b/xen/common/domain.c index 9390a22..5999779 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -231,6 +231,8 @@ struct domain *domain_create( spin_lock_init(&d->shutdown_lock); d->shutdown_code = -1; + spin_lock_init(&d->pbuf_lock); + err = -ENOMEM; if ( !zalloc_cpumask_var(&d->domain_dirty_cpumask) ) goto fail; @@ -286,6 +288,10 @@ struct domain *domain_create( d->mem_event = xzalloc(struct mem_event_per_domain); if ( !d->mem_event ) goto fail; + + d->pbuf = xzalloc_array(char, DOMAIN_PBUF_SIZE); + if ( !d->pbuf ) + goto fail; } if ( (err = arch_domain_create(d, domcr_flags)) != 0 ) @@ -318,6 +324,7 @@ struct domain *domain_create( d->is_dying = DOMDYING_dead; atomic_set(&d->refcnt, DOMAIN_DESTROYED); xfree(d->mem_event); + xfree(d->pbuf); if ( init_status & INIT_arch ) arch_domain_destroy(d); if ( init_status & INIT_gnttab ) @@ -730,6 +737,7 @@ static void complete_domain_destroy(struct rcu_head *head) #endif xfree(d->mem_event); + xfree(d->pbuf); for ( i = d->max_vcpus - 1; i >= 0; i-- ) if ( (v = d->vcpu[i]) != NULL ) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index e47ddf2..508f845 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include /* for do_console_io */ @@ -375,6 +376,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) { char kbuf[128]; int kcount; + struct domain *cd = current->domain; while ( count > 0 ) { @@ -388,18 +390,58 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) return -EFAULT; kbuf[kcount] = '\0'; - spin_lock_irq(&console_lock); + if ( is_hardware_domain(cd) ) + { + /* Use direct console output as it could be interactive */ + spin_lock_irq(&console_lock); - sercon_puts(kbuf); - video_puts(kbuf); + sercon_puts(kbuf); + video_puts(kbuf); - if ( opt_console_to_ring ) - { - conring_puts(kbuf); - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + if ( opt_console_to_ring ) + { + conring_puts(kbuf); + tasklet_schedule(¬ify_dom0_con_ring_tasklet); + } + + spin_unlock_irq(&console_lock); } + else + { + char *kin = kbuf, *kout = kbuf, c; - spin_unlock_irq(&console_lock); + /* Strip non-printable characters */ + for ( ; ; ) + { + c = *kin++; + if ( c == '\0' || c == '\n' ) + break; + if ( isprint(c) || c == '\t' ) + *kout++ = c; + } + *kout = '\0'; + spin_lock(&cd->pbuf_lock); + if ( c == '\n' ) + { + kcount = kin - kbuf; + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); + cd->pbuf_idx = 0; + } + else if ( cd->pbuf_idx + kcount < (DOMAIN_PBUF_SIZE - 1) ) + { + /* buffer the output until a newline */ + memcpy(cd->pbuf + cd->pbuf_idx, kbuf, kcount); + cd->pbuf_idx += kcount; + } + else + { + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); + cd->pbuf_idx = 0; + } + spin_unlock(&cd->pbuf_lock); + } guest_handle_add_offset(buffer, kcount); count -= kcount; @@ -504,12 +546,12 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } -static void printk_start_of_line(void) +static void printk_start_of_line(const char *prefix) { struct tm tm; char tstr[32]; - __putstr("(XEN) "); + __putstr(prefix); if ( !opt_console_timestamps ) return; @@ -524,12 +566,11 @@ static void printk_start_of_line(void) __putstr(tstr); } -void printk(const char *fmt, ...) +static void vprintk_common(const char *prefix, const char *fmt, va_list args) { static char buf[1024]; static int start_of_line = 1, do_print; - va_list args; char *p, *q; unsigned long flags; @@ -537,9 +578,7 @@ void printk(const char *fmt, ...) local_irq_save(flags); spin_lock_recursive(&console_lock); - va_start(args, fmt); (void)vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); p = buf; @@ -551,7 +590,7 @@ void printk(const char *fmt, ...) if ( do_print ) { if ( start_of_line ) - printk_start_of_line(); + printk_start_of_line(prefix); __putstr(p); __putstr("\n"); } @@ -566,7 +605,7 @@ void printk(const char *fmt, ...) if ( do_print ) { if ( start_of_line ) - printk_start_of_line(); + printk_start_of_line(prefix); __putstr(p); } start_of_line = 0; @@ -576,6 +615,26 @@ void printk(const char *fmt, ...) local_irq_restore(flags); } +void printk(const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + vprintk_common("(XEN) ", fmt, args); + va_end(args); +} + +void guest_printk(const struct domain *d, const char *fmt, ...) +{ + va_list args; + char prefix[16]; + + snprintf(prefix, sizeof(prefix), "(d%d) ", d->domain_id); + + va_start(args, fmt); + vprintk_common(prefix, fmt, args); + va_end(args); +} + void __init console_init_preirq(void) { char *p; @@ -792,7 +851,7 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) snprintf(lost_str, sizeof(lost_str), "%d", lost); /* console_lock may already be acquired by printk(). */ spin_lock_recursive(&console_lock); - printk_start_of_line(); + printk_start_of_line("(XEN) "); __putstr("printk: "); __putstr(lost_str); __putstr(" messages suppressed.\n"); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..b1e3187 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -62,12 +62,6 @@ struct hvm_domain { /* emulated irq to pirq */ struct radix_tree_root emuirq_pirq; - /* hvm_print_line() logging. */ -#define HVM_PBUF_SIZE 80 - char *pbuf; - int pbuf_idx; - spinlock_t pbuf_lock; - uint64_t *params; /* Memory ranges with pinned cache attributes. */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 74b34eb..4768b0e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -83,6 +83,8 @@ extern void debugtrace_printk(const char *fmt, ...); #define _p(_x) ((void *)(unsigned long)(_x)) extern void printk(const char *format, ...) __attribute__ ((format (printf, 1, 2))); +extern void guest_printk(const struct domain *d, const char *format, ...) + __attribute__ ((format (printf, 2, 3))); extern void panic(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern long vm_assist(struct domain *, unsigned int, unsigned int); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ae6a3b8..0013a8d 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -341,6 +341,12 @@ struct domain /* Control-plane tools handle for this domain. */ xen_domain_handle_t handle; + /* hvm_print_line() and guest_console_write() logging. */ +#define DOMAIN_PBUF_SIZE 80 + char *pbuf; + unsigned pbuf_idx; + spinlock_t pbuf_lock; + /* OProfile support. */ struct xenoprof *xenoprof; int32_t time_offset_seconds; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZa-0005mi-7l; Wed, 11 Sep 2013 05:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZY-0005mR-Om for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:37 +0000 Received: from [85.158.139.211:59788] by server-15.bemta-5.messagelabs.com id AB/AB-01145-C69FF225; Wed, 11 Sep 2013 05:02:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1378875753!1816798!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26616 invoked from network); 11 Sep 2013 05:02:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZV-0000L0-GF for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZV-0006CQ-DL for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:33 +0000 Date: Wed, 11 Sep 2013 05:02:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: buffer and show origin of guest PV writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48d50de8e086e6669979889fb58dbf1092d10347 Author: Daniel De Graaf AuthorDate: Tue Sep 10 16:39:46 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:39:46 2013 +0200 console: buffer and show origin of guest PV writes Guests other than domain 0 using the console output have previously been controlled by the VERBOSE #define, but with no designation of which guest's output was on the console. This patch converts the HVM output buffering to be used by all domains except the hardware domain (dom0): stripping non-printable characters, line buffering the output, and prefixing it with the domain ID. This is especially useful for debugging stub domains during early boot. Signed-off-by: Daniel De Graaf Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 27 ++++------- xen/common/domain.c | 8 +++ xen/drivers/char/console.c | 93 +++++++++++++++++++++++++++++++------- xen/include/asm-x86/hvm/domain.h | 6 --- xen/include/xen/lib.h | 2 + xen/include/xen/sched.h | 6 +++ 6 files changed, 102 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index ebf1838..8fd218e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -485,8 +485,7 @@ static int hvm_set_ioreq_page( static int hvm_print_line( int dir, uint32_t port, uint32_t bytes, uint32_t *val) { - struct vcpu *curr = current; - struct hvm_domain *hd = &curr->domain->arch.hvm_domain; + struct domain *cd = current->domain; char c = *val; BUG_ON(bytes != 1); @@ -495,17 +494,16 @@ static int hvm_print_line( if ( !isprint(c) && (c != '\n') && (c != '\t') ) return X86EMUL_OKAY; - spin_lock(&hd->pbuf_lock); - hd->pbuf[hd->pbuf_idx++] = c; - if ( (hd->pbuf_idx == (HVM_PBUF_SIZE - 2)) || (c == '\n') ) + spin_lock(&cd->pbuf_lock); + if ( c != '\n' ) + cd->pbuf[cd->pbuf_idx++] = c; + if ( (cd->pbuf_idx == (DOMAIN_PBUF_SIZE - 1)) || (c == '\n') ) { - if ( c != '\n' ) - hd->pbuf[hd->pbuf_idx++] = '\n'; - hd->pbuf[hd->pbuf_idx] = '\0'; - printk(XENLOG_G_DEBUG "HVM%u: %s", curr->domain->domain_id, hd->pbuf); - hd->pbuf_idx = 0; + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s\n", cd->pbuf); + cd->pbuf_idx = 0; } - spin_unlock(&hd->pbuf_lock); + spin_unlock(&cd->pbuf_lock); return X86EMUL_OKAY; } @@ -521,19 +519,16 @@ int hvm_domain_initialise(struct domain *d) return -EINVAL; } - spin_lock_init(&d->arch.hvm_domain.pbuf_lock); spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); - d->arch.hvm_domain.pbuf = xzalloc_array(char, HVM_PBUF_SIZE); d->arch.hvm_domain.params = xzalloc_array(uint64_t, HVM_NR_PARAMS); d->arch.hvm_domain.io_handler = xmalloc(struct hvm_io_handler); rc = -ENOMEM; - if ( !d->arch.hvm_domain.pbuf || !d->arch.hvm_domain.params || - !d->arch.hvm_domain.io_handler ) + if ( !d->arch.hvm_domain.params || !d->arch.hvm_domain.io_handler ) goto fail0; d->arch.hvm_domain.io_handler->num_slot = 0; @@ -578,7 +573,6 @@ int hvm_domain_initialise(struct domain *d) fail0: xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); - xfree(d->arch.hvm_domain.pbuf); return rc; } @@ -603,7 +597,6 @@ void hvm_domain_relinquish_resources(struct domain *d) xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); - xfree(d->arch.hvm_domain.pbuf); } void hvm_domain_destroy(struct domain *d) diff --git a/xen/common/domain.c b/xen/common/domain.c index 9390a22..5999779 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -231,6 +231,8 @@ struct domain *domain_create( spin_lock_init(&d->shutdown_lock); d->shutdown_code = -1; + spin_lock_init(&d->pbuf_lock); + err = -ENOMEM; if ( !zalloc_cpumask_var(&d->domain_dirty_cpumask) ) goto fail; @@ -286,6 +288,10 @@ struct domain *domain_create( d->mem_event = xzalloc(struct mem_event_per_domain); if ( !d->mem_event ) goto fail; + + d->pbuf = xzalloc_array(char, DOMAIN_PBUF_SIZE); + if ( !d->pbuf ) + goto fail; } if ( (err = arch_domain_create(d, domcr_flags)) != 0 ) @@ -318,6 +324,7 @@ struct domain *domain_create( d->is_dying = DOMDYING_dead; atomic_set(&d->refcnt, DOMAIN_DESTROYED); xfree(d->mem_event); + xfree(d->pbuf); if ( init_status & INIT_arch ) arch_domain_destroy(d); if ( init_status & INIT_gnttab ) @@ -730,6 +737,7 @@ static void complete_domain_destroy(struct rcu_head *head) #endif xfree(d->mem_event); + xfree(d->pbuf); for ( i = d->max_vcpus - 1; i >= 0; i-- ) if ( (v = d->vcpu[i]) != NULL ) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index e47ddf2..508f845 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include /* for do_console_io */ @@ -375,6 +376,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) { char kbuf[128]; int kcount; + struct domain *cd = current->domain; while ( count > 0 ) { @@ -388,18 +390,58 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(char) buffer, int count) return -EFAULT; kbuf[kcount] = '\0'; - spin_lock_irq(&console_lock); + if ( is_hardware_domain(cd) ) + { + /* Use direct console output as it could be interactive */ + spin_lock_irq(&console_lock); - sercon_puts(kbuf); - video_puts(kbuf); + sercon_puts(kbuf); + video_puts(kbuf); - if ( opt_console_to_ring ) - { - conring_puts(kbuf); - tasklet_schedule(¬ify_dom0_con_ring_tasklet); + if ( opt_console_to_ring ) + { + conring_puts(kbuf); + tasklet_schedule(¬ify_dom0_con_ring_tasklet); + } + + spin_unlock_irq(&console_lock); } + else + { + char *kin = kbuf, *kout = kbuf, c; - spin_unlock_irq(&console_lock); + /* Strip non-printable characters */ + for ( ; ; ) + { + c = *kin++; + if ( c == '\0' || c == '\n' ) + break; + if ( isprint(c) || c == '\t' ) + *kout++ = c; + } + *kout = '\0'; + spin_lock(&cd->pbuf_lock); + if ( c == '\n' ) + { + kcount = kin - kbuf; + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); + cd->pbuf_idx = 0; + } + else if ( cd->pbuf_idx + kcount < (DOMAIN_PBUF_SIZE - 1) ) + { + /* buffer the output until a newline */ + memcpy(cd->pbuf + cd->pbuf_idx, kbuf, kcount); + cd->pbuf_idx += kcount; + } + else + { + cd->pbuf[cd->pbuf_idx] = '\0'; + guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); + cd->pbuf_idx = 0; + } + spin_unlock(&cd->pbuf_lock); + } guest_handle_add_offset(buffer, kcount); count -= kcount; @@ -504,12 +546,12 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } -static void printk_start_of_line(void) +static void printk_start_of_line(const char *prefix) { struct tm tm; char tstr[32]; - __putstr("(XEN) "); + __putstr(prefix); if ( !opt_console_timestamps ) return; @@ -524,12 +566,11 @@ static void printk_start_of_line(void) __putstr(tstr); } -void printk(const char *fmt, ...) +static void vprintk_common(const char *prefix, const char *fmt, va_list args) { static char buf[1024]; static int start_of_line = 1, do_print; - va_list args; char *p, *q; unsigned long flags; @@ -537,9 +578,7 @@ void printk(const char *fmt, ...) local_irq_save(flags); spin_lock_recursive(&console_lock); - va_start(args, fmt); (void)vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); p = buf; @@ -551,7 +590,7 @@ void printk(const char *fmt, ...) if ( do_print ) { if ( start_of_line ) - printk_start_of_line(); + printk_start_of_line(prefix); __putstr(p); __putstr("\n"); } @@ -566,7 +605,7 @@ void printk(const char *fmt, ...) if ( do_print ) { if ( start_of_line ) - printk_start_of_line(); + printk_start_of_line(prefix); __putstr(p); } start_of_line = 0; @@ -576,6 +615,26 @@ void printk(const char *fmt, ...) local_irq_restore(flags); } +void printk(const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + vprintk_common("(XEN) ", fmt, args); + va_end(args); +} + +void guest_printk(const struct domain *d, const char *fmt, ...) +{ + va_list args; + char prefix[16]; + + snprintf(prefix, sizeof(prefix), "(d%d) ", d->domain_id); + + va_start(args, fmt); + vprintk_common(prefix, fmt, args); + va_end(args); +} + void __init console_init_preirq(void) { char *p; @@ -792,7 +851,7 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) snprintf(lost_str, sizeof(lost_str), "%d", lost); /* console_lock may already be acquired by printk(). */ spin_lock_recursive(&console_lock); - printk_start_of_line(); + printk_start_of_line("(XEN) "); __putstr("printk: "); __putstr(lost_str); __putstr(" messages suppressed.\n"); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..b1e3187 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -62,12 +62,6 @@ struct hvm_domain { /* emulated irq to pirq */ struct radix_tree_root emuirq_pirq; - /* hvm_print_line() logging. */ -#define HVM_PBUF_SIZE 80 - char *pbuf; - int pbuf_idx; - spinlock_t pbuf_lock; - uint64_t *params; /* Memory ranges with pinned cache attributes. */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 74b34eb..4768b0e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -83,6 +83,8 @@ extern void debugtrace_printk(const char *fmt, ...); #define _p(_x) ((void *)(unsigned long)(_x)) extern void printk(const char *format, ...) __attribute__ ((format (printf, 1, 2))); +extern void guest_printk(const struct domain *d, const char *format, ...) + __attribute__ ((format (printf, 2, 3))); extern void panic(const char *format, ...) __attribute__ ((format (printf, 1, 2))); extern long vm_assist(struct domain *, unsigned int, unsigned int); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ae6a3b8..0013a8d 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -341,6 +341,12 @@ struct domain /* Control-plane tools handle for this domain. */ xen_domain_handle_t handle; + /* hvm_print_line() and guest_console_write() logging. */ +#define DOMAIN_PBUF_SIZE 80 + char *pbuf; + unsigned pbuf_idx; + spinlock_t pbuf_lock; + /* OProfile support. */ struct xenoprof *xenoprof; int32_t time_offset_seconds; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZj-0005oU-AX; Wed, 11 Sep 2013 05:02:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZi-0005oB-0j for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:46 +0000 Received: from [85.158.143.35:10339] by server-1.bemta-4.messagelabs.com id F8/A2-16125-579FF225; Wed, 11 Sep 2013 05:02:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378875763!2835274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9731 invoked from network); 11 Sep 2013 05:02:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZf-0000L6-MK for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZf-0006D7-KJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:43 +0000 Date: Wed, 11 Sep 2013 05:02:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ioapic: avoid trying to access the -1th ioapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef0ea8c2bbb3718df1dee8f15ff3206bf592b253 Author: Andrew Cooper AuthorDate: Tue Sep 10 16:40:34 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:40:34 2013 +0200 x86/ioapic: avoid trying to access the -1th ioapic Discovered by Coverity, CID 1055743 Depending on the contents of the mp_irqs/mp_ioapics from the MP table, find_isa_irq_apic() might return -1, at which point calling ioapic_read_entry() with it is bad. In addition to bailing if pin is -1, bail if apic is -1. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/io_apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 048c61c..5512cd5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1828,7 +1828,7 @@ static void __init unlock_ExtINT_logic(void) pin = find_isa_irq_pin(8, mp_INT); apic = find_isa_irq_apic(8, mp_INT); - if (pin == -1) + if ( pin == -1 || apic == -1 ) return; entry0 = ioapic_read_entry(apic, pin, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZj-0005oU-AX; Wed, 11 Sep 2013 05:02:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZi-0005oB-0j for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:46 +0000 Received: from [85.158.143.35:10339] by server-1.bemta-4.messagelabs.com id F8/A2-16125-579FF225; Wed, 11 Sep 2013 05:02:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378875763!2835274!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9731 invoked from network); 11 Sep 2013 05:02:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZf-0000L6-MK for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZf-0006D7-KJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:43 +0000 Date: Wed, 11 Sep 2013 05:02:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ioapic: avoid trying to access the -1th ioapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef0ea8c2bbb3718df1dee8f15ff3206bf592b253 Author: Andrew Cooper AuthorDate: Tue Sep 10 16:40:34 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:40:34 2013 +0200 x86/ioapic: avoid trying to access the -1th ioapic Discovered by Coverity, CID 1055743 Depending on the contents of the mp_irqs/mp_ioapics from the MP table, find_isa_irq_apic() might return -1, at which point calling ioapic_read_entry() with it is bad. In addition to bailing if pin is -1, bail if apic is -1. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/io_apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 048c61c..5512cd5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1828,7 +1828,7 @@ static void __init unlock_ExtINT_logic(void) pin = find_isa_irq_pin(8, mp_INT); apic = find_isa_irq_apic(8, mp_INT); - if (pin == -1) + if ( pin == -1 || apic == -1 ) return; entry0 = ioapic_read_entry(apic, pin, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZt-0005qF-Dx; Wed, 11 Sep 2013 05:02:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZs-0005q4-L3 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:56 +0000 Received: from [85.158.137.68:38730] by server-1.bemta-3.messagelabs.com id 6E/DB-17041-F79FF225; Wed, 11 Sep 2013 05:02:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378875774!1376654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11856 invoked from network); 11 Sep 2013 05:02:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZp-0000LF-SZ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZp-0006EN-RJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:53 +0000 Date: Wed, 11 Sep 2013 05:02:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3a4eb9253826d1e49e682314c8666b28fa0b717 Author: Yang Zhang AuthorDate: Tue Sep 10 16:41:35 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:41:35 2013 +0200 Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR The bit 31 of revision_id will set to 1 if vmcs shadowing enabled. And according intel SDM, the bit 31 of IA32_VMX_BASIC MSR is always 0. So we cannot set low 32 bit of IA32_VMX_BASIC to revision_id directly. Must clear the bit 31 to 0. Signed-off-by: Yang Zhang Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 5ef5ad7..f385c02 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1826,7 +1826,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) switch (msr) { case MSR_IA32_VMX_BASIC: data = (host_data & (~0ul << 32)) | - ((v->arch.hvm_vmx.vmcs)->vmcs_revision_id); + (v->arch.hvm_vmx.vmcs->vmcs_revision_id & 0x7fffffff); break; case MSR_IA32_VMX_PINBASED_CTLS: case MSR_IA32_VMX_TRUE_PINBASED_CTLS: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:02:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:02: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 1VJcZt-0005qF-Dx; Wed, 11 Sep 2013 05:02:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZs-0005q4-L3 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:56 +0000 Received: from [85.158.137.68:38730] by server-1.bemta-3.messagelabs.com id 6E/DB-17041-F79FF225; Wed, 11 Sep 2013 05:02:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1378875774!1376654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11856 invoked from network); 11 Sep 2013 05:02:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:02:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcZp-0000LF-SZ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcZp-0006EN-RJ for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:02:53 +0000 Date: Wed, 11 Sep 2013 05:02:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3a4eb9253826d1e49e682314c8666b28fa0b717 Author: Yang Zhang AuthorDate: Tue Sep 10 16:41:35 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 16:41:35 2013 +0200 Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR The bit 31 of revision_id will set to 1 if vmcs shadowing enabled. And according intel SDM, the bit 31 of IA32_VMX_BASIC MSR is always 0. So we cannot set low 32 bit of IA32_VMX_BASIC to revision_id directly. Must clear the bit 31 to 0. Signed-off-by: Yang Zhang Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 5ef5ad7..f385c02 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1826,7 +1826,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) switch (msr) { case MSR_IA32_VMX_BASIC: data = (host_data & (~0ul << 32)) | - ((v->arch.hvm_vmx.vmcs)->vmcs_revision_id); + (v->arch.hvm_vmx.vmcs->vmcs_revision_id & 0x7fffffff); break; case MSR_IA32_VMX_PINBASED_CTLS: case MSR_IA32_VMX_TRUE_PINBASED_CTLS: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca3-0005sE-HJ; Wed, 11 Sep 2013 05:03:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca2-0005ru-Dx for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:06 +0000 Received: from [85.158.143.35:4610] by server-1.bemta-4.messagelabs.com id D8/D2-16125-989FF225; Wed, 11 Sep 2013 05:03:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1378875784!2828695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14365 invoked from network); 11 Sep 2013 05:03:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca0-0000Lq-3z for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJca0-0006FH-06 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:04 +0000 Date: Wed, 11 Sep 2013 05:03:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Fix possible increment of uninitialised variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac2f555e37f589fde27c68a306aaac14a424040b Author: Andrew Cooper AuthorDate: Mon Sep 9 18:43:40 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 10 15:46:35 2013 +0100 x86/mm: Fix possible increment of uninitialised variable Discovered by Coverity, CID 1056101 When taking the continue branch on the first iteration of the loop, gfn would indeed be uninitialised when incremented. However, as gfn is unconditionally constructed from i{1..4} before use in the loop body, having it incremented in the loop header is useless. Therefore, simply remove it. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-pt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 302b621..a1d5650 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -691,7 +691,7 @@ static void p2m_change_type_global(struct p2m_domain *p2m, l1mfn = _mfn(l2e_get_pfn(l2e[i2])); l1e = map_domain_page(mfn_x(l1mfn)); - for ( i1 = 0; i1 < L1_PAGETABLE_ENTRIES; i1++, gfn++ ) + for ( i1 = 0; i1 < L1_PAGETABLE_ENTRIES; i1++ ) { flags = l1e_get_flags(l1e[i1]); if ( p2m_flags_to_type(flags) != ot ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca3-0005sE-HJ; Wed, 11 Sep 2013 05:03:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca2-0005ru-Dx for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:06 +0000 Received: from [85.158.143.35:4610] by server-1.bemta-4.messagelabs.com id D8/D2-16125-989FF225; Wed, 11 Sep 2013 05:03:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1378875784!2828695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14365 invoked from network); 11 Sep 2013 05:03:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJca0-0000Lq-3z for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJca0-0006FH-06 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:04 +0000 Date: Wed, 11 Sep 2013 05:03:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Fix possible increment of uninitialised variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac2f555e37f589fde27c68a306aaac14a424040b Author: Andrew Cooper AuthorDate: Mon Sep 9 18:43:40 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 10 15:46:35 2013 +0100 x86/mm: Fix possible increment of uninitialised variable Discovered by Coverity, CID 1056101 When taking the continue branch on the first iteration of the loop, gfn would indeed be uninitialised when incremented. However, as gfn is unconditionally constructed from i{1..4} before use in the loop body, having it incremented in the loop header is useless. Therefore, simply remove it. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-pt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 302b621..a1d5650 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -691,7 +691,7 @@ static void p2m_change_type_global(struct p2m_domain *p2m, l1mfn = _mfn(l2e_get_pfn(l2e[i2])); l1e = map_domain_page(mfn_x(l1mfn)); - for ( i1 = 0; i1 < L1_PAGETABLE_ENTRIES; i1++, gfn++ ) + for ( i1 = 0; i1 < L1_PAGETABLE_ENTRIES; i1++ ) { flags = l1e_get_flags(l1e[i1]); if ( p2m_flags_to_type(flags) != ot ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03: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 1VJcaE-0005ui-Me; Wed, 11 Sep 2013 05:03:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaC-0005uR-Uu for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:17 +0000 Received: from [85.158.139.211:11821] by server-2.bemta-5.messagelabs.com id 68/7D-26841-499FF225; Wed, 11 Sep 2013 05:03:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378875794!1821991!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24777 invoked from network); 11 Sep 2013 05:03:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaA-0000Lw-Ag for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcaA-0006G1-8A for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:14 +0000 Date: Wed, 11 Sep 2013 05:03:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add missing va_end to hypercall_xlat_continuation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26d8a37c598464cd097fac42640dbf02c4f405f7 Author: Matthew Daley AuthorDate: Tue Sep 10 17:15:35 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 17:15:35 2013 +0200 x86: add missing va_end to hypercall_xlat_continuation Coverity-ID: 1056208 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7b0308..316ef04 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1648,7 +1648,11 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) + { + va_end(args); return 0; + } + for ( i = 0; i < 6; ++i, mask >>= 1 ) { if ( mask & 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03: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 1VJcaE-0005ui-Me; Wed, 11 Sep 2013 05:03:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaC-0005uR-Uu for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:17 +0000 Received: from [85.158.139.211:11821] by server-2.bemta-5.messagelabs.com id 68/7D-26841-499FF225; Wed, 11 Sep 2013 05:03:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1378875794!1821991!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24777 invoked from network); 11 Sep 2013 05:03:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaA-0000Lw-Ag for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcaA-0006G1-8A for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:14 +0000 Date: Wed, 11 Sep 2013 05:03:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: add missing va_end to hypercall_xlat_continuation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26d8a37c598464cd097fac42640dbf02c4f405f7 Author: Matthew Daley AuthorDate: Tue Sep 10 17:15:35 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 17:15:35 2013 +0200 x86: add missing va_end to hypercall_xlat_continuation Coverity-ID: 1056208 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/domain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7b0308..316ef04 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1648,7 +1648,11 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) + { + va_end(args); return 0; + } + for ( i = 0; i < 6; ++i, mask >>= 1 ) { if ( mask & 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03: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 1VJcaN-0005wb-Pm; Wed, 11 Sep 2013 05:03:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaM-0005wI-Q6 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:26 +0000 Received: from [85.158.143.35:12899] by server-2.bemta-4.messagelabs.com id F0/B0-26052-E99FF225; Wed, 11 Sep 2013 05:03:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378875804!2841305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14014 invoked from network); 11 Sep 2013 05:03:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaK-0000M2-GO for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcaK-0006Gn-Ek for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:24 +0000 Date: Wed, 11 Sep 2013 05:03:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched/arinc653: check for guest data transfer failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546ba2f17008387cf9821df46e6dac04f0883a9b Author: Matthew Daley AuthorDate: Tue Sep 10 17:16:02 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 17:16:02 2013 +0200 sched/arinc653: check for guest data transfer failures Coverity-ID: 1055121 Coverity-ID: 1055122 Coverity-ID: 1055123 Coverity-ID: 1055124 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser --- xen/common/sched_arinc653.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 63ddb82..2502192 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -635,12 +635,21 @@ a653sched_adjust_global(const struct scheduler *ops, switch ( sc->cmd ) { case XEN_SYSCTL_SCHEDOP_putinfo: - copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1); + if ( copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1) ) + { + rc = -EFAULT; + break; + } + rc = arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: rc = arinc653_sched_get(ops, &local_sched); - copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1); + if ( rc ) + break; + + if ( copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1) ) + rc = -EFAULT; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 05:03:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 05:03: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 1VJcaN-0005wb-Pm; Wed, 11 Sep 2013 05:03:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaM-0005wI-Q6 for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:26 +0000 Received: from [85.158.143.35:12899] by server-2.bemta-4.messagelabs.com id F0/B0-26052-E99FF225; Wed, 11 Sep 2013 05:03:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1378875804!2841305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14014 invoked from network); 11 Sep 2013 05:03:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 05:03:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJcaK-0000M2-GO for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJcaK-0006Gn-Ek for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 05:03:24 +0000 Date: Wed, 11 Sep 2013 05:03:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched/arinc653: check for guest data transfer failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546ba2f17008387cf9821df46e6dac04f0883a9b Author: Matthew Daley AuthorDate: Tue Sep 10 17:16:02 2013 +0200 Commit: Jan Beulich CommitDate: Tue Sep 10 17:16:02 2013 +0200 sched/arinc653: check for guest data transfer failures Coverity-ID: 1055121 Coverity-ID: 1055122 Coverity-ID: 1055123 Coverity-ID: 1055124 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser --- xen/common/sched_arinc653.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 63ddb82..2502192 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -635,12 +635,21 @@ a653sched_adjust_global(const struct scheduler *ops, switch ( sc->cmd ) { case XEN_SYSCTL_SCHEDOP_putinfo: - copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1); + if ( copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1) ) + { + rc = -EFAULT; + break; + } + rc = arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: rc = arinc653_sched_get(ops, &local_sched); - copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1); + if ( rc ) + break; + + if ( copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1) ) + rc = -EFAULT; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 21:11:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 21:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgq-0007jO-1r; Wed, 11 Sep 2013 21:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgo-0007jF-OB for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:06 +0000 Received: from [85.158.143.35:52627] by server-3.bemta-4.messagelabs.com id F7/DD-08835-A6CD0325; Wed, 11 Sep 2013 21:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378933864!3076910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7934 invoked from network); 11 Sep 2013 21:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 21:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgm-0003LA-6f for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJrgl-0001xf-VV for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:04 +0000 Date: Wed, 11 Sep 2013 21:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.4-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaee744f5f5f42be89fdaa9b9ab47687a5363359 Author: Jan Beulich AuthorDate: Wed Sep 11 08:22:18 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 11 08:22:18 2013 +0200 update Xen version to 4.2.4-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index d82a2eb..2c1c7ee 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 21:11:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 21:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgq-0007jO-1r; Wed, 11 Sep 2013 21:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgo-0007jF-OB for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:06 +0000 Received: from [85.158.143.35:52627] by server-3.bemta-4.messagelabs.com id F7/DD-08835-A6CD0325; Wed, 11 Sep 2013 21:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1378933864!3076910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7934 invoked from network); 11 Sep 2013 21:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 21:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgm-0003LA-6f for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJrgl-0001xf-VV for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:04 +0000 Date: Wed, 11 Sep 2013 21:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.4-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaee744f5f5f42be89fdaa9b9ab47687a5363359 Author: Jan Beulich AuthorDate: Wed Sep 11 08:22:18 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 11 08:22:18 2013 +0200 update Xen version to 4.2.4-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index d82a2eb..2c1c7ee 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 11 21:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 21:11: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 1VJrh0-0007ke-56; Wed, 11 Sep 2013 21:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgz-0007kU-EN for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:17 +0000 Received: from [193.109.254.147:52128] by server-8.bemta-14.messagelabs.com id 85/82-14324-47CD0325; Wed, 11 Sep 2013 21:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378933874!2104626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31215 invoked from network); 11 Sep 2013 21:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 21:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgw-0003LD-Is for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJrgw-000231-Cv for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:14 +0000 Date: Wed, 11 Sep 2013 21:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ACPI: fix acpi_os_map_memory() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 633c8efb6285e77b13640d7e02178f0ec032262d Author: Jan Beulich AuthorDate: Wed Sep 11 08:23:29 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 11 08:23:29 2013 +0200 ACPI: fix acpi_os_map_memory() It using map_domain_page() was entirely wrong. Use __acpi_map_table() instead for the time being, with locking added as the mappings it produces get replaced with subsequent invocations. Using locking in this way is acceptable here since the only two runtime callers are acpi_os_{read,write}_memory(), which don't leave mappings pending upon returning to their callers. Also fix __acpi_map_table()'s first parameter's type - while benign for unstable, backports to pre-4.3 trees will need this. Signed-off-by: Jan Beulich master commit: 2ee9cbf9d8eaeff6e21222905d22dbd58dc5fe29 master date: 2013-08-21 08:38:40 +0200 --- xen/arch/x86/acpi/lib.c | 2 +- xen/drivers/acpi/osl.c | 23 +++++++++++++---------- xen/include/xen/acpi.h | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/acpi/lib.c b/xen/arch/x86/acpi/lib.c index e8e69d1..1f98c31 100644 --- a/xen/arch/x86/acpi/lib.c +++ b/xen/arch/x86/acpi/lib.c @@ -39,7 +39,7 @@ u32 __read_mostly x86_acpiid_to_apicid[MAX_MADT_ENTRIES] = * from the fixed base. That's why we start at FIX_ACPI_END and * count idx down while incrementing the phys address. */ -char *__acpi_map_table(unsigned long phys, unsigned long size) +char *__acpi_map_table(paddr_t phys, unsigned long size) { unsigned long base, offset, mapped_size; int idx; diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index dd96a1a..8761747 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -82,14 +82,20 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) } } -void __iomem *__init +static DEFINE_SPINLOCK(map_lock); + +void __iomem * acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { - return __acpi_map_table((unsigned long)phys, size); + if (system_state >= SYS_STATE_active) + spin_lock(&map_lock); + return __acpi_map_table(phys, size); } -void __init acpi_os_unmap_memory(void __iomem * virt, acpi_size size) +void acpi_os_unmap_memory(void __iomem * virt, acpi_size size) { + if (system_state >= SYS_STATE_active) + spin_unlock(&map_lock); } acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width) @@ -132,9 +138,8 @@ acpi_status acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) { u32 dummy; - void __iomem *virt_addr; + void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); - virt_addr = map_domain_page(phys_addr>>PAGE_SHIFT); if (!value) value = &dummy; @@ -152,7 +157,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) BUG(); } - unmap_domain_page(virt_addr); + acpi_os_unmap_memory(virt_addr, width >> 3); return AE_OK; } @@ -160,9 +165,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) acpi_status acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) { - void __iomem *virt_addr; - - virt_addr = map_domain_page(phys_addr>>PAGE_SHIFT); + void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); switch (width) { case 8: @@ -178,7 +181,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) BUG(); } - unmap_domain_page(virt_addr); + acpi_os_unmap_memory(virt_addr, width >> 3); return AE_OK; } diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index d7e2f94..2b4ef72 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -56,7 +56,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); unsigned int acpi_get_processor_id (unsigned int cpu); -char * __acpi_map_table (unsigned long phys_addr, unsigned long size); +char * __acpi_map_table (paddr_t phys_addr, unsigned long size); int acpi_boot_init (void); int acpi_boot_table_init (void); int acpi_numa_init (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 Sep 11 21:11:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Sep 2013 21:11: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 1VJrh0-0007ke-56; Wed, 11 Sep 2013 21:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgz-0007kU-EN for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:17 +0000 Received: from [193.109.254.147:52128] by server-8.bemta-14.messagelabs.com id 85/82-14324-47CD0325; Wed, 11 Sep 2013 21:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1378933874!2104626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31215 invoked from network); 11 Sep 2013 21:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2013 21:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VJrgw-0003LD-Is for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VJrgw-000231-Cv for xen-changelog@lists.xensource.com; Wed, 11 Sep 2013 21:11:14 +0000 Date: Wed, 11 Sep 2013 21:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ACPI: fix acpi_os_map_memory() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 633c8efb6285e77b13640d7e02178f0ec032262d Author: Jan Beulich AuthorDate: Wed Sep 11 08:23:29 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 11 08:23:29 2013 +0200 ACPI: fix acpi_os_map_memory() It using map_domain_page() was entirely wrong. Use __acpi_map_table() instead for the time being, with locking added as the mappings it produces get replaced with subsequent invocations. Using locking in this way is acceptable here since the only two runtime callers are acpi_os_{read,write}_memory(), which don't leave mappings pending upon returning to their callers. Also fix __acpi_map_table()'s first parameter's type - while benign for unstable, backports to pre-4.3 trees will need this. Signed-off-by: Jan Beulich master commit: 2ee9cbf9d8eaeff6e21222905d22dbd58dc5fe29 master date: 2013-08-21 08:38:40 +0200 --- xen/arch/x86/acpi/lib.c | 2 +- xen/drivers/acpi/osl.c | 23 +++++++++++++---------- xen/include/xen/acpi.h | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/acpi/lib.c b/xen/arch/x86/acpi/lib.c index e8e69d1..1f98c31 100644 --- a/xen/arch/x86/acpi/lib.c +++ b/xen/arch/x86/acpi/lib.c @@ -39,7 +39,7 @@ u32 __read_mostly x86_acpiid_to_apicid[MAX_MADT_ENTRIES] = * from the fixed base. That's why we start at FIX_ACPI_END and * count idx down while incrementing the phys address. */ -char *__acpi_map_table(unsigned long phys, unsigned long size) +char *__acpi_map_table(paddr_t phys, unsigned long size) { unsigned long base, offset, mapped_size; int idx; diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index dd96a1a..8761747 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -82,14 +82,20 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) } } -void __iomem *__init +static DEFINE_SPINLOCK(map_lock); + +void __iomem * acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { - return __acpi_map_table((unsigned long)phys, size); + if (system_state >= SYS_STATE_active) + spin_lock(&map_lock); + return __acpi_map_table(phys, size); } -void __init acpi_os_unmap_memory(void __iomem * virt, acpi_size size) +void acpi_os_unmap_memory(void __iomem * virt, acpi_size size) { + if (system_state >= SYS_STATE_active) + spin_unlock(&map_lock); } acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width) @@ -132,9 +138,8 @@ acpi_status acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) { u32 dummy; - void __iomem *virt_addr; + void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); - virt_addr = map_domain_page(phys_addr>>PAGE_SHIFT); if (!value) value = &dummy; @@ -152,7 +157,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) BUG(); } - unmap_domain_page(virt_addr); + acpi_os_unmap_memory(virt_addr, width >> 3); return AE_OK; } @@ -160,9 +165,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) acpi_status acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) { - void __iomem *virt_addr; - - virt_addr = map_domain_page(phys_addr>>PAGE_SHIFT); + void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); switch (width) { case 8: @@ -178,7 +181,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) BUG(); } - unmap_domain_page(virt_addr); + acpi_os_unmap_memory(virt_addr, width >> 3); return AE_OK; } diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index d7e2f94..2b4ef72 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -56,7 +56,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); unsigned int acpi_get_processor_id (unsigned int cpu); -char * __acpi_map_table (unsigned long phys_addr, unsigned long size); +char * __acpi_map_table (paddr_t phys_addr, unsigned long size); int acpi_boot_init (void); int acpi_boot_table_init (void); int acpi_numa_init (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 Thu Sep 12 20:44:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkG-00080q-0v; Thu, 12 Sep 2013 20:44:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkE-00080c-UE for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:07 +0000 Received: from [85.158.143.35:34542] by server-3.bemta-4.messagelabs.com id 0F/2E-08835-69722325; Thu, 12 Sep 2013 20:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379018644!3414570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1035 invoked from network); 12 Sep 2013 20:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkC-0001Z8-91 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkB-0001wO-V2 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:04 +0000 Date: Thu, 12 Sep 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64afca0c191eb940eefa80c814b5b4d18d648d78 Author: Andrew Cooper AuthorDate: Thu Sep 12 10:58:40 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 10:58:40 2013 +0200 x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages In all cases when a hypercall page is written, __HYPERVISOR_iret is first written as a regular hypercall, then subsequently rewritten in its special case. For VMX and SVM, this means that following the ud2a instruction is 3 bytes of an imm32 parameter. For a ring3 kernel, this means that following the syscall instruction is the second half of 'pop %r11'. For a ring1 kernel, the iret case ends up as the same number of bytes as the rest of the hypercalls, but it is pointless writing it twice, and is changed for consistency. Therefore, skip the loop iteration which would write the incorrect __HYPERVISOR_iret hypercall. This removes junk machine code from the tail and makes disassemblers rather more happy when looking at the hypercall page. Also, a miscellaneous whitespace fix in the comment for ring3 kernel. Signed-off-by: Andrew Cooper master commit: fca11da0ec956b17d7450d7776c3ffa22a8f538a master date: 2013-07-16 11:10:45 +0200 --- xen/arch/x86/hvm/svm/svm.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 3 +++ xen/arch/x86/x86_64/compat/traps.c | 3 +++ xen/arch/x86/x86_64/traps.c | 7 +++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e74984e..48a3f01 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -763,6 +763,9 @@ static void svm_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa43971..5a3a152 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1008,6 +1008,9 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 03b90b2..6e0ff11 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -362,6 +362,9 @@ static void hypercall_page_initialise_ring1_kernel(void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0xb8; /* mov $,%eax */ *(u32 *)(p+ 1) = i; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 806cf2e..00bee9b 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -588,6 +588,9 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) /* Fill in all the transfer points with template machine code. */ for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0x51; /* push %rcx */ *(u16 *)(p+ 1) = 0x5341; /* push %r11 */ @@ -600,8 +603,8 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) } /* - * HYPERVISOR_iret is special because it doesn't return and expects a - * special stack frame. Guests jump at this transfer point instead of + * HYPERVISOR_iret is special because it doesn't return and expects a + * special stack frame. Guests jump at this transfer point instead of * calling it. */ p = (char *)(hypercall_page + (__HYPERVISOR_iret * 32)); -- 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 Sep 12 20:44:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkG-00080q-0v; Thu, 12 Sep 2013 20:44:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkE-00080c-UE for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:07 +0000 Received: from [85.158.143.35:34542] by server-3.bemta-4.messagelabs.com id 0F/2E-08835-69722325; Thu, 12 Sep 2013 20:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379018644!3414570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1035 invoked from network); 12 Sep 2013 20:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkC-0001Z8-91 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkB-0001wO-V2 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:04 +0000 Date: Thu, 12 Sep 2013 20:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64afca0c191eb940eefa80c814b5b4d18d648d78 Author: Andrew Cooper AuthorDate: Thu Sep 12 10:58:40 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 10:58:40 2013 +0200 x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages In all cases when a hypercall page is written, __HYPERVISOR_iret is first written as a regular hypercall, then subsequently rewritten in its special case. For VMX and SVM, this means that following the ud2a instruction is 3 bytes of an imm32 parameter. For a ring3 kernel, this means that following the syscall instruction is the second half of 'pop %r11'. For a ring1 kernel, the iret case ends up as the same number of bytes as the rest of the hypercalls, but it is pointless writing it twice, and is changed for consistency. Therefore, skip the loop iteration which would write the incorrect __HYPERVISOR_iret hypercall. This removes junk machine code from the tail and makes disassemblers rather more happy when looking at the hypercall page. Also, a miscellaneous whitespace fix in the comment for ring3 kernel. Signed-off-by: Andrew Cooper master commit: fca11da0ec956b17d7450d7776c3ffa22a8f538a master date: 2013-07-16 11:10:45 +0200 --- xen/arch/x86/hvm/svm/svm.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 3 +++ xen/arch/x86/x86_64/compat/traps.c | 3 +++ xen/arch/x86/x86_64/traps.c | 7 +++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e74984e..48a3f01 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -763,6 +763,9 @@ static void svm_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fa43971..5a3a152 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1008,6 +1008,9 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 03b90b2..6e0ff11 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -362,6 +362,9 @@ static void hypercall_page_initialise_ring1_kernel(void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0xb8; /* mov $,%eax */ *(u32 *)(p+ 1) = i; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 806cf2e..00bee9b 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -588,6 +588,9 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) /* Fill in all the transfer points with template machine code. */ for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0x51; /* push %rcx */ *(u16 *)(p+ 1) = 0x5341; /* push %r11 */ @@ -600,8 +603,8 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) } /* - * HYPERVISOR_iret is special because it doesn't return and expects a - * special stack frame. Guests jump at this transfer point instead of + * HYPERVISOR_iret is special because it doesn't return and expects a + * special stack frame. Guests jump at this transfer point instead of * calling it. */ p = (char *)(hypercall_page + (__HYPERVISOR_iret * 32)); -- 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 Sep 12 20:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkQ-00081c-4P; Thu, 12 Sep 2013 20: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 1VKDkO-00081O-Ss for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:16 +0000 Received: from [85.158.143.35:34999] by server-3.bemta-4.messagelabs.com id C3/4E-08835-0A722325; Thu, 12 Sep 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379018654!3407343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3636 invoked from network); 12 Sep 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkM-0001ZB-IV for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkM-0001x5-DA for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:14 +0000 Date: Thu, 12 Sep 2013 20:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f8a4aa9c19aa9f31fa62521b8fc6c5086d5c4e8 Author: Jan Beulich AuthorDate: Thu Sep 12 11:25:34 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:25:34 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: 850188e1278cecd1dfb9b936024bee2d8dfdcc18 master date: 2013-08-27 11:11:38 +0200 --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 0dbec96..2a690fa 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1261,6 +1261,10 @@ int __init construct_dom0( if ( smp_found_config ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 20:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkQ-00081c-4P; Thu, 12 Sep 2013 20: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 1VKDkO-00081O-Ss for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:16 +0000 Received: from [85.158.143.35:34999] by server-3.bemta-4.messagelabs.com id C3/4E-08835-0A722325; Thu, 12 Sep 2013 20:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379018654!3407343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3636 invoked from network); 12 Sep 2013 20:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkM-0001ZB-IV for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkM-0001x5-DA for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:14 +0000 Date: Thu, 12 Sep 2013 20:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't allow Dom0 access to the MSI address range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f8a4aa9c19aa9f31fa62521b8fc6c5086d5c4e8 Author: Jan Beulich AuthorDate: Thu Sep 12 11:25:34 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:25:34 2013 +0200 x86: don't allow Dom0 access to the MSI address range In particular, MMIO assignments should not be done using this area. Signed-off-by: Jan Beulich Acked-by Xiantao Zhang master commit: 850188e1278cecd1dfb9b936024bee2d8dfdcc18 master date: 2013-08-27 11:11:38 +0200 --- xen/arch/x86/domain_build.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 0dbec96..2a690fa 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1261,6 +1261,10 @@ int __init construct_dom0( if ( smp_found_config ) rc |= iomem_deny_access(dom0, mfn, mfn); } + /* MSI range. */ + rc |= iomem_deny_access(dom0, paddr_to_pfn(MSI_ADDR_BASE_LO), + paddr_to_pfn(MSI_ADDR_BASE_LO + + MSI_ADDR_DEST_ID_MASK)); /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 20:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20: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 1VKDkb-00082c-7K; Thu, 12 Sep 2013 20:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkZ-00082Q-Vm for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:28 +0000 Received: from [85.158.137.68:62750] by server-6.bemta-3.messagelabs.com id 67/21-32441-BA722325; Thu, 12 Sep 2013 20:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1379018664!1866551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30436 invoked from network); 12 Sep 2013 20:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkW-0001ZH-PQ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkW-0001xi-MH for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:24 +0000 Date: Thu, 12 Sep 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b8656cdad7edec38affc87b6782f9cb0c442746c Author: Jan Beulich AuthorDate: Thu Sep 12 11:26:40 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:26:40 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 062919448e2f4b127c9c3c085b1a8e1d56a33051 master date: 2013-08-28 17:03:50 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b894d80..1bac6b8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3902,8 +3899,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4171,7 +4169,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- 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 Sep 12 20:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20: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 1VKDkb-00082c-7K; Thu, 12 Sep 2013 20:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkZ-00082Q-Vm for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:28 +0000 Received: from [85.158.137.68:62750] by server-6.bemta-3.messagelabs.com id 67/21-32441-BA722325; Thu, 12 Sep 2013 20:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1379018664!1866551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30436 invoked from network); 12 Sep 2013 20:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkW-0001ZH-PQ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkW-0001xi-MH for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:24 +0000 Date: Thu, 12 Sep 2013 20:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: AVX instruction emulation fixes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b8656cdad7edec38affc87b6782f9cb0c442746c Author: Jan Beulich AuthorDate: Thu Sep 12 11:26:40 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:26:40 2013 +0200 x86: AVX instruction emulation fixes - we used the C4/C5 (first prefix) byte instead of the apparent ModR/M one as the second prefix byte - early decoding normalized vex.reg, thus corrupting it for the main consumer (copy_REX_VEX()), resulting in #UD on the two-operand instructions we emulate Also add respective test cases to the testing utility plus - fix get_fpu() (the fall-through order was inverted) - add cpu_has_avx2, even if it's currently unused (as in the new test cases I decided to refrain from using AVX2 instructions in order to be able to actually run all the tests on the hardware I have) - slightly tweak cpu_has_avx to more consistently express the outputs we don't care about (sinking them all into the same variable) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 062919448e2f4b127c9c3c085b1a8e1d56a33051 master date: 2013-08-28 17:03:50 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 144 ++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 16 ++-- 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3142917..8af30be 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -94,13 +94,25 @@ static inline uint64_t xgetbv(uint32_t xcr) } #define cpu_has_avx ({ \ - unsigned int eax = 1, ecx = 0, edx; \ - cpuid(&eax, &edx, &ecx, &edx, NULL); \ + unsigned int eax = 1, ecx = 0; \ + cpuid(&eax, &eax, &ecx, &eax, NULL); \ if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ ecx = 0; \ (ecx & (1U << 28)) != 0; \ }) +#define cpu_has_avx2 ({ \ + unsigned int eax = 1, ebx, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + if ( !(ecx & (1U << 27)) || ((xgetbv(0) & 6) != 6) ) \ + ebx = 0; \ + else { \ + eax = 7, ecx = 0; \ + cpuid(&eax, &ebx, &ecx, &eax, NULL); \ + } \ + (ebx & (1U << 5)) != 0; \ +}) + int get_fpu( void (*exception_callback)(void *, struct cpu_user_regs *), void *exception_callback_arg, @@ -111,14 +123,14 @@ int get_fpu( { case X86EMUL_FPU_fpu: break; - case X86EMUL_FPU_ymm: - if ( cpu_has_avx ) + case X86EMUL_FPU_mmx: + if ( cpu_has_mmx ) break; case X86EMUL_FPU_xmm: if ( cpu_has_sse ) break; - case X86EMUL_FPU_mmx: - if ( cpu_has_mmx ) + case X86EMUL_FPU_ymm: + if ( cpu_has_avx ) break; default: return X86EMUL_UNHANDLEABLE; @@ -629,6 +641,73 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_to_mem[]; + + asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" + ".popsection" :: "c" (NULL) ); + + memcpy(instr, vmovdqu_to_mem, 15); + memset(res, 0x55, 128); + memset(res + 16, 0xff, 16); + memset(res + 20, 0x00, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovdqu_from_mem[]; + +#if 0 /* Don't use AVX2 instructions for now */ + asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" +#else + asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" + "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" +#endif + ".pushsection .test, \"a\", @progbits\n" + "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovdqu_from_mem, 15); + memset(res + 4, 0xff, 16); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; +#if 0 /* Don't use AVX2 instructions for now */ + asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" + "vpcmpeqb %%ymm4, %%ymm2, %%ymm0\n\t" + "vpmovmskb %%ymm1, %0" : "=r" (rc) ); +#else + asm ( "vextractf128 $1, %%ymm4, %%xmm3\n\t" + "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n\t" + "vpcmpeqb %%xmm4, %%xmm2, %%xmm0\n\t" + "vpcmpeqb %%xmm3, %%xmm2, %%xmm1\n\t" + "vpmovmskb %%xmm0, %0\n\t" + "vpmovmskb %%xmm1, %1" : "=r" (rc), "=r" (i) ); + rc |= i << 16; +#endif + if ( rc != 0xffffffff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movsd %xmm5,(%ecx)..."); memset(res, 0x77, 64); memset(res + 10, 0x66, 8); @@ -683,6 +762,59 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsd %xmm5,(%ecx)..."); + memset(res, 0x88, 64); + memset(res + 10, 0x77, 8); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovsd_to_mem[]; + + asm volatile ( "vbroadcastsd %0, %%ymm5\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" + ".popsection" :: "m" (res[10]), "c" (NULL) ); + + memcpy(instr, vmovsd_to_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 2); + regs.edx = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + goto fail; + printf("okay\n"); + } + else + { + printf("skipped\n"); + memset(res + 2, 0x77, 8); + } + + printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); + if ( stack_exec && cpu_has_avx ) + { + extern const unsigned char vmovaps_from_mem[]; + + asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" + ".pushsection .test, \"a\", @progbits\n" + "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" + ".popsection" :: "d" (NULL) ); + + memcpy(instr, vmovaps_from_mem, 15); + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY ) + goto fail; + asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" + "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); + if ( rc != 0xff ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b894d80..1bac6b8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1454,10 +1454,10 @@ x86_emulate( /* VEX */ generate_exception_if(rex_prefix || vex.pfx, EXC_UD, -1); - vex.raw[0] = b; + vex.raw[0] = modrm; if ( b & 1 ) { - vex.raw[1] = b; + vex.raw[1] = modrm; vex.opcx = vex_0f; vex.x = 1; vex.b = 1; @@ -1479,10 +1479,7 @@ x86_emulate( } } } - vex.reg ^= 0xf; - if ( !mode_64bit() ) - vex.reg &= 0x7; - else if ( !vex.r ) + if ( mode_64bit() && !vex.r ) rex_prefix |= REX_R; fail_if(vex.opcx != vex_0f); @@ -3902,8 +3899,9 @@ x86_emulate( else { fail_if((vex.opcx != vex_0f) || - (vex.reg && ((ea.type == OP_MEM) || - !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); + ((vex.reg != 0xf) && + ((ea.type == OP_MEM) || + !(vex.pfx & VEX_PREFIX_SCALAR_MASK)))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); ea.bytes = 16 << vex.l; @@ -4171,7 +4169,7 @@ x86_emulate( } else { - fail_if((vex.opcx != vex_0f) || vex.reg || + fail_if((vex.opcx != vex_0f) || (vex.reg != 0xf) || ((vex.pfx != vex_66) && (vex.pfx != vex_f3))); vcpu_must_have_avx(); get_fpu(X86EMUL_FPU_ymm, &fic); -- 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 Sep 12 20:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20: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 1VKDkl-00083q-Av; Thu, 12 Sep 2013 20:44:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkj-00083Y-F0 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:37 +0000 Received: from [85.158.143.35:26271] by server-1.bemta-4.messagelabs.com id A8/B0-16125-4B722325; Thu, 12 Sep 2013 20:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379018675!3407392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4723 invoked from network); 12 Sep 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkg-0001ZQ-Vs for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkg-0001yQ-U1 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:34 +0000 Date: Thu, 12 Sep 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7c05bbb21b4747693b5fc04a1da4aa6f44446fc Author: Steven Noonan AuthorDate: Thu Sep 12 11:27:27 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:27:27 2013 +0200 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 1893cf77992cc0ce9d827a8d345437fa2494b540 master date: 2013-09-03 16:36:47 +0100 --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- 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 Sep 12 20:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20: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 1VKDkl-00083q-Av; Thu, 12 Sep 2013 20:44:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkj-00083Y-F0 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:37 +0000 Received: from [85.158.143.35:26271] by server-1.bemta-4.messagelabs.com id A8/B0-16125-4B722325; Thu, 12 Sep 2013 20:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379018675!3407392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4723 invoked from network); 12 Sep 2013 20:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkg-0001ZQ-Vs for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkg-0001yQ-U1 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:34 +0000 Date: Thu, 12 Sep 2013 20:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xend: handle extended PCI configuration space when saving state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7c05bbb21b4747693b5fc04a1da4aa6f44446fc Author: Steven Noonan AuthorDate: Thu Sep 12 11:27:27 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:27:27 2013 +0200 xend: handle extended PCI configuration space when saving state Newer PCI standards (e.g., PCI-X 2.0 and PCIe) introduce extended configuration space which is larger than 256 bytes. This patch uses stat() to determine the amount of space used to correctly save all of the PCI configuration space. Resets handled by the xen-pciback driver don't have this problem, as that code correctly handles saving extended configuration space. Signed-off-by: Steven Noonan Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 1893cf77992cc0ce9d827a8d345437fa2494b540 master date: 2013-09-03 16:36:47 +0100 --- tools/python/xen/util/pci.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 98bea1a..307144c 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -521,8 +521,9 @@ def save_pci_conf_space(devs_string): pci_path = sysfs_mnt + SYSFS_PCI_DEVS_PATH + '/' + pci_str + \ SYSFS_PCI_DEV_CONFIG_PATH fd = os.open(pci_path, os.O_RDONLY) + size = os.fstat(fd).st_size configs = [] - for i in range(0, 256, 4): + for i in range(0, size, 4): configs = configs + [os.read(fd,4)] os.close(fd) pci_list = pci_list + [pci_path] -- 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 Sep 12 20:44:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkv-00085W-E3; Thu, 12 Sep 2013 20:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkt-00085D-KS for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:47 +0000 Received: from [85.158.143.35:26710] by server-3.bemta-4.messagelabs.com id D5/8E-08835-FB722325; Thu, 12 Sep 2013 20:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379018685!3424268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22361 invoked from network); 12 Sep 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkr-0001ZV-5f for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkr-0001z2-3c for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:45 +0000 Date: Thu, 12 Sep 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0605de0e2db799b30d3f93490132ba916034b289 Author: Xi Xiong AuthorDate: Thu Sep 12 11:28:03 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:28:03 2013 +0200 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 749019afca4fd002d36856bad002cc11f7d0ddda master date: 2013-09-03 16:36:52 +0100 --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) 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 Thu Sep 12 20:44:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkv-00085W-E3; Thu, 12 Sep 2013 20:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDkt-00085D-KS for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:47 +0000 Received: from [85.158.143.35:26710] by server-3.bemta-4.messagelabs.com id D5/8E-08835-FB722325; Thu, 12 Sep 2013 20:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379018685!3424268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22361 invoked from network); 12 Sep 2013 20:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 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 1VKDkr-0001ZV-5f for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDkr-0001z2-3c for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:45 +0000 Date: Thu, 12 Sep 2013 20:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xend: fix file descriptor leak in pci utilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0605de0e2db799b30d3f93490132ba916034b289 Author: Xi Xiong AuthorDate: Thu Sep 12 11:28:03 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:28:03 2013 +0200 xend: fix file descriptor leak in pci utilities A file descriptor leak was detected after creating multiple domUs with pass-through PCI devices. This patch fixes the issue. Signed-off-by: Xi Xiong Reviewed-by: Matt Wilson [msw: adjusted commit message] Signed-off-by: Matt Wilson master commit: 749019afca4fd002d36856bad002cc11f7d0ddda master date: 2013-09-03 16:36:52 +0100 --- tools/python/xen/util/pci.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py index 307144c..adeca4b 100644 --- a/tools/python/xen/util/pci.py +++ b/tools/python/xen/util/pci.py @@ -969,18 +969,22 @@ class PciDevice: ttl = 480; # 3840 bytes, minimum 8 bytes per capability pos = 0x100 + fd = None try: fd = os.open(path, os.O_RDONLY) os.lseek(fd, pos, 0) h = os.read(fd, 4) if len(h) == 0: # MMCONF is not enabled? + os.close(fd) return 0 header = struct.unpack('I', h)[0] if header == 0 or header == -1: + os.close(fd) return 0 while ttl > 0: if (header & 0x0000ffff) == cap: + os.close(fd) return pos pos = (header >> 20) & 0xffc if pos < 0x100: @@ -990,6 +994,8 @@ class PciDevice: ttl = ttl - 1 os.close(fd) except OSError, (errno, strerr): + if fd is not None: + os.close(fd) raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' % (strerr, errno))) 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 Thu Sep 12 20:45:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl5-00088n-HA; Thu, 12 Sep 2013 20:44:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl4-00088U-5A for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:58 +0000 Received: from [85.158.143.35:27189] by server-3.bemta-4.messagelabs.com id D8/9E-08835-9C722325; Thu, 12 Sep 2013 20:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379018695!3417629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30294 invoked from network); 12 Sep 2013 20:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl1-0001Zh-Aw for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDl1-0001zf-9E for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:55 +0000 Date: Thu, 12 Sep 2013 20:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed36fc9961134fa1fa051e35ceb4a08b77099106 Author: Jan Beulich AuthorDate: Thu Sep 12 11:30:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:30:36 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich master commit: a350f3f43bcfac9c1591e28d8e43c505fcb172a5 master date: 2013-09-09 10:40:11 +0200 --- xen/arch/x86/efi/boot.c | 102 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 91 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 184448c..5fe31d6 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -21,6 +21,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + extern char start[]; extern u32 cpuid_ext_features; @@ -1290,7 +1293,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1333,6 +1336,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1376,6 +1380,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1383,6 +1388,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1437,15 +1449,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1456,20 +1482,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- 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 Sep 12 20:45:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl5-00088n-HA; Thu, 12 Sep 2013 20:44:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl4-00088U-5A for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:58 +0000 Received: from [85.158.143.35:27189] by server-3.bemta-4.messagelabs.com id D8/9E-08835-9C722325; Thu, 12 Sep 2013 20:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379018695!3417629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30294 invoked from network); 12 Sep 2013 20:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDl1-0001Zh-Aw for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDl1-0001zf-9E for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:44:55 +0000 Date: Thu, 12 Sep 2013 20:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed36fc9961134fa1fa051e35ceb4a08b77099106 Author: Jan Beulich AuthorDate: Thu Sep 12 11:30:36 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:30:36 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich master commit: a350f3f43bcfac9c1591e28d8e43c505fcb172a5 master date: 2013-09-09 10:40:11 +0200 --- xen/arch/x86/efi/boot.c | 102 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 91 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 184448c..5fe31d6 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -21,6 +21,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + extern char start[]; extern u32 cpuid_ext_features; @@ -1290,7 +1293,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1333,6 +1336,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1376,6 +1380,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1383,6 +1388,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1437,15 +1449,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1456,20 +1482,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- 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 Sep 12 20:45:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlI-0008AX-QC; Thu, 12 Sep 2013 20:45:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlF-00089k-Uo for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:10 +0000 Received: from [85.158.139.211:44148] by server-6.bemta-5.messagelabs.com id 67/FB-05559-4D722325; Thu, 12 Sep 2013 20:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379018705!2289437!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18272 invoked from network); 12 Sep 2013 20:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlB-0001ai-Jy for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlB-00021I-FN for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:05 +0000 Date: Thu, 12 Sep 2013 20:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61823f5ebc4550fa8f6a780b22654b18e2c08894 Author: Joby Poriyath AuthorDate: Thu Sep 12 11:31:31 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:31:31 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath master commit: a35137373aa9042424565e5ee76dc0a3bb7642ae master date: 2013-09-09 10:43:11 +0200 --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index cfc7c80..8741646 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -188,6 +188,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -248,13 +261,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -284,22 +300,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- 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 Sep 12 20:45:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlI-0008AX-QC; Thu, 12 Sep 2013 20:45:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlF-00089k-Uo for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:10 +0000 Received: from [85.158.139.211:44148] by server-6.bemta-5.messagelabs.com id 67/FB-05559-4D722325; Thu, 12 Sep 2013 20:45:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379018705!2289437!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18272 invoked from network); 12 Sep 2013 20:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlB-0001ai-Jy for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlB-00021I-FN for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:05 +0000 Date: Thu, 12 Sep 2013 20:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61823f5ebc4550fa8f6a780b22654b18e2c08894 Author: Joby Poriyath AuthorDate: Thu Sep 12 11:31:31 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:31:31 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath master commit: a35137373aa9042424565e5ee76dc0a3bb7642ae master date: 2013-09-09 10:43:11 +0200 --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index cfc7c80..8741646 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -188,6 +188,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -248,13 +261,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -284,22 +300,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- 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 Sep 12 20:45:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45: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 1VKDlQ-0008CV-Tf; Thu, 12 Sep 2013 20:45:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlO-0008Bv-Qr for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:19 +0000 Received: from [85.158.137.68:64922] by server-2.bemta-3.messagelabs.com id 1E/D4-14467-ED722325; Thu, 12 Sep 2013 20:45:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1379018716!1862793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3663 invoked from network); 12 Sep 2013 20:45:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlL-0001al-QK for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlL-000220-Nv for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:15 +0000 Date: Thu, 12 Sep 2013 20:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d3b2772fef3fc200204c150304887ab699da68b Author: Jan Beulich AuthorDate: Thu Sep 12 11:32:21 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:32:21 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c6066e78f4a66005b0d5d86c6ade32e2ab78923a master date: 2013-08-30 10:56:07 +0200 --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index b8cd59c..44542f4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -369,7 +369,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index e1412e2..27a0ede 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -253,11 +253,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -266,6 +265,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -277,31 +277,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: 0x%x and states: 0x%"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 3c6f91d..b0b9a1c 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -83,6 +83,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- 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 Sep 12 20:45:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45: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 1VKDlQ-0008CV-Tf; Thu, 12 Sep 2013 20:45:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlO-0008Bv-Qr for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:19 +0000 Received: from [85.158.137.68:64922] by server-2.bemta-3.messagelabs.com id 1E/D4-14467-ED722325; Thu, 12 Sep 2013 20:45:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1379018716!1862793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3663 invoked from network); 12 Sep 2013 20:45:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 20:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlL-0001al-QK for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlL-000220-Nv for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:15 +0000 Date: Thu, 12 Sep 2013 20:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d3b2772fef3fc200204c150304887ab699da68b Author: Jan Beulich AuthorDate: Thu Sep 12 11:32:21 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:32:21 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c6066e78f4a66005b0d5d86c6ade32e2ab78923a master date: 2013-08-30 10:56:07 +0200 --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index b8cd59c..44542f4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -369,7 +369,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index e1412e2..27a0ede 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -253,11 +253,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -266,6 +265,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -277,31 +277,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: 0x%x and states: 0x%"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 3c6f91d..b0b9a1c 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -83,6 +83,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- 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 Sep 12 20:45:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45: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 1VKDlb-0008Ek-0s; Thu, 12 Sep 2013 20:45:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlZ-0008EP-SP for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:30 +0000 Received: from [85.158.139.211:42221] by server-17.bemta-5.messagelabs.com id 5A/9C-19396-9E722325; Thu, 12 Sep 2013 20:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1379018726!2274988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16606 invoked from network); 12 Sep 2013 20:45:27 -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 Sep 2013 20:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlW-0001ar-1v for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlV-00022Z-VB for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:26 +0000 Date: Thu, 12 Sep 2013 20:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d7f80b1afe38a05a5592c362f8a6413cdeb419b Author: Jan Beulich AuthorDate: Thu Sep 12 11:33:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:33:44 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser master commit: 4cc1344447a0458df5d222960f2adf1b65084fa8 master date: 2013-09-09 14:36:54 +0200 --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 58f3039..89dd3cb 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -711,7 +711,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1625,9 +1625,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f1146cd..aa368a6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1374,11 +1374,8 @@ long arch_do_domctl( struct domain *d; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1399,15 +1396,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1430,7 +1428,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1438,13 +1436,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1465,20 +1464,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0740df7..7792ca8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -845,14 +845,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -898,7 +896,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -910,20 +910,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -931,11 +931,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -947,47 +947,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1001,7 +1028,8 @@ static int __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2711,7 +2739,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 795ffd7..d98024b 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -790,8 +790,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index a055224..7c1feb6 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -126,13 +127,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -242,7 +245,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -272,7 +275,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 5873358..dfe3da9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -851,7 +851,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -876,7 +876,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 27a0ede..b0ac1ff 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -212,13 +212,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -240,8 +240,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -259,7 +259,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -279,7 +283,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -288,14 +291,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: 0x%x and states: 0x%"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -306,6 +309,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index a3235a5..9412395 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -525,9 +525,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3592a8c..a440fb4 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -363,7 +363,7 @@ static inline int hvm_do_pmu_interrupt(struct cpu_user_regs *regs) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index b0b9a1c..ddac468 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -33,7 +33,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -78,11 +77,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- 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 Sep 12 20:45:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 20:45: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 1VKDlb-0008Ek-0s; Thu, 12 Sep 2013 20:45:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlZ-0008EP-SP for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:30 +0000 Received: from [85.158.139.211:42221] by server-17.bemta-5.messagelabs.com id 5A/9C-19396-9E722325; Thu, 12 Sep 2013 20:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1379018726!2274988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16606 invoked from network); 12 Sep 2013 20:45:27 -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 Sep 2013 20:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKDlW-0001ar-1v for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKDlV-00022Z-VB for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 20:45:26 +0000 Date: Thu, 12 Sep 2013 20:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d7f80b1afe38a05a5592c362f8a6413cdeb419b Author: Jan Beulich AuthorDate: Thu Sep 12 11:33:44 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:33:44 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser master commit: 4cc1344447a0458df5d222960f2adf1b65084fa8 master date: 2013-09-09 14:36:54 +0200 --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 58f3039..89dd3cb 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -711,7 +711,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1625,9 +1625,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f1146cd..aa368a6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1374,11 +1374,8 @@ long arch_do_domctl( struct domain *d; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1399,15 +1396,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1430,7 +1428,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1438,13 +1436,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1465,20 +1464,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0740df7..7792ca8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -845,14 +845,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -898,7 +896,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -910,20 +910,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -931,11 +931,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -947,47 +947,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1001,7 +1028,8 @@ static int __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2711,7 +2739,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 795ffd7..d98024b 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -790,8 +790,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index a055224..7c1feb6 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -126,13 +127,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -242,7 +245,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -272,7 +275,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 5873358..dfe3da9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -851,7 +851,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -876,7 +876,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 27a0ede..b0ac1ff 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -212,13 +212,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -240,8 +240,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -259,7 +259,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -279,7 +283,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -288,14 +291,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: 0x%x and states: 0x%"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -306,6 +309,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index a3235a5..9412395 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -525,9 +525,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3592a8c..a440fb4 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -363,7 +363,7 @@ static inline int hvm_do_pmu_interrupt(struct cpu_user_regs *regs) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index b0b9a1c..ddac468 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -33,7 +33,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -78,11 +77,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- 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 Sep 12 22:22:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFH5-00023t-T2; Thu, 12 Sep 2013 22:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFH4-00023h-RL for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:07 +0000 Received: from [85.158.143.35:16032] by server-3.bemta-4.messagelabs.com id 1A/19-08835-E8E32325; Thu, 12 Sep 2013 22:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1379024524!85624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18475 invoked from network); 12 Sep 2013 22:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFH1-0002c3-Tt for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFH1-00073U-M5 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:03 +0000 Date: Thu, 12 Sep 2013 22:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ad9334a9a70e22d621dfe5863e99f41e0582f1c Author: Andrew Cooper AuthorDate: Thu Sep 12 10:57:06 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 10:57:06 2013 +0200 x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages In all cases when a hypercall page is written, __HYPERVISOR_iret is first written as a regular hypercall, then subsequently rewritten in its special case. For VMX and SVM, this means that following the ud2a instruction is 3 bytes of an imm32 parameter. For a ring3 kernel, this means that following the syscall instruction is the second half of 'pop %r11'. For a ring1 kernel, the iret case ends up as the same number of bytes as the rest of the hypercalls, but it is pointless writing it twice, and is changed for consistency. Therefore, skip the loop iteration which would write the incorrect __HYPERVISOR_iret hypercall. This removes junk machine code from the tail and makes disassemblers rather more happy when looking at the hypercall page. Also, a miscellaneous whitespace fix in the comment for ring3 kernel. Signed-off-by: Andrew Cooper master commit: fca11da0ec956b17d7450d7776c3ffa22a8f538a master date: 2013-07-16 11:10:45 +0200 --- xen/arch/x86/hvm/svm/svm.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 3 +++ xen/arch/x86/x86_64/compat/traps.c | 3 +++ xen/arch/x86/x86_64/traps.c | 7 +++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e52c18c..eb8e577 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -759,6 +759,9 @@ static void svm_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a99f65b..0e5d3b4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -950,6 +950,9 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 6816b0e..21a82b9 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -367,6 +367,9 @@ static void hypercall_page_initialise_ring1_kernel(void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0xb8; /* mov $,%eax */ *(u32 *)(p+ 1) = i; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index eec919a..bcd7609 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -590,6 +590,9 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) /* Fill in all the transfer points with template machine code. */ for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0x51; /* push %rcx */ *(u16 *)(p+ 1) = 0x5341; /* push %r11 */ @@ -602,8 +605,8 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) } /* - * HYPERVISOR_iret is special because it doesn't return and expects a - * special stack frame. Guests jump at this transfer point instead of + * HYPERVISOR_iret is special because it doesn't return and expects a + * special stack frame. Guests jump at this transfer point instead of * calling it. */ p = (char *)(hypercall_page + (__HYPERVISOR_iret * 32)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFH5-00023t-T2; Thu, 12 Sep 2013 22:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFH4-00023h-RL for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:07 +0000 Received: from [85.158.143.35:16032] by server-3.bemta-4.messagelabs.com id 1A/19-08835-E8E32325; Thu, 12 Sep 2013 22:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1379024524!85624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18475 invoked from network); 12 Sep 2013 22:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFH1-0002c3-Tt for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFH1-00073U-M5 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:03 +0000 Date: Thu, 12 Sep 2013 22:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ad9334a9a70e22d621dfe5863e99f41e0582f1c Author: Andrew Cooper AuthorDate: Thu Sep 12 10:57:06 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 10:57:06 2013 +0200 x86: Special case __HYPERVISOR_iret rather more when writing hypercall pages In all cases when a hypercall page is written, __HYPERVISOR_iret is first written as a regular hypercall, then subsequently rewritten in its special case. For VMX and SVM, this means that following the ud2a instruction is 3 bytes of an imm32 parameter. For a ring3 kernel, this means that following the syscall instruction is the second half of 'pop %r11'. For a ring1 kernel, the iret case ends up as the same number of bytes as the rest of the hypercalls, but it is pointless writing it twice, and is changed for consistency. Therefore, skip the loop iteration which would write the incorrect __HYPERVISOR_iret hypercall. This removes junk machine code from the tail and makes disassemblers rather more happy when looking at the hypercall page. Also, a miscellaneous whitespace fix in the comment for ring3 kernel. Signed-off-by: Andrew Cooper master commit: fca11da0ec956b17d7450d7776c3ffa22a8f538a master date: 2013-07-16 11:10:45 +0200 --- xen/arch/x86/hvm/svm/svm.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 3 +++ xen/arch/x86/x86_64/compat/traps.c | 3 +++ xen/arch/x86/x86_64/traps.c | 7 +++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e52c18c..eb8e577 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -759,6 +759,9 @@ static void svm_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a99f65b..0e5d3b4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -950,6 +950,9 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p + 0) = 0xb8; /* mov imm32, %eax */ *(u32 *)(p + 1) = i; diff --git a/xen/arch/x86/x86_64/compat/traps.c b/xen/arch/x86/x86_64/compat/traps.c index 6816b0e..21a82b9 100644 --- a/xen/arch/x86/x86_64/compat/traps.c +++ b/xen/arch/x86/x86_64/compat/traps.c @@ -367,6 +367,9 @@ static void hypercall_page_initialise_ring1_kernel(void *hypercall_page) for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0xb8; /* mov $,%eax */ *(u32 *)(p+ 1) = i; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index eec919a..bcd7609 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -590,6 +590,9 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) /* Fill in all the transfer points with template machine code. */ for ( i = 0; i < (PAGE_SIZE / 32); i++ ) { + if ( i == __HYPERVISOR_iret ) + continue; + p = (char *)(hypercall_page + (i * 32)); *(u8 *)(p+ 0) = 0x51; /* push %rcx */ *(u16 *)(p+ 1) = 0x5341; /* push %r11 */ @@ -602,8 +605,8 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) } /* - * HYPERVISOR_iret is special because it doesn't return and expects a - * special stack frame. Guests jump at this transfer point instead of + * HYPERVISOR_iret is special because it doesn't return and expects a + * special stack frame. Guests jump at this transfer point instead of * calling it. */ p = (char *)(hypercall_page + (__HYPERVISOR_iret * 32)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHG-00025G-0D; Thu, 12 Sep 2013 22:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHF-000256-16 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:17 +0000 Received: from [85.158.143.35:16422] by server-3.bemta-4.messagelabs.com id 5F/29-08835-89E32325; Thu, 12 Sep 2013 22:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1379024534!85651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18951 invoked from network); 12 Sep 2013 22:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHC-0002c6-4x for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHC-00074e-2R for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:14 +0000 Date: Thu, 12 Sep 2013 22:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3ad1f36dee1ff7a721df9680cd9cd8000e3851b Author: Jan Beulich AuthorDate: Thu Sep 12 11:14:01 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:14:01 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich master commit: a350f3f43bcfac9c1591e28d8e43c505fcb172a5 master date: 2013-09-09 10:40:11 +0200 --- xen/arch/x86/efi/boot.c | 104 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 9718bd7..055ac13 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -26,6 +26,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + #define SHIM_LOCK_PROTOCOL_GUID \ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } @@ -1434,7 +1437,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1477,6 +1480,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1520,6 +1524,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1527,6 +1532,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1573,6 +1585,8 @@ void __init efi_init_memory(void) !(smfn & pfn_hole_mask) && !((smfn ^ (emfn - 1)) & ~pfn_pdx_bottom_mask) ) { + if ( (unsigned long)mfn_to_virt(emfn - 1) >= HYPERVISOR_VIRT_END ) + prot &= ~_PAGE_GLOBAL; if ( map_pages_to_xen((unsigned long)mfn_to_virt(smfn), smfn, emfn - smfn, prot) == 0 ) desc->VirtualStart = @@ -1581,15 +1595,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1600,20 +1628,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHG-00025G-0D; Thu, 12 Sep 2013 22:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHF-000256-16 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:17 +0000 Received: from [85.158.143.35:16422] by server-3.bemta-4.messagelabs.com id 5F/29-08835-89E32325; Thu, 12 Sep 2013 22:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1379024534!85651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18951 invoked from network); 12 Sep 2013 22:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHC-0002c6-4x for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHC-00074e-2R for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:14 +0000 Date: Thu, 12 Sep 2013 22:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/EFI: properly handle run time memory regions outside the 1:1 map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3ad1f36dee1ff7a721df9680cd9cd8000e3851b Author: Jan Beulich AuthorDate: Thu Sep 12 11:14:01 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:14:01 2013 +0200 x86/EFI: properly handle run time memory regions outside the 1:1 map Namely with PFN compression, MMIO ranges that the firmware may need runtime access to can live in the holes that gets shrunk/eliminated by PFN compression, and hence no mappings would result from simply copying Xen's direct mapping table's L3 page table entries. Build mappings for this "manually" in the EFI runtime call 1:1 page tables. Use the opportunity to also properly identify (via a forcibly undefined manifest constant) all the disabled code regions associated with it not being acceptable for us to call SetVirtualAddressMap(). Signed-off-by: Jan Beulich master commit: a350f3f43bcfac9c1591e28d8e43c505fcb172a5 master date: 2013-09-09 10:40:11 +0200 --- xen/arch/x86/efi/boot.c | 104 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 9718bd7..055ac13 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -26,6 +26,9 @@ #include #include +/* Using SetVirtualAddressMap() is incompatible with kexec: */ +#undef USE_SET_VIRTUAL_ADDRESS_MAP + #define SHIM_LOCK_PROTOCOL_GUID \ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } @@ -1434,7 +1437,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) /* Adjust pointers into EFI. */ efi_ct = (void *)efi_ct + DIRECTMAP_VIRT_START; -#if 0 /* Only needed when using virtual mode (see efi_init_memory()). */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs = (void *)efi_rs + DIRECTMAP_VIRT_START; #endif efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START; @@ -1477,6 +1480,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, unsigned long emfn)) @@ -1520,6 +1524,7 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) { return 1; } +#endif #define INVALID_VIRTUAL_ADDRESS (0xBAAADUL << \ (EFI_PAGE_SHIFT + BITS_PER_LONG - 32)) @@ -1527,6 +1532,13 @@ static bool_t __init rt_range_valid(unsigned long smfn, unsigned long emfn) void __init efi_init_memory(void) { unsigned int i; +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + struct rt_extra { + struct rt_extra *next; + unsigned long smfn, emfn; + unsigned int prot; + } *extra, *extra_head = NULL; +#endif printk(XENLOG_INFO "EFI memory map:\n"); for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) @@ -1573,6 +1585,8 @@ void __init efi_init_memory(void) !(smfn & pfn_hole_mask) && !((smfn ^ (emfn - 1)) & ~pfn_pdx_bottom_mask) ) { + if ( (unsigned long)mfn_to_virt(emfn - 1) >= HYPERVISOR_VIRT_END ) + prot &= ~_PAGE_GLOBAL; if ( map_pages_to_xen((unsigned long)mfn_to_virt(smfn), smfn, emfn - smfn, prot) == 0 ) desc->VirtualStart = @@ -1581,15 +1595,29 @@ void __init efi_init_memory(void) printk(XENLOG_ERR "Could not map MFNs %#lx-%#lx\n", smfn, emfn - 1); } +#ifndef USE_SET_VIRTUAL_ADDRESS_MAP + else if ( !((desc->PhysicalStart + len - 1) >> (VADDR_BITS - 1)) && + (extra = xmalloc(struct rt_extra)) != NULL ) + { + extra->smfn = smfn; + extra->emfn = emfn; + extra->prot = prot & ~_PAGE_GLOBAL; + extra->next = extra_head; + extra_head = extra; + desc->VirtualStart = desc->PhysicalStart; + } +#endif else { +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP /* XXX allocate e.g. down from FIXADDR_START */ +#endif printk(XENLOG_ERR "No mapping for MFNs %#lx-%#lx\n", smfn, emfn - 1); } } -#if 0 /* Incompatible with kexec. */ +#ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); #else @@ -1600,20 +1628,74 @@ void __init efi_init_memory(void) copy_mapping(0, max_page, ram_range_valid); - /* Insert non-RAM runtime mappings. */ + /* Insert non-RAM runtime mappings inside the direct map. */ for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { const EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - if ( desc->Attribute & EFI_MEMORY_RUNTIME ) + if ( (desc->Attribute & EFI_MEMORY_RUNTIME) && + desc->VirtualStart != INVALID_VIRTUAL_ADDRESS && + desc->VirtualStart != desc->PhysicalStart ) + copy_mapping(PFN_DOWN(desc->PhysicalStart), + PFN_UP(desc->PhysicalStart + + (desc->NumberOfPages << EFI_PAGE_SHIFT)), + rt_range_valid); + } + + /* Insert non-RAM runtime mappings outside of the direct map. */ + while ( (extra = extra_head) != NULL ) + { + unsigned long addr = extra->smfn << PAGE_SHIFT; + l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)]; + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *l1t; + + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - if ( desc->VirtualStart != INVALID_VIRTUAL_ADDRESS ) - copy_mapping(PFN_DOWN(desc->PhysicalStart), - PFN_UP(desc->PhysicalStart + - (desc->NumberOfPages << EFI_PAGE_SHIFT)), - rt_range_valid); - else - /* XXX */; + pl3e = alloc_xen_pagetable(); + BUG_ON(!pl3e); + clear_page(pl3e); + efi_l4_pgtable[l4_table_offset(addr)] = + l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + } + else + pl3e = l4e_to_l3e(l4e); + pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + pl2e = alloc_xen_pagetable(); + BUG_ON(!pl2e); + clear_page(pl2e); + *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); + pl2e = l3e_to_l2e(*pl3e); + } + pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + l1t = alloc_xen_pagetable(); + BUG_ON(!l1t); + clear_page(l1t); + *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + } + else + { + BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); + l1t = l2e_to_l1e(*pl2e); + } + for ( i = l1_table_offset(addr); + i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; + ++i, ++extra->smfn ) + l1t[i] = l1e_from_pfn(extra->smfn, extra->prot); + + if ( extra->smfn == extra->emfn ) + { + extra_head = extra->next; + xfree(extra); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFHR-00027S-3D; Thu, 12 Sep 2013 22:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHP-00026v-C4 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:27 +0000 Received: from [85.158.139.211:19899] by server-11.bemta-5.messagelabs.com id 84/75-10409-2AE32325; Thu, 12 Sep 2013 22:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379024544!2285638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15538 invoked from network); 12 Sep 2013 22:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHM-0002c9-IJ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHM-00075H-9K for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:24 +0000 Date: Thu, 12 Sep 2013 22:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1d767acd8c08c776a65dfc67eed0afbcfbc1c86 Author: Joby Poriyath AuthorDate: Thu Sep 12 11:14:43 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:14:43 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath master commit: a35137373aa9042424565e5ee76dc0a3bb7642ae master date: 2013-09-09 10:43:11 +0200 --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 36de312..e8aa61c 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -187,6 +187,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -247,13 +260,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -283,22 +299,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFHR-00027S-3D; Thu, 12 Sep 2013 22:22:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHP-00026v-C4 for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:27 +0000 Received: from [85.158.139.211:19899] by server-11.bemta-5.messagelabs.com id 84/75-10409-2AE32325; Thu, 12 Sep 2013 22:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379024544!2285638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15538 invoked from network); 12 Sep 2013 22:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHM-0002c9-IJ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHM-00075H-9K for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:24 +0000 Date: Thu, 12 Sep 2013 22:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: allow guest to set/clear MSI-X mask bit (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1d767acd8c08c776a65dfc67eed0afbcfbc1c86 Author: Joby Poriyath AuthorDate: Thu Sep 12 11:14:43 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:14:43 2013 +0200 x86: allow guest to set/clear MSI-X mask bit (try 2) Guest needs the ability to enable and disable MSI-X interrupts by setting the MSI-X control bit, for a passed-through device. Guest is allowed to write MSI-X mask bit only if Xen *thinks* that mask is clear (interrupts enabled). If the mask is set by Xen (interrupts disabled), writes to mask bit by the guest is ignored. Currently, a write to MSI-X mask bit by the guest is silently ignored. A likely scenario is where we have a 82599 SR-IOV nic passed through to a guest. From the guest if you do ifconfig down ifconfig up the interrupts remain masked. On VF reset, the mask bit is set by the controller. At this point, Xen is not aware that mask is set. However, interrupts are enabled by VF driver by clearing the mask bit by writing directly to BAR3 region containing the MSI-X table. From dom0, we can verify that interrupts are being masked using 'xl debug-keys M'. Initially, guest was allowed to modify MSI-X bit. Later this behaviour was changed. See changeset 74c213c506afcd74a8556dd092995fd4dc38b225. Signed-off-by: Joby Poriyath master commit: a35137373aa9042424565e5ee76dc0a3bb7642ae master date: 2013-09-09 10:43:11 +0200 --- xen/arch/x86/hvm/vmsi.c | 75 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 36de312..e8aa61c 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -187,6 +187,19 @@ static struct msixtbl_entry *msixtbl_find_entry( return NULL; } +static struct msi_desc *virt_to_msi_desc(struct pci_dev *dev, void *virt) +{ + struct msi_desc *desc; + + list_for_each_entry( desc, &dev->msi_list, list ) + if ( desc->msi_attrib.type == PCI_CAP_ID_MSIX && + virt >= desc->mask_base && + virt < desc->mask_base + PCI_MSIX_ENTRY_SIZE ) + return desc; + + return NULL; +} + static void __iomem *msixtbl_addr_to_virt( struct msixtbl_entry *entry, unsigned long addr) { @@ -247,13 +260,16 @@ out: } static int msixtbl_write(struct vcpu *v, unsigned long address, - unsigned long len, unsigned long val) + unsigned long len, unsigned long val) { unsigned long offset; struct msixtbl_entry *entry; + const struct msi_desc *msi_desc; void *virt; unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; + unsigned long flags, orig; + struct irq_desc *desc; if ( len != 4 || (address & 3) ) return r; @@ -283,22 +299,57 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, if ( !virt ) goto out; - /* Do not allow the mask bit to be changed. */ -#if 0 /* XXX - * As the mask bit is the only defined bit in the word, and as the - * host MSI-X code doesn't preserve the other bits anyway, doing - * this is pointless. So for now just discard the write (also - * saving us from having to determine the matching irq_desc). - */ + msi_desc = virt_to_msi_desc(entry->pdev, virt); + if ( !msi_desc || msi_desc->irq < 0 ) + goto out; + + desc = irq_to_desc(msi_desc->irq); + if ( !desc ) + goto out; + spin_lock_irqsave(&desc->lock, flags); + + if ( !desc->msi_desc ) + goto unlock; + + ASSERT(msi_desc == desc->msi_desc); + orig = readl(virt); - val &= ~PCI_MSIX_VECTOR_BITMASK; - val |= orig & PCI_MSIX_VECTOR_BITMASK; + + /* + * Do not allow guest to modify MSI-X control bit if it is masked + * by Xen. We'll only handle the case where Xen thinks that + * bit is unmasked, but hardware has silently masked the bit + * (in case of SR-IOV VF reset, etc). On the other hand, if Xen + * thinks that the bit is masked, but it's really not, + * we log a warning. + */ + if ( msi_desc->msi_attrib.masked ) + { + if ( !(orig & PCI_MSIX_VECTOR_BITMASK) ) + printk(XENLOG_WARNING "MSI-X control bit is unmasked when" + " it is expected to be masked [%04x:%02x:%02x.%u]\n", + entry->pdev->seg, entry->pdev->bus, + PCI_SLOT(entry->pdev->devfn), + PCI_FUNC(entry->pdev->devfn)); + + goto unlock; + } + + /* + * The mask bit is the only defined bit in the word. But we + * ought to preserve the reserved bits. Clearing the reserved + * bits can result in undefined behaviour (see PCI Local Bus + * Specification revision 2.3). + */ + val &= PCI_MSIX_VECTOR_BITMASK; + val |= (orig & ~PCI_MSIX_VECTOR_BITMASK); writel(val, virt); - spin_unlock_irqrestore(&desc->lock, flags); -#endif +unlock: + spin_unlock_irqrestore(&desc->lock, flags); r = X86EMUL_OKAY; + out: rcu_read_unlock(&msixtbl_rcu_lock); return r; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHb-00029O-6M; Thu, 12 Sep 2013 22:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHZ-00028z-Ed for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:37 +0000 Received: from [85.158.139.211:32934] by server-12.bemta-5.messagelabs.com id 2E/EE-18373-CAE32325; Thu, 12 Sep 2013 22:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379024554!2299388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13399 invoked from network); 12 Sep 2013 22:22:35 -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 Sep 2013 22:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHW-0002cL-Nj for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHW-00075x-Lx for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:34 +0000 Date: Thu, 12 Sep 2013 22:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e5b44dc07d5f052d85441dc875ef65cf00f4841 Author: Jan Beulich AuthorDate: Thu Sep 12 11:15:24 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:15:24 2013 +0200 xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() Not doing this was found to cause problems with sequences of allocation (multi-page), freeing, and then again allocation of the same page upon boot when interrupts are still disabled (causing the owner field to be non-zero, thus making the allocator attempt a TLB flush and, in its processing, triggering an assertion). Reported-by: Tomasz Wroblewski Signed-off-by: Jan Beulich Tested-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 0fbf3208d9c1a568aeeb61d9f4fbca03b1cfa1f8 master date: 2013-09-09 14:34:12 +0200 --- xen/common/xmalloc_tlsf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index f19fb85..d3bdfa7 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -629,6 +629,7 @@ void xfree(void *p) unsigned int i, order = get_order_from_pages(size); BUG_ON((unsigned long)p & ((PAGE_SIZE << order) - 1)); + PFN_ORDER(virt_to_page(p)) = 0; for ( i = 0; ; ++i ) { if ( !(size & (1 << i)) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHb-00029O-6M; Thu, 12 Sep 2013 22:22:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHZ-00028z-Ed for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:37 +0000 Received: from [85.158.139.211:32934] by server-12.bemta-5.messagelabs.com id 2E/EE-18373-CAE32325; Thu, 12 Sep 2013 22:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379024554!2299388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13399 invoked from network); 12 Sep 2013 22:22:35 -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 Sep 2013 22:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHW-0002cL-Nj for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHW-00075x-Lx for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:34 +0000 Date: Thu, 12 Sep 2013 22:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e5b44dc07d5f052d85441dc875ef65cf00f4841 Author: Jan Beulich AuthorDate: Thu Sep 12 11:15:24 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:15:24 2013 +0200 xmalloc: make whole pages xfree() clear the order field (ab)used by xmalloc() Not doing this was found to cause problems with sequences of allocation (multi-page), freeing, and then again allocation of the same page upon boot when interrupts are still disabled (causing the owner field to be non-zero, thus making the allocator attempt a TLB flush and, in its processing, triggering an assertion). Reported-by: Tomasz Wroblewski Signed-off-by: Jan Beulich Tested-by: Tomasz Wroblewski Acked-by: Keir Fraser master commit: 0fbf3208d9c1a568aeeb61d9f4fbca03b1cfa1f8 master date: 2013-09-09 14:34:12 +0200 --- xen/common/xmalloc_tlsf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index f19fb85..d3bdfa7 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -629,6 +629,7 @@ void xfree(void *p) unsigned int i, order = get_order_from_pages(size); BUG_ON((unsigned long)p & ((PAGE_SIZE << order) - 1)); + PFN_ORDER(virt_to_page(p)) = 0; for ( i = 0; ; ++i ) { if ( !(size & (1 << i)) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFHl-0002BA-9O; Thu, 12 Sep 2013 22:22:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHj-0002Aj-UJ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:48 +0000 Received: from [85.158.137.68:45632] by server-14.bemta-3.messagelabs.com id 2F/A8-00990-7BE32325; Thu, 12 Sep 2013 22:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1379024565!1871946!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15428 invoked from network); 12 Sep 2013 22:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHh-0002cQ-0H for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHg-00076W-Rt for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:44 +0000 Date: Thu, 12 Sep 2013 22:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c68094c84d62eaba4a4a1faa67317603c36f9bd Author: Jan Beulich AuthorDate: Thu Sep 12 11:18:00 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:18:00 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c6066e78f4a66005b0d5d86c6ade32e2ab78923a master date: 2013-08-30 10:56:07 +0200 --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 24c3dd8..e1220e6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -304,7 +304,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index ce94d28..3e7dc53 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -247,11 +247,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -260,6 +259,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -271,31 +271,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 49168f3..e3bb271 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -81,6 +81,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:22:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:22: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 1VKFHl-0002BA-9O; Thu, 12 Sep 2013 22:22:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHj-0002Aj-UJ for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:48 +0000 Received: from [85.158.137.68:45632] by server-14.bemta-3.messagelabs.com id 2F/A8-00990-7BE32325; Thu, 12 Sep 2013 22:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1379024565!1871946!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15428 invoked from network); 12 Sep 2013 22:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHh-0002cQ-0H for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHg-00076W-Rt for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:44 +0000 Date: Thu, 12 Sep 2013 22:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: initialization improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c68094c84d62eaba4a4a1faa67317603c36f9bd Author: Jan Beulich AuthorDate: Thu Sep 12 11:18:00 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:18:00 2013 +0200 x86/xsave: initialization improvements - properly validate available feature set on APs - also validate xsaveopt availability on APs - properly indicate whether the initialization is on the BSP (we shouldn't be using "cpu == 0" checks for this) Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c6066e78f4a66005b0d5d86c6ade32e2ab78923a master date: 2013-08-30 10:56:07 +0200 --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/xstate.c | 28 +++++++++++++++------------- xen/include/asm-x86/xstate.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 24c3dd8..e1220e6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -304,7 +304,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(); + xstate_init(c == &boot_cpu_data); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index ce94d28..3e7dc53 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -247,11 +247,10 @@ void xstate_free_save_area(struct vcpu *v) } /* Collect the information of processor's extended state */ -void xstate_init(void) +void xstate_init(bool_t bsp) { - u32 eax, ebx, ecx, edx; - int cpu = smp_processor_id(); - u32 min_size; + u32 eax, ebx, ecx, edx, min_size; + u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) return; @@ -260,6 +259,7 @@ void xstate_init(void) BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE); BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE)); + feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK; /* FP/SSE, XSAVE.HEADER, YMM */ min_size = XSTATE_AREA_MIN_SIZE; @@ -271,31 +271,33 @@ void xstate_init(void) * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. */ set_in_cr4(X86_CR4_OSXSAVE); - if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) ) + if ( !set_xcr0(feature_mask) ) BUG(); cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - if ( cpu == 0 ) + if ( bsp ) { + xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ xsave_cntxt_size = ebx; - xfeature_mask = eax + ((u64)edx << 32); - xfeature_mask &= XCNTXT_MASK; printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); - - /* Check XSAVEOPT feature. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); } else { + BUG_ON(xfeature_mask != feature_mask); BUG_ON(xsave_cntxt_size != ebx); - BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK)); } + + /* Check XSAVEOPT feature. */ + cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + if ( bsp ) + cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); + else + BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } int handle_xsetbv(u32 index, u64 new_bv) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 49168f3..e3bb271 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -81,6 +81,6 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(void); +void xstate_init(bool_t bsp); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHx-0002Dj-Ex; Thu, 12 Sep 2013 22: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 1VKFHv-0002DJ-AS for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:59 +0000 Received: from [85.158.137.68:18657] by server-16.bemta-3.messagelabs.com id D0/15-30005-2CE32325; Thu, 12 Sep 2013 22:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379024575!1868814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29464 invoked from network); 12 Sep 2013 22:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHr-0002ca-6z for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHr-000777-4x for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:55 +0000 Date: Thu, 12 Sep 2013 22:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01afd245e63ae58a702470b5154a05f8db8a5e0b Author: Jan Beulich AuthorDate: Thu Sep 12 11:19:28 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:19:28 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser master commit: 4cc1344447a0458df5d222960f2adf1b65084fa8 master date: 2013-09-09 14:36:54 +0200 --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 52c9040..8009e0b 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -618,7 +618,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1347,9 +1347,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c2a04c4..e75918a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1047,11 +1047,8 @@ long arch_do_domctl( struct xen_domctl_vcpuextstate *evc; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1062,15 +1059,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1093,7 +1091,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1101,13 +1099,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1128,20 +1127,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 43b6d05..26a3e9f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -906,14 +906,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -957,7 +955,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -969,20 +969,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -990,11 +990,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1006,47 +1006,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1060,7 +1087,8 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2767,7 +2795,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index d4b3ec9..759718f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -947,8 +947,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index dbf24af..020a781 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -124,13 +125,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -238,7 +241,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -268,7 +271,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 57dbd0c..2e6895c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -816,7 +816,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -841,7 +841,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3e7dc53..a64a832 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -206,13 +206,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -234,8 +234,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -253,7 +253,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -273,7 +277,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -282,14 +285,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -300,6 +303,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d79464d..909f449 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -456,9 +456,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 8408420..4d303e6 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -367,7 +367,7 @@ static inline int hvm_event_pending(struct vcpu *v) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index e3bb271..89f1570 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -33,7 +33,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -76,11 +75,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHx-0002Dj-Ex; Thu, 12 Sep 2013 22: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 1VKFHv-0002DJ-AS for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:59 +0000 Received: from [85.158.137.68:18657] by server-16.bemta-3.messagelabs.com id D0/15-30005-2CE32325; Thu, 12 Sep 2013 22:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379024575!1868814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29464 invoked from network); 12 Sep 2013 22:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFHr-0002ca-6z for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFHr-000777-4x for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:22:55 +0000 Date: Thu, 12 Sep 2013 22:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: fix migration from xsave-capable to xsave-incapable host X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01afd245e63ae58a702470b5154a05f8db8a5e0b Author: Jan Beulich AuthorDate: Thu Sep 12 11:19:28 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:19:28 2013 +0200 x86/xsave: fix migration from xsave-capable to xsave-incapable host With CPUID features suitably masked this is supposed to work, but was completely broken (i.e. the case wasn't even considered when the original xsave save/restore code was written). First of all, xsave_enabled() wrongly returned the value of cpu_has_xsave, i.e. not even taking into consideration attributes of the vCPU in question. Instead this function ought to check whether the guest ever enabled xsave support (by writing a [non-zero] value to XCR0). As a result of this, a vCPU's xcr0 and xcr0_accum must no longer be initialized to XSTATE_FP_SSE (since that's a valid value a guest could write to XCR0), and the xsave/xrstor as well as the context switch code need to suitably account for this (by always enforcing at least this part of the state to be saved/loaded). This involves undoing large parts of c/s 22945:13a7d1f7f62c ("x86: add strictly sanity check for XSAVE/XRSTOR") - we need to cleanly distinguish between hardware capabilities and vCPU used features. Next both HVM and PV save code needed tweaking to not always save the full state supported by the underlying hardware, but just the parts that the guest actually used. Similarly the restore code should bail not just on state being restored that the hardware cannot handle, but also on inconsistent save state (inconsistent XCR0 settings or size of saved state not in line with XCR0). And finally the PV extended context get/set code needs to use slightly different logic than the HVM one, as here we can't just key off of xsave_enabled() (i.e. avoid doing anything if a guest doesn't use xsave) because the tools use this function to determine host capabilities as well as read/write vCPU state. The set operation in particular needs to be capable of cleanly dealing with input that consists of only the xcr0 and xcr0_accum values (if they're both zero then no further data is required). While for things to work correctly both sides (saving _and_ restoring host) need to run with the fixed code, afaict no breakage should occur if either side isn't up to date (other than the breakage that this patch attempts to fix). Signed-off-by: Jan Beulich Reviewed-by: Yang Zhang Acked-by: Keir Fraser master commit: 4cc1344447a0458df5d222960f2adf1b65084fa8 master date: 2013-09-09 14:36:54 +0200 --- xen/arch/x86/domain.c | 12 ++++-- xen/arch/x86/domctl.c | 51 +++++++++++++--------- xen/arch/x86/hvm/hvm.c | 94 ++++++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 3 +- xen/arch/x86/i387.c | 21 +++++---- xen/arch/x86/traps.c | 4 +- xen/arch/x86/xstate.c | 63 ++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 6 +- xen/include/asm-x86/hvm/hvm.h | 2 +- xen/include/asm-x86/xstate.h | 4 +- 10 files changed, 172 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 52c9040..8009e0b 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -618,7 +618,7 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) hv_cr4_mask &= ~X86_CR4_DE; if ( cpu_has_fsgsbase && !is_pv_32bit_domain(v->domain) ) hv_cr4_mask &= ~X86_CR4_FSGSBASE; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) hv_cr4_mask &= ~X86_CR4_OSXSAVE; if ( (guest_cr4 & hv_cr4_mask) != (hv_cr4 & hv_cr4_mask) ) @@ -1347,9 +1347,13 @@ static void __context_switch(void) if ( !is_idle_vcpu(n) ) { memcpy(stack_regs, &n->arch.user_regs, CTXT_SWITCH_STACK_BYTES); - if ( xsave_enabled(n) && n->arch.xcr0 != get_xcr0() && - !set_xcr0(n->arch.xcr0) ) - BUG(); + if ( cpu_has_xsave ) + { + u64 xcr0 = n->arch.xcr0 ?: XSTATE_FP_SSE; + + if ( xcr0 != get_xcr0() && !set_xcr0(xcr0) ) + BUG(); + } vcpu_restore_fpu_eager(n); n->arch.ctxt_switch_to(n); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c2a04c4..e75918a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1047,11 +1047,8 @@ long arch_do_domctl( struct xen_domctl_vcpuextstate *evc; struct vcpu *v; uint32_t offset = 0; - uint64_t _xfeature_mask = 0; - uint64_t _xcr0, _xcr0_accum; - void *receive_buf = NULL, *_xsave_area; -#define PV_XSAVE_SIZE (2 * sizeof(uint64_t) + xsave_cntxt_size) +#define PV_XSAVE_SIZE(xcr0) (2 * sizeof(uint64_t) + xstate_ctxt_size(xcr0)) evc = &domctl->u.vcpuextstate; @@ -1062,15 +1059,16 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate ) { + unsigned int size = PV_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !evc->size && !evc->xfeature_mask ) { evc->xfeature_mask = xfeature_mask; - evc->size = PV_XSAVE_SIZE; + evc->size = size; ret = 0; goto vcpuextstate_out; } - if ( evc->size != PV_XSAVE_SIZE || - evc->xfeature_mask != xfeature_mask ) + if ( evc->size != size || evc->xfeature_mask != xfeature_mask ) { ret = -EINVAL; goto vcpuextstate_out; @@ -1093,7 +1091,7 @@ long arch_do_domctl( offset += sizeof(v->arch.xcr0_accum); if ( copy_to_guest_offset(domctl->u.vcpuextstate.buffer, offset, (void *)v->arch.xsave_area, - xsave_cntxt_size) ) + size - 2 * sizeof(uint64_t)) ) { ret = -EFAULT; goto vcpuextstate_out; @@ -1101,13 +1099,14 @@ long arch_do_domctl( } else { - ret = -EINVAL; + void *receive_buf; + uint64_t _xcr0, _xcr0_accum; + const struct xsave_struct *_xsave_area; - _xfeature_mask = evc->xfeature_mask; - /* xsave context must be restored on compatible target CPUs */ - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - goto vcpuextstate_out; - if ( evc->size > PV_XSAVE_SIZE || evc->size < 2 * sizeof(uint64_t) ) + ret = -EINVAL; + if ( evc->size < 2 * sizeof(uint64_t) || + evc->size > 2 * sizeof(uint64_t) + + xstate_ctxt_size(xfeature_mask) ) goto vcpuextstate_out; receive_buf = xmalloc_bytes(evc->size); @@ -1128,20 +1127,30 @@ long arch_do_domctl( _xcr0_accum = *(uint64_t *)(receive_buf + sizeof(uint64_t)); _xsave_area = receive_buf + 2 * sizeof(uint64_t); - if ( !(_xcr0 & XSTATE_FP) || _xcr0 & ~xfeature_mask ) + if ( _xcr0_accum ) { - xfree(receive_buf); - goto vcpuextstate_out; + if ( evc->size >= 2 * sizeof(uint64_t) + XSTATE_AREA_MIN_SIZE ) + ret = validate_xstate(_xcr0, _xcr0_accum, + _xsave_area->xsave_hdr.xstate_bv, + evc->xfeature_mask); } - if ( (_xcr0 & _xcr0_accum) != _xcr0 ) + else if ( !_xcr0 ) + ret = 0; + if ( ret ) { xfree(receive_buf); goto vcpuextstate_out; } - v->arch.xcr0 = _xcr0; - v->arch.xcr0_accum = _xcr0_accum; - memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t) ); + if ( evc->size <= PV_XSAVE_SIZE(_xcr0_accum) ) + { + v->arch.xcr0 = _xcr0; + v->arch.xcr0_accum = _xcr0_accum; + memcpy(v->arch.xsave_area, _xsave_area, + evc->size - 2 * sizeof(uint64_t)); + } + else + ret = -EINVAL; xfree(receive_buf); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 43b6d05..26a3e9f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -906,14 +906,12 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) hvm_set_segment_register(v, x86_seg_ldtr, &seg); /* In case xsave-absent save file is restored on a xsave-capable host */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave && !xsave_enabled(v) ) { struct xsave_struct *xsave_area = v->arch.xsave_area; memcpy(v->arch.xsave_area, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); xsave_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; - v->arch.xcr0 = XSTATE_FP_SSE; } else memcpy(v->arch.fpu_ctxt, ctxt.fpu_regs, sizeof(ctxt.fpu_regs)); @@ -957,7 +955,9 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, HVMSR_PER_VCPU); -#define HVM_CPU_XSAVE_SIZE (3 * sizeof(uint64_t) + xsave_cntxt_size) +#define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ + save_area) + \ + xstate_ctxt_size(xcr0)) static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { @@ -969,20 +969,20 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + if ( !xsave_enabled(v) ) continue; - if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, HVM_CPU_XSAVE_SIZE) ) + if ( _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size) ) return 1; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; - h->cur += HVM_CPU_XSAVE_SIZE; - memset(ctxt, 0, HVM_CPU_XSAVE_SIZE); + h->cur += size; ctxt->xfeature_mask = xfeature_mask; ctxt->xcr0 = v->arch.xcr0; ctxt->xcr0_accum = v->arch.xcr0_accum; - if ( v->fpu_initialised ) - memcpy(&ctxt->save_area, - v->arch.xsave_area, xsave_cntxt_size); + memcpy(&ctxt->save_area, v->arch.xsave_area, + size - offsetof(struct hvm_hw_cpu_xsave, save_area)); } return 0; @@ -990,11 +990,11 @@ static int hvm_save_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) { - int vcpuid; + unsigned int vcpuid, size; + int err; struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; - uint64_t _xfeature_mask; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1006,47 +1006,74 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) } /* Fails since we can't restore an img saved on xsave-capable host. */ - if ( !xsave_enabled(v) ) - return -EINVAL; + if ( !cpu_has_xsave ) + return -EOPNOTSUPP; /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read descriptor" - "for type %u\n", d->domain_id, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read xsave descriptor\n", + d->domain_id, vcpuid); + return -ENODATA; } if ( desc->length + sizeof (*desc) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM%d restore: not enough data left to read %u bytes " - "for type %u\n", d->domain_id, desc->length, CPU_XSAVE_CODE); - return -1; + "HVM%d.%d restore: not enough data left to read %u xsave bytes\n", + d->domain_id, vcpuid, desc->length); + return -ENODATA; + } + if ( desc->length < offsetof(struct hvm_hw_cpu_xsave, save_area) + + XSTATE_AREA_MIN_SIZE ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u < %zu\n", + d->domain_id, vcpuid, desc->length, + offsetof(struct hvm_hw_cpu_xsave, + save_area) + XSTATE_AREA_MIN_SIZE); + return -EINVAL; } - if ( CPU_XSAVE_CODE != desc->typecode || (desc->length > HVM_CPU_XSAVE_SIZE) ) + size = HVM_CPU_XSAVE_SIZE(xfeature_mask); + if ( desc->length > size ) { printk(XENLOG_G_WARNING - "HVM%d restore mismatch: expected type %u with max length %u, " - "saw type %u length %u\n", d->domain_id, CPU_XSAVE_CODE, - (unsigned int)HVM_CPU_XSAVE_SIZE, - desc->typecode, desc->length); - return -1; + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; } h->cur += sizeof (*desc); - /* Checking finished */ ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; - _xfeature_mask = ctxt->xfeature_mask; - if ( (_xfeature_mask & xfeature_mask) != _xfeature_mask ) - return -EINVAL; + err = validate_xstate(ctxt->xcr0, ctxt->xcr0_accum, + ctxt->save_area.xsave_hdr.xstate_bv, + ctxt->xfeature_mask); + if ( err ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore: inconsistent xsave state (feat=%#"PRIx64 + " accum=%#"PRIx64" xcr0=%#"PRIx64" bv=%#"PRIx64" err=%d)\n", + d->domain_id, vcpuid, ctxt->xfeature_mask, ctxt->xcr0_accum, + ctxt->xcr0, ctxt->save_area.xsave_hdr.xstate_bv, err); + return err; + } + size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); + if ( desc->length > size ) + { + printk(XENLOG_G_WARNING + "HVM%d.%d restore mismatch: xsave length %u > %u\n", + d->domain_id, vcpuid, desc->length, size); + return -EOPNOTSUPP; + } + /* Checking finished */ v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; - memcpy(v->arch.xsave_area, &ctxt->save_area, xsave_cntxt_size); + memcpy(v->arch.xsave_area, &ctxt->save_area, + desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); return 0; } @@ -1060,7 +1087,8 @@ static int __init __hvm_register_CPU_XSAVE_save_and_restore(void) "CPU_XSAVE", hvm_save_cpu_xsave_states, hvm_load_cpu_xsave_states, - HVM_CPU_XSAVE_SIZE + sizeof (struct hvm_save_descriptor), + HVM_CPU_XSAVE_SIZE(xfeature_mask) + + sizeof(struct hvm_save_descriptor), HVMSR_PER_VCPU); return 0; } @@ -2767,7 +2795,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, __clear_bit(X86_FEATURE_APIC & 31, edx); /* Fix up OSXSAVE. */ - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ? cpufeat_mask(X86_FEATURE_OSXSAVE) : 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index d4b3ec9..759718f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -947,8 +947,7 @@ static int construct_vmcs(struct vcpu *v) /* Host control registers. */ v->arch.hvm_vmx.host_cr0 = read_cr0() | X86_CR0_TS; __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); - __vmwrite(HOST_CR4, - mmu_cr4_features | (xsave_enabled(v) ? X86_CR4_OSXSAVE : 0)); + __vmwrite(HOST_CR4, mmu_cr4_features); /* Host CS:RIP. */ __vmwrite(HOST_CS_SELECTOR, __HYPERVISOR_CS); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index dbf24af..020a781 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -38,14 +38,15 @@ static inline void fpu_xrstor(struct vcpu *v, uint64_t mask) { bool_t ok; + ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xrstor(v, mask); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -124,13 +125,15 @@ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; - /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + ASSERT(v->arch.xsave_area); + /* + * XCR0 normally represents what guest OS set. In case of Xen itself, + * we set the accumulated feature mask before doing save/restore. */ - ok = set_xcr0(v->arch.xcr0_accum); + ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); - ok = set_xcr0(v->arch.xcr0); + ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -238,7 +241,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( v->fpu_dirtied ) return; - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); else if ( v->fpu_initialised ) { @@ -268,7 +271,7 @@ void vcpu_save_fpu(struct vcpu *v) /* This can happen, if a paravirtualised guest OS has set its CR0.TS. */ clts(); - if ( xsave_enabled(v) ) + if ( cpu_has_xsave ) fpu_xsave(v); else if ( cpu_has_fxsr ) fpu_fxsave(v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 57dbd0c..2e6895c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -816,7 +816,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_PDCM % 32, &c); __clear_bit(X86_FEATURE_PCID % 32, &c); __clear_bit(X86_FEATURE_DCA % 32, &c); - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) { __clear_bit(X86_FEATURE_XSAVE % 32, &c); __clear_bit(X86_FEATURE_AVX % 32, &c); @@ -841,7 +841,7 @@ static void pv_cpuid(struct cpu_user_regs *regs) break; case 0x0000000d: /* XSAVE */ - if ( !xsave_enabled(current) ) + if ( !cpu_has_xsave ) goto unsupported; break; diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3e7dc53..a64a832 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -21,7 +21,7 @@ bool_t __read_mostly cpu_has_xsaveopt; * the supported and enabled features on the processor, including the * XSAVE.HEADER. We only enable XCNTXT_MASK that we have known. */ -u32 xsave_cntxt_size; +static u32 __read_mostly xsave_cntxt_size; /* A 64-bit bitmask of the XSAVE/XRSTOR features supported by processor. */ u64 xfeature_mask; @@ -206,13 +206,13 @@ void xrstor(struct vcpu *v, uint64_t mask) bool_t xsave_enabled(const struct vcpu *v) { - if ( cpu_has_xsave ) - { - ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); - ASSERT(v->arch.xsave_area); - } + if ( !cpu_has_xsave ) + return 0; - return cpu_has_xsave; + ASSERT(xsave_cntxt_size >= XSTATE_AREA_MIN_SIZE); + ASSERT(v->arch.xsave_area); + + return !!v->arch.xcr0_accum; } int xstate_alloc_save_area(struct vcpu *v) @@ -234,8 +234,8 @@ int xstate_alloc_save_area(struct vcpu *v) save_area->xsave_hdr.xstate_bv = XSTATE_FP_SSE; v->arch.xsave_area = save_area; - v->arch.xcr0 = XSTATE_FP_SSE; - v->arch.xcr0_accum = XSTATE_FP_SSE; + v->arch.xcr0 = 0; + v->arch.xcr0_accum = 0; return 0; } @@ -253,7 +253,11 @@ void xstate_init(bool_t bsp) u64 feature_mask; if ( boot_cpu_data.cpuid_level < XSTATE_CPUID ) + { + BUG_ON(!bsp); + setup_clear_cpu_cap(X86_FEATURE_XSAVE); return; + } cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); @@ -273,7 +277,6 @@ void xstate_init(bool_t bsp) set_in_cr4(X86_CR4_OSXSAVE); if ( !set_xcr0(feature_mask) ) BUG(); - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); if ( bsp ) { @@ -282,14 +285,14 @@ void xstate_init(bool_t bsp) * xsave_cntxt_size is the max size required by enabled features. * We know FP/SSE and YMM about eax, and nothing about edx at present. */ - xsave_cntxt_size = ebx; + xsave_cntxt_size = xstate_ctxt_size(feature_mask); printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n", __func__, xsave_cntxt_size, xfeature_mask); } else { BUG_ON(xfeature_mask != feature_mask); - BUG_ON(xsave_cntxt_size != ebx); + BUG_ON(xsave_cntxt_size != xstate_ctxt_size(feature_mask)); } /* Check XSAVEOPT feature. */ @@ -300,6 +303,42 @@ void xstate_init(bool_t bsp) BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); } +unsigned int xstate_ctxt_size(u64 xcr0) +{ + u32 ebx = 0; + + if ( xcr0 ) + { + u64 act_xcr0 = get_xcr0(); + u32 eax, ecx, edx; + bool_t ok = set_xcr0(xcr0); + + ASSERT(ok); + cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + ASSERT(ebx <= ecx); + ok = set_xcr0(act_xcr0); + ASSERT(ok); + } + + return ebx; +} + +int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) +{ + if ( (xcr0_accum & ~xfeat_mask) || + (xstate_bv & ~xcr0_accum) || + (xcr0 & ~xcr0_accum) || + !(xcr0 & XSTATE_FP) || + ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE)) || + ((xcr0_accum & XSTATE_YMM) && !(xcr0_accum & XSTATE_SSE)) ) + return -EINVAL; + + if ( xcr0_accum & ~xfeature_mask ) + return -EOPNOTSUPP; + + return 0; +} + int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d79464d..909f449 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -456,9 +456,9 @@ unsigned long pv_guest_cr4_fixup(const struct vcpu *, unsigned long guest_cr4); #define pv_guest_cr4_to_real_cr4(v) \ (((v)->arch.pv_vcpu.ctrlreg[4] \ | (mmu_cr4_features \ - & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP)) \ - | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0) \ - | ((xsave_enabled(v))? X86_CR4_OSXSAVE : 0)) \ + & (X86_CR4_PGE | X86_CR4_PSE | X86_CR4_SMEP | \ + X86_CR4_OSXSAVE)) \ + | ((v)->domain->arch.vtsc ? X86_CR4_TSD : 0)) \ & ~X86_CR4_DE) #define real_cr4_to_pv_guest_cr4(c) \ ((c) & ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_TSD \ diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 8408420..4d303e6 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -367,7 +367,7 @@ static inline int hvm_event_pending(struct vcpu *v) ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\ ? X86_CR4_VMXE : 0) | \ (cpu_has_pcid ? X86_CR4_PCIDE : 0) | \ - (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0)))) + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0)))) /* These exceptions must always be intercepted. */ #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index e3bb271..89f1570 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -33,7 +33,6 @@ #define XSTATE_NONLAZY (XSTATE_LWP) #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) -extern unsigned int xsave_cntxt_size; extern u64 xfeature_mask; /* extended state save area */ @@ -76,11 +75,14 @@ uint64_t get_xcr0(void); void xsave(struct vcpu *v, uint64_t mask); void xrstor(struct vcpu *v, uint64_t mask); bool_t xsave_enabled(const struct vcpu *v); +int __must_check validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, + u64 xfeat_mask); int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); void xstate_init(bool_t bsp); +unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:23:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI5-0002FJ-IY; Thu, 12 Sep 2013 22:23:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI3-0002Et-RE for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:08 +0000 Received: from [85.158.143.35:63297] by server-2.bemta-4.messagelabs.com id C6/8D-26052-BCE32325; Thu, 12 Sep 2013 22:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1379024585!3419659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29880 invoked from network); 12 Sep 2013 22:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI1-0002d8-FX for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFI1-00077r-DV for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:05 +0000 Date: Thu, 12 Sep 2013 22:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37b0148f9a09924422d489226813938ccde962c3 Author: Yang Zhang AuthorDate: Thu Sep 12 11:20:17 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:20:17 2013 +0200 Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR The bit 31 of revision_id will set to 1 if vmcs shadowing enabled. And according intel SDM, the bit 31 of IA32_VMX_BASIC MSR is always 0. So we cannot set low 32 bit of IA32_VMX_BASIC to revision_id directly. Must clear the bit 31 to 0. Signed-off-by: Yang Zhang Reviewed-by: Andrew Cooper master commit: f3a4eb9253826d1e49e682314c8666b28fa0b717 master date: 2013-09-10 16:41:35 +0200 --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index cecc72f..2c4801c 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1828,7 +1828,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) switch (msr) { case MSR_IA32_VMX_BASIC: data = (host_data & (~0ul << 32)) | - ((v->arch.hvm_vmx.vmcs)->vmcs_revision_id); + (v->arch.hvm_vmx.vmcs->vmcs_revision_id & 0x7fffffff); break; case MSR_IA32_VMX_PINBASED_CTLS: case MSR_IA32_VMX_TRUE_PINBASED_CTLS: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 12 22:23:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Sep 2013 22:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI5-0002FJ-IY; Thu, 12 Sep 2013 22:23:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI3-0002Et-RE for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:08 +0000 Received: from [85.158.143.35:63297] by server-2.bemta-4.messagelabs.com id C6/8D-26052-BCE32325; Thu, 12 Sep 2013 22:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1379024585!3419659!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29880 invoked from network); 12 Sep 2013 22:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2013 22:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKFI1-0002d8-FX for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKFI1-00077r-DV for xen-changelog@lists.xensource.com; Thu, 12 Sep 2013 22:23:05 +0000 Date: Thu, 12 Sep 2013 22:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 37b0148f9a09924422d489226813938ccde962c3 Author: Yang Zhang AuthorDate: Thu Sep 12 11:20:17 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 11:20:17 2013 +0200 Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR The bit 31 of revision_id will set to 1 if vmcs shadowing enabled. And according intel SDM, the bit 31 of IA32_VMX_BASIC MSR is always 0. So we cannot set low 32 bit of IA32_VMX_BASIC to revision_id directly. Must clear the bit 31 to 0. Signed-off-by: Yang Zhang Reviewed-by: Andrew Cooper master commit: f3a4eb9253826d1e49e682314c8666b28fa0b717 master date: 2013-09-10 16:41:35 +0200 --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index cecc72f..2c4801c 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1828,7 +1828,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) switch (msr) { case MSR_IA32_VMX_BASIC: data = (host_data & (~0ul << 32)) | - ((v->arch.hvm_vmx.vmcs)->vmcs_revision_id); + (v->arch.hvm_vmx.vmcs->vmcs_revision_id & 0x7fffffff); break; case MSR_IA32_VMX_PINBASED_CTLS: case MSR_IA32_VMX_TRUE_PINBASED_CTLS: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 09:22:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZo-0005RU-Br; Fri, 13 Sep 2013 09:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZm-0005RP-SS for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:07 +0000 Received: from [85.158.139.211:61647] by server-12.bemta-5.messagelabs.com id DF/8B-18373-E39D2325; Fri, 13 Sep 2013 09:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1379064124!2391860!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23286 invoked from network); 13 Sep 2013 09:22:05 -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; 13 Sep 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 1VKPZk-0000R9-2D for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPZj-0001yC-OJ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:03 +0000 Date: Fri, 13 Sep 2013 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix memory cut-off when using PFN compression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8efce9d69998a3d3c720ac7dbdb9b7e240369957 Author: Jan Beulich AuthorDate: Thu Sep 12 09:52:53 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 09:52:53 2013 +0200 x86: fix memory cut-off when using PFN compression For one setup_max_pdx(), when invoked a second time (after SRAT got parsed), needs to start from the original max_page value again (using the already adjusted one from the first invocation would not allow the cut-off boundary to be moved up). Second, _if_ we need to cut off some part of memory, we must not allow this to also propagate into the NUMA accounting. Otherwise cutoff_node() results in nodes_cover_memory() to find some parts of memory apparently not having a PXM association, causing all SRAT info to be ignored. The only possibly problematic consumer of node_spanned_pages (the meaning of which gets altered here in that it now also includes memory Xen can't actively make use of) is XEN_SYSCTL_numainfo: At a first glance the potentially larger reported memory size shouldn't confuse tool stacks. And finally we must not put our boot time modules at addresses which (at that time) can't be guaranteed to be accessible later. This applies to both the EFI boot loader and the module relocation code. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Dario Faggioli --- xen/arch/x86/efi/boot.c | 3 ++- xen/arch/x86/setup.c | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 055ac13..66a6fdb 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -459,7 +459,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, what = what ?: L"Seek"; else { - file->addr = (EFI_PHYSICAL_ADDRESS)1 << (32 + PAGE_SHIFT); + file->addr = min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(size), &file->addr); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c550e8e..637f1f9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -378,9 +378,9 @@ static uint64_t __init consider_modules( return e; } -static void __init setup_max_pdx(void) +static void __init setup_max_pdx(unsigned long top_page) { - max_pdx = pfn_to_pdx(max_page - 1) + 1; + max_pdx = pfn_to_pdx(top_page - 1) + 1; if ( max_pdx > (DIRECTMAP_SIZE >> PAGE_SHIFT) ) max_pdx = DIRECTMAP_SIZE >> PAGE_SHIFT; @@ -548,7 +548,7 @@ void __init __start_xen(unsigned long mbi_p) unsigned int initrdidx; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_headroom, *module_map; + unsigned long nr_pages, raw_max_page, modules_headroom, *module_map; int i, j, e820_warn = 0, bytes = 0; bool_t acpi_boot_table_init_done = 0; struct ns16550_defaults ns16550 = { @@ -752,7 +752,7 @@ void __init __start_xen(unsigned long mbi_p) } /* Sanitise the raw E820 map to produce a final clean version. */ - max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); + max_page = raw_max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); /* Create a temporary copy of the E820 map. */ memcpy(&boot_e820, &e820, sizeof(e820)); @@ -821,7 +821,10 @@ void __init __start_xen(unsigned long mbi_p) (end - s) >> PAGE_SHIFT, PAGE_HYPERVISOR); } - e = min_t(uint64_t, e, 1ULL << (PAGE_SHIFT + 32)); + if ( e > min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)) ) + e = min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)); #define reloc_size ((__pa(&_end) + mask) & ~mask) /* Is the region suitable for relocating Xen? */ if ( !xen_phys_start && e <= limit ) @@ -970,7 +973,7 @@ void __init __start_xen(unsigned long mbi_p) /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(&boot_e820); - setup_max_pdx(); + setup_max_pdx(raw_max_page); if ( highmem_start ) xenheap_max_mfn(PFN_DOWN(highmem_start)); @@ -996,7 +999,7 @@ void __init __start_xen(unsigned long mbi_p) { acpi_boot_table_init_done = 1; srat_parse_regions(s); - setup_max_pdx(); + setup_max_pdx(raw_max_page); } if ( pfn_to_pdx((e - 1) >> PAGE_SHIFT) >= max_pdx ) @@ -1134,7 +1137,7 @@ void __init __start_xen(unsigned long mbi_p) acpi_numa_init(); - numa_initmem_init(0, max_page); + numa_initmem_init(0, raw_max_page); end_boot_allocator(); system_state = SYS_STATE_boot; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZo-0005RU-Br; Fri, 13 Sep 2013 09:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZm-0005RP-SS for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:07 +0000 Received: from [85.158.139.211:61647] by server-12.bemta-5.messagelabs.com id DF/8B-18373-E39D2325; Fri, 13 Sep 2013 09:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1379064124!2391860!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23286 invoked from network); 13 Sep 2013 09:22:05 -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; 13 Sep 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 1VKPZk-0000R9-2D for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPZj-0001yC-OJ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:03 +0000 Date: Fri, 13 Sep 2013 09:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix memory cut-off when using PFN compression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8efce9d69998a3d3c720ac7dbdb9b7e240369957 Author: Jan Beulich AuthorDate: Thu Sep 12 09:52:53 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 09:52:53 2013 +0200 x86: fix memory cut-off when using PFN compression For one setup_max_pdx(), when invoked a second time (after SRAT got parsed), needs to start from the original max_page value again (using the already adjusted one from the first invocation would not allow the cut-off boundary to be moved up). Second, _if_ we need to cut off some part of memory, we must not allow this to also propagate into the NUMA accounting. Otherwise cutoff_node() results in nodes_cover_memory() to find some parts of memory apparently not having a PXM association, causing all SRAT info to be ignored. The only possibly problematic consumer of node_spanned_pages (the meaning of which gets altered here in that it now also includes memory Xen can't actively make use of) is XEN_SYSCTL_numainfo: At a first glance the potentially larger reported memory size shouldn't confuse tool stacks. And finally we must not put our boot time modules at addresses which (at that time) can't be guaranteed to be accessible later. This applies to both the EFI boot loader and the module relocation code. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Dario Faggioli --- xen/arch/x86/efi/boot.c | 3 ++- xen/arch/x86/setup.c | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 055ac13..66a6fdb 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -459,7 +459,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, what = what ?: L"Seek"; else { - file->addr = (EFI_PHYSICAL_ADDRESS)1 << (32 + PAGE_SHIFT); + file->addr = min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(size), &file->addr); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c550e8e..637f1f9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -378,9 +378,9 @@ static uint64_t __init consider_modules( return e; } -static void __init setup_max_pdx(void) +static void __init setup_max_pdx(unsigned long top_page) { - max_pdx = pfn_to_pdx(max_page - 1) + 1; + max_pdx = pfn_to_pdx(top_page - 1) + 1; if ( max_pdx > (DIRECTMAP_SIZE >> PAGE_SHIFT) ) max_pdx = DIRECTMAP_SIZE >> PAGE_SHIFT; @@ -548,7 +548,7 @@ void __init __start_xen(unsigned long mbi_p) unsigned int initrdidx; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_headroom, *module_map; + unsigned long nr_pages, raw_max_page, modules_headroom, *module_map; int i, j, e820_warn = 0, bytes = 0; bool_t acpi_boot_table_init_done = 0; struct ns16550_defaults ns16550 = { @@ -752,7 +752,7 @@ void __init __start_xen(unsigned long mbi_p) } /* Sanitise the raw E820 map to produce a final clean version. */ - max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); + max_page = raw_max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); /* Create a temporary copy of the E820 map. */ memcpy(&boot_e820, &e820, sizeof(e820)); @@ -821,7 +821,10 @@ void __init __start_xen(unsigned long mbi_p) (end - s) >> PAGE_SHIFT, PAGE_HYPERVISOR); } - e = min_t(uint64_t, e, 1ULL << (PAGE_SHIFT + 32)); + if ( e > min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)) ) + e = min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)); #define reloc_size ((__pa(&_end) + mask) & ~mask) /* Is the region suitable for relocating Xen? */ if ( !xen_phys_start && e <= limit ) @@ -970,7 +973,7 @@ void __init __start_xen(unsigned long mbi_p) /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(&boot_e820); - setup_max_pdx(); + setup_max_pdx(raw_max_page); if ( highmem_start ) xenheap_max_mfn(PFN_DOWN(highmem_start)); @@ -996,7 +999,7 @@ void __init __start_xen(unsigned long mbi_p) { acpi_boot_table_init_done = 1; srat_parse_regions(s); - setup_max_pdx(); + setup_max_pdx(raw_max_page); } if ( pfn_to_pdx((e - 1) >> PAGE_SHIFT) >= max_pdx ) @@ -1134,7 +1137,7 @@ void __init __start_xen(unsigned long mbi_p) acpi_numa_init(); - numa_initmem_init(0, max_page); + numa_initmem_init(0, raw_max_page); end_boot_allocator(); system_state = SYS_STATE_boot; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22: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 1VKPZy-0005SK-Ej; Fri, 13 Sep 2013 09:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZx-0005SC-ET for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:17 +0000 Received: from [85.158.139.211:62982] by server-11.bemta-5.messagelabs.com id 50/BF-10409-849D2325; Fri, 13 Sep 2013 09:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1379064134!2391931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24800 invoked from network); 13 Sep 2013 09:22:15 -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; 13 Sep 2013 09:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZu-0000RC-MJ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPZu-0001yY-7U for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:14 +0000 Date: Fri, 13 Sep 2013 09:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/x86: fix page table creation for huge guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06d086832155fc7f5344e9d108b979de34674d11 Author: Jan Beulich AuthorDate: Thu Sep 12 17:41:04 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 17:41:04 2013 +0200 libxc/x86: fix page table creation for huge guests The switch-over logic from one page directory to the next was wrong; it needs to be deferred until we actually reach the last page within a given region, instead of being done when the last entry of a page directory gets started with. Signed-off-by: Jan Beulich Tested-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- tools/libxc/xc_dom_x86.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 126c0f8..41f59d3 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -251,7 +251,7 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - unsigned long l3off, l2off, l1off; + unsigned long l3off, l2off = 0, l1off; xen_vaddr_t addr; xen_pfn_t pgpfn; xen_pfn_t l3mfn = xc_dom_p2m_guest(dom, l3pfn); @@ -299,8 +299,6 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l2off = l2_table_offset_pae(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) - l2tab = NULL; l1pfn++; } @@ -312,8 +310,13 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_PAE - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) + l2tab = NULL; + } } if ( dom->virt_pgtab_end <= 0xc0000000 ) @@ -360,7 +363,7 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab = NULL; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - uint64_t l4off, l3off, l2off, l1off; + uint64_t l4off, l3off = 0, l2off = 0, l1off; uint64_t addr; xen_pfn_t pgpfn; @@ -391,8 +394,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3off = l3_table_offset_x86_64(addr); l3tab[l3off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT; - if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) - l3tab = NULL; l2pfn++; } @@ -405,8 +406,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l2off = l2_table_offset_x86_64(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) - l2tab = NULL; l1pfn++; } @@ -418,8 +417,17 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_X86_64 - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) + { + l2tab = NULL; + if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) + l3tab = NULL; + } + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 09:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22: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 1VKPZy-0005SK-Ej; Fri, 13 Sep 2013 09:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZx-0005SC-ET for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:17 +0000 Received: from [85.158.139.211:62982] by server-11.bemta-5.messagelabs.com id 50/BF-10409-849D2325; Fri, 13 Sep 2013 09:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1379064134!2391931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24800 invoked from network); 13 Sep 2013 09:22:15 -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; 13 Sep 2013 09:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPZu-0000RC-MJ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPZu-0001yY-7U for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:14 +0000 Date: Fri, 13 Sep 2013 09:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/x86: fix page table creation for huge guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06d086832155fc7f5344e9d108b979de34674d11 Author: Jan Beulich AuthorDate: Thu Sep 12 17:41:04 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 12 17:41:04 2013 +0200 libxc/x86: fix page table creation for huge guests The switch-over logic from one page directory to the next was wrong; it needs to be deferred until we actually reach the last page within a given region, instead of being done when the last entry of a page directory gets started with. Signed-off-by: Jan Beulich Tested-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- tools/libxc/xc_dom_x86.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 126c0f8..41f59d3 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -251,7 +251,7 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - unsigned long l3off, l2off, l1off; + unsigned long l3off, l2off = 0, l1off; xen_vaddr_t addr; xen_pfn_t pgpfn; xen_pfn_t l3mfn = xc_dom_p2m_guest(dom, l3pfn); @@ -299,8 +299,6 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l2off = l2_table_offset_pae(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) - l2tab = NULL; l1pfn++; } @@ -312,8 +310,13 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_PAE - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) + l2tab = NULL; + } } if ( dom->virt_pgtab_end <= 0xc0000000 ) @@ -360,7 +363,7 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab = NULL; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - uint64_t l4off, l3off, l2off, l1off; + uint64_t l4off, l3off = 0, l2off = 0, l1off; uint64_t addr; xen_pfn_t pgpfn; @@ -391,8 +394,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3off = l3_table_offset_x86_64(addr); l3tab[l3off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT; - if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) - l3tab = NULL; l2pfn++; } @@ -405,8 +406,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l2off = l2_table_offset_x86_64(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) - l2tab = NULL; l1pfn++; } @@ -418,8 +417,17 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_X86_64 - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) + { + l2tab = NULL; + if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) + l3tab = NULL; + } + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 09:22:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa8-0005TI-Hg; Fri, 13 Sep 2013 09:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa7-0005T6-IY for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:27 +0000 Received: from [85.158.137.68:24210] by server-12.bemta-3.messagelabs.com id AB/46-11891-259D2325; Fri, 13 Sep 2013 09:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1379064145!1986197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27390 invoked from network); 13 Sep 2013 09:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa4-0000RL-UO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPa4-0001yu-PN for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:24 +0000 Date: Fri, 13 Sep 2013 09:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Don't dereference p2m pointer before NULL check. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5f9a29421d0d2587683e3a91f0659102e80a942 Author: Tim Deegan AuthorDate: Thu Sep 12 09:56:12 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 x86/mm: Don't dereference p2m pointer before NULL check. Not a security bug, because in fact this is never called with a NULL argument. Coverity CID 1055955 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f5ddd20..8f380ed 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -453,7 +453,7 @@ void p2m_teardown(struct p2m_domain *p2m) * We know we don't have any extra mappings to these pages */ { struct page_info *pg; - struct domain *d = p2m->domain; + struct domain *d; unsigned long gfn; p2m_type_t t; mfn_t mfn; @@ -461,6 +461,8 @@ void p2m_teardown(struct p2m_domain *p2m) if (p2m == NULL) return; + d = p2m->domain; + p2m_lock(p2m); /* Try to unshare any remaining shared p2m entries. Safeguard -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa8-0005TI-Hg; Fri, 13 Sep 2013 09:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa7-0005T6-IY for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:27 +0000 Received: from [85.158.137.68:24210] by server-12.bemta-3.messagelabs.com id AB/46-11891-259D2325; Fri, 13 Sep 2013 09:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1379064145!1986197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27390 invoked from network); 13 Sep 2013 09:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPa4-0000RL-UO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPa4-0001yu-PN for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:24 +0000 Date: Fri, 13 Sep 2013 09:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Don't dereference p2m pointer before NULL check. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b5f9a29421d0d2587683e3a91f0659102e80a942 Author: Tim Deegan AuthorDate: Thu Sep 12 09:56:12 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 x86/mm: Don't dereference p2m pointer before NULL check. Not a security bug, because in fact this is never called with a NULL argument. Coverity CID 1055955 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index f5ddd20..8f380ed 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -453,7 +453,7 @@ void p2m_teardown(struct p2m_domain *p2m) * We know we don't have any extra mappings to these pages */ { struct page_info *pg; - struct domain *d = p2m->domain; + struct domain *d; unsigned long gfn; p2m_type_t t; mfn_t mfn; @@ -461,6 +461,8 @@ void p2m_teardown(struct p2m_domain *p2m) if (p2m == NULL) return; + d = p2m->domain; + p2m_lock(p2m); /* Try to unshare any remaining shared p2m entries. Safeguard -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaI-0005Ug-Nn; Fri, 13 Sep 2013 09:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaH-0005UQ-D2 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:37 +0000 Received: from [85.158.143.35:21402] by server-3.bemta-4.messagelabs.com id 70/AE-08835-C59D2325; Fri, 13 Sep 2013 09:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379064155!3566735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31651 invoked from network); 13 Sep 2013 09:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaF-0000RR-1y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaF-0001zK-0l for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:35 +0000 Date: Fri, 13 Sep 2013 09:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq: avoid integer overflows. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c40a7fa1cd5c693c424515c7c896e1a5a880bf5 Author: Tim Deegan AuthorDate: Thu Sep 12 12:29:21 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 cpufreq: avoid integer overflows. The def_sampling_rate() one is, I think, a real bug. The others were spotted at the same time and are probably not bugs until we start dealing with 40GHz CPus. Coverity CID 1055682 Coverity CID 1055683 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index b3f9ab8..7fdba03 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -144,7 +144,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) } /* Check for frequency increase */ - if (max_load_freq > dbs_tuners_ins.up_threshold * policy->cur) { + if (max_load_freq > (uint64_t) dbs_tuners_ins.up_threshold * policy->cur) { /* if we are already at full speed then break out early */ if (policy->cur == max) return; @@ -162,7 +162,8 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) * can support the current CPU usage without triggering the up * policy. To be safe, we focus 10 points under the threshold. */ - if (max_load_freq < (dbs_tuners_ins.up_threshold - 10) * policy->cur) { + if (max_load_freq + < (uint64_t) (dbs_tuners_ins.up_threshold - 10) * policy->cur) { uint64_t freq_next; freq_next = max_load_freq / (dbs_tuners_ins.up_threshold - 10); @@ -246,7 +247,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event) * is used for first time */ if ((dbs_enable == 1) && !dbs_tuners_ins.sampling_rate) { - def_sampling_rate = policy->cpuinfo.transition_latency * + def_sampling_rate = (uint64_t) policy->cpuinfo.transition_latency * DEF_SAMPLING_RATE_LATENCY_MULTIPLIER; if (def_sampling_rate < MIN_STAT_SAMPLING_RATE) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaI-0005Ug-Nn; Fri, 13 Sep 2013 09:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaH-0005UQ-D2 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:37 +0000 Received: from [85.158.143.35:21402] by server-3.bemta-4.messagelabs.com id 70/AE-08835-C59D2325; Fri, 13 Sep 2013 09:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379064155!3566735!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31651 invoked from network); 13 Sep 2013 09:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaF-0000RR-1y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaF-0001zK-0l for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:35 +0000 Date: Fri, 13 Sep 2013 09:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq: avoid integer overflows. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c40a7fa1cd5c693c424515c7c896e1a5a880bf5 Author: Tim Deegan AuthorDate: Thu Sep 12 12:29:21 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 cpufreq: avoid integer overflows. The def_sampling_rate() one is, I think, a real bug. The others were spotted at the same time and are probably not bugs until we start dealing with 40GHz CPus. Coverity CID 1055682 Coverity CID 1055683 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index b3f9ab8..7fdba03 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -144,7 +144,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) } /* Check for frequency increase */ - if (max_load_freq > dbs_tuners_ins.up_threshold * policy->cur) { + if (max_load_freq > (uint64_t) dbs_tuners_ins.up_threshold * policy->cur) { /* if we are already at full speed then break out early */ if (policy->cur == max) return; @@ -162,7 +162,8 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) * can support the current CPU usage without triggering the up * policy. To be safe, we focus 10 points under the threshold. */ - if (max_load_freq < (dbs_tuners_ins.up_threshold - 10) * policy->cur) { + if (max_load_freq + < (uint64_t) (dbs_tuners_ins.up_threshold - 10) * policy->cur) { uint64_t freq_next; freq_next = max_load_freq / (dbs_tuners_ins.up_threshold - 10); @@ -246,7 +247,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event) * is used for first time */ if ((dbs_enable == 1) && !dbs_tuners_ins.sampling_rate) { - def_sampling_rate = policy->cpuinfo.transition_latency * + def_sampling_rate = (uint64_t) policy->cpuinfo.transition_latency * DEF_SAMPLING_RATE_LATENCY_MULTIPLIER; if (def_sampling_rate < MIN_STAT_SAMPLING_RATE) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaS-0005WD-QW; Fri, 13 Sep 2013 09:22:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaR-0005Vy-FY for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:47 +0000 Received: from [85.158.143.35:26768] by server-1.bemta-4.messagelabs.com id B4/13-16125-669D2325; Fri, 13 Sep 2013 09:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379064165!3566814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 915 invoked from network); 13 Sep 2013 09:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaP-0000RZ-6U for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaP-0001zi-4Y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:45 +0000 Date: Fri, 13 Sep 2013 09:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq: missing check of copy_from_guest() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 803f9a6cdfeda64beee908576de0ad02d6b0c480 Author: Tim Deegan AuthorDate: Thu Sep 12 12:36:04 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 cpufreq: missing check of copy_from_guest() Coverity CID 1055131 Coverity CID 1055132 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 0de5d41..ab66884 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -471,8 +471,12 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in ret = -ENOMEM; goto out; } - copy_from_guest(pxpt->states, dom0_px_info->states, - dom0_px_info->state_count); + if ( copy_from_guest(pxpt->states, dom0_px_info->states, + dom0_px_info->state_count) ) + { + ret = -EFAULT; + goto out; + } pxpt->state_count = dom0_px_info->state_count; if ( cpufreq_verbose ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:22:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaS-0005WD-QW; Fri, 13 Sep 2013 09:22:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaR-0005Vy-FY for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:47 +0000 Received: from [85.158.143.35:26768] by server-1.bemta-4.messagelabs.com id B4/13-16125-669D2325; Fri, 13 Sep 2013 09:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1379064165!3566814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 915 invoked from network); 13 Sep 2013 09:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaP-0000RZ-6U for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaP-0001zi-4Y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:45 +0000 Date: Fri, 13 Sep 2013 09:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpufreq: missing check of copy_from_guest() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 803f9a6cdfeda64beee908576de0ad02d6b0c480 Author: Tim Deegan AuthorDate: Thu Sep 12 12:36:04 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:47:08 2013 +0100 cpufreq: missing check of copy_from_guest() Coverity CID 1055131 Coverity CID 1055132 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 0de5d41..ab66884 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -471,8 +471,12 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in ret = -ENOMEM; goto out; } - copy_from_guest(pxpt->states, dom0_px_info->states, - dom0_px_info->state_count); + if ( copy_from_guest(pxpt->states, dom0_px_info->states, + dom0_px_info->state_count) ) + { + ret = -EFAULT; + goto out; + } pxpt->state_count = dom0_px_info->state_count; if ( cpufreq_verbose ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:23:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPad-0005YA-TH; Fri, 13 Sep 2013 09:22:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPac-0005Xr-6F for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:58 +0000 Received: from [85.158.137.68:38286] by server-2.bemta-3.messagelabs.com id A9/DF-14467-179D2325; Fri, 13 Sep 2013 09:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1379064175!1978042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15719 invoked from network); 13 Sep 2013 09:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaZ-0000Ro-At for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaZ-000207-95 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:55 +0000 Date: Fri, 13 Sep 2013 09:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ehci-dbgp: drop dead code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc230d5dcabf31c6db82916df7d0b98ca11fbaad Author: Tim Deegan AuthorDate: Thu Sep 12 12:58:11 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 ehci-dbgp: drop dead code. We can only reach this spot by breaking out of the scan loop, so by construction ret > 0. Coverity CID 1055259 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/char/ehci-dbgp.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 2504979..301eedf 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -946,11 +946,6 @@ try_again: dbgp_printk("could not find attached debug device\n"); goto err; } - if ( ret < 0 ) - { - dbgp_printk("attached device is not a debug device\n"); - goto err; - } dbgp->out.endpoint = dbgp_desc.bDebugOutEndpoint; dbgp->in.endpoint = dbgp_desc.bDebugInEndpoint; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:23:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPad-0005YA-TH; Fri, 13 Sep 2013 09:22:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPac-0005Xr-6F for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:58 +0000 Received: from [85.158.137.68:38286] by server-2.bemta-3.messagelabs.com id A9/DF-14467-179D2325; Fri, 13 Sep 2013 09:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1379064175!1978042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15719 invoked from network); 13 Sep 2013 09:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaZ-0000Ro-At for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaZ-000207-95 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:22:55 +0000 Date: Fri, 13 Sep 2013 09:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ehci-dbgp: drop dead code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc230d5dcabf31c6db82916df7d0b98ca11fbaad Author: Tim Deegan AuthorDate: Thu Sep 12 12:58:11 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 ehci-dbgp: drop dead code. We can only reach this spot by breaking out of the scan loop, so by construction ret > 0. Coverity CID 1055259 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/char/ehci-dbgp.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 2504979..301eedf 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -946,11 +946,6 @@ try_again: dbgp_printk("could not find attached debug device\n"); goto err; } - if ( ret < 0 ) - { - dbgp_printk("attached device is not a debug device\n"); - goto err; - } dbgp->out.endpoint = dbgp_desc.bDebugOutEndpoint; dbgp->in.endpoint = dbgp_desc.bDebugInEndpoint; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 13 09:23:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPao-0005aD-0Z; Fri, 13 Sep 2013 09:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPam-0005Zr-7Y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:08 +0000 Received: from [85.158.137.68:59345] by server-10.bemta-3.messagelabs.com id 0C/52-30473-B79D2325; Fri, 13 Sep 2013 09:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379064185!1989046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14764 invoked from network); 13 Sep 2013 09:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaj-0000SN-G4 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaj-00021A-DO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:05 +0000 Date: Fri, 13 Sep 2013 09:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ehci-dbgp: avoid division by zero. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e58015acaf53b179847db94524fb2a9f4399b5e6 Author: Tim Deegan AuthorDate: Thu Sep 12 12:55:10 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 ehci-dbgp: avoid division by zero. Unlikely to ever see hardware reporting 0 ports, but might as well fail gracefully if we do. Coverity CID 1055266 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/char/ehci-dbgp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 301eedf..b900d60 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1094,6 +1094,9 @@ try_next_port: dbgp_printk("n_ports: %u\n", n_ports); ehci_dbgp_status(dbgp, ""); + if ( n_ports == 0 ) + return -1; + for ( i = 1; i <= n_ports; i++ ) { portsc = readl(&dbgp->ehci_regs->port_status[i-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 Sep 13 09:23:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPao-0005aD-0Z; Fri, 13 Sep 2013 09:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPam-0005Zr-7Y for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:08 +0000 Received: from [85.158.137.68:59345] by server-10.bemta-3.messagelabs.com id 0C/52-30473-B79D2325; Fri, 13 Sep 2013 09:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379064185!1989046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14764 invoked from network); 13 Sep 2013 09:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaj-0000SN-G4 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPaj-00021A-DO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:05 +0000 Date: Fri, 13 Sep 2013 09:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ehci-dbgp: avoid division by zero. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e58015acaf53b179847db94524fb2a9f4399b5e6 Author: Tim Deegan AuthorDate: Thu Sep 12 12:55:10 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 ehci-dbgp: avoid division by zero. Unlikely to ever see hardware reporting 0 ports, but might as well fail gracefully if we do. Coverity CID 1055266 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/char/ehci-dbgp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 301eedf..b900d60 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1094,6 +1094,9 @@ try_next_port: dbgp_printk("n_ports: %u\n", n_ports); ehci_dbgp_status(dbgp, ""); + if ( n_ports == 0 ) + return -1; + for ( i = 1; i <= n_ports; i++ ) { portsc = readl(&dbgp->ehci_regs->port_status[i-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 Sep 13 09:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPay-0005cR-5I; Fri, 13 Sep 2013 09:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaw-0005bw-6p for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:18 +0000 Received: from [85.158.137.68:3397] by server-12.bemta-3.messagelabs.com id D5/F7-11891-589D2325; Fri, 13 Sep 2013 09:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379064195!1970420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4735 invoked from network); 13 Sep 2013 09:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPat-0000ST-KO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPat-00021f-Ig for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:15 +0000 Date: Fri, 13 Sep 2013 09:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] acpi/pmstat: fix check for empty name strings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cadbe2f9e768585fad52156be2433d49ec9feaf1 Author: Tim Deegan AuthorDate: Thu Sep 12 13:09:35 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 acpi/pmstat: fix check for empty name strings. These 'name' strings are actually arrays in their structs. So the address is never NULL: instead, we should check the first character to detect cases where the field wasn't initialized. Coverity CID 1055633 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index f8a9c85..daac2da 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -264,13 +264,13 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) op->u.get_para.scaling_max_freq = policy->max; op->u.get_para.scaling_min_freq = policy->min; - if ( cpufreq_driver->name ) + if ( cpufreq_driver->name[0] ) strlcpy(op->u.get_para.scaling_driver, cpufreq_driver->name, CPUFREQ_NAME_LEN); else strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN); - if ( policy->governor->name ) + if ( policy->governor->name[0] ) strlcpy(op->u.get_para.scaling_governor, policy->governor->name, CPUFREQ_NAME_LEN); 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 Sep 13 09:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 09:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPay-0005cR-5I; Fri, 13 Sep 2013 09:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPaw-0005bw-6p for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:18 +0000 Received: from [85.158.137.68:3397] by server-12.bemta-3.messagelabs.com id D5/F7-11891-589D2325; Fri, 13 Sep 2013 09:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379064195!1970420!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4735 invoked from network); 13 Sep 2013 09:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 09:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKPat-0000ST-KO for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKPat-00021f-Ig for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 09:23:15 +0000 Date: Fri, 13 Sep 2013 09:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] acpi/pmstat: fix check for empty name strings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cadbe2f9e768585fad52156be2433d49ec9feaf1 Author: Tim Deegan AuthorDate: Thu Sep 12 13:09:35 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 12 17:48:01 2013 +0100 acpi/pmstat: fix check for empty name strings. These 'name' strings are actually arrays in their structs. So the address is never NULL: instead, we should check the first character to detect cases where the field wasn't initialized. Coverity CID 1055633 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index f8a9c85..daac2da 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -264,13 +264,13 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) op->u.get_para.scaling_max_freq = policy->max; op->u.get_para.scaling_min_freq = policy->min; - if ( cpufreq_driver->name ) + if ( cpufreq_driver->name[0] ) strlcpy(op->u.get_para.scaling_driver, cpufreq_driver->name, CPUFREQ_NAME_LEN); else strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN); - if ( policy->governor->name ) + if ( policy->governor->name[0] ) strlcpy(op->u.get_para.scaling_governor, policy->governor->name, CPUFREQ_NAME_LEN); 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 Sep 13 21:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoa-00064o-0F; Fri, 13 Sep 2013 21:22:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoY-00064f-If for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:06 +0000 Received: from [85.158.143.35:55660] by server-1.bemta-4.messagelabs.com id 12/3D-16125-DF183325; Fri, 13 Sep 2013 21:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379107324!3798281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28692 invoked from network); 13 Sep 2013 21:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoW-0000dd-44 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaoV-0006Wi-Mg for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:03 +0000 Date: Fri, 13 Sep 2013 21:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] make this tree's maintainership explicit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 769fde2fad8796815c8d66a9e725aca85c0b3fa4 Author: Jan Beulich AuthorDate: Fri Sep 13 11:52:40 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 11:52:40 2013 +0200 make this tree's maintainership explicit --- MAINTAINERS | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 843f9e3..c7c04fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 21:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoa-00064o-0F; Fri, 13 Sep 2013 21:22:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoY-00064f-If for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:06 +0000 Received: from [85.158.143.35:55660] by server-1.bemta-4.messagelabs.com id 12/3D-16125-DF183325; Fri, 13 Sep 2013 21:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379107324!3798281!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28692 invoked from network); 13 Sep 2013 21:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoW-0000dd-44 for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaoV-0006Wi-Mg for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:03 +0000 Date: Fri, 13 Sep 2013 21:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] make this tree's maintainership explicit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 769fde2fad8796815c8d66a9e725aca85c0b3fa4 Author: Jan Beulich AuthorDate: Fri Sep 13 11:52:40 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 11:52:40 2013 +0200 make this tree's maintainership explicit --- MAINTAINERS | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 843f9e3..c7c04fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,14 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Remember to copy the stable branch maintainer. The maintainer for this +branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 21:22:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22: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 1VKaok-00065S-3P; Fri, 13 Sep 2013 21:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoi-000655-Td for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:17 +0000 Received: from [85.158.143.35:56186] by server-3.bemta-4.messagelabs.com id B0/FD-08835-80283325; Fri, 13 Sep 2013 21:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379107334!3781908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23965 invoked from network); 13 Sep 2013 21:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaog-0000dg-AQ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaog-0006X6-7x for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:14 +0000 Date: Fri, 13 Sep 2013 21:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Allow network driver domains when run_hotplug_scritps is set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0502018491519694792==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0502018491519694792== Content-Type: text/plain commit 797e29bee13b80fc162aab0e19722045a11e8f65 Author: George Dunlap AuthorDate: Fri Jul 5 12:13:54 2013 +0100 Commit: Ian Jackson CommitDate: Fri Sep 13 14:39:39 2013 +0100 libxl: Allow network driver domains when run_hotplug_scritps is set As of commit 05bfd984dfe7014f1f5ea1133608b9bab589c120, hotplug scripts are not run if backend_domid != LIBXL_TOOSTACK_DOMID; so there is no reason to restrict this for network driver domains any more. This is a candidate for backporting to 4.3. Signed-off-by: George Dunlap Acked-by: Roger Pau Monné CC: Ian Campbell CC: Ian Jackson CC: Jan Beulich (cherry picked from commit 8f46b1cb99fe519ac39d10d0796c6be37fb1d178) --- docs/misc/xl-network-configuration.markdown | 6 ++---- tools/libxl/libxl.c | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index e0d3d2a..3c439d4 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -131,10 +131,8 @@ specified IP address to be used by the guest (blocking all others). ### backend Specifies the backend domain which this device should attach to. This -defaults to domain 0. This option does not work if `run_hotplug_scripts` -is not disabled in xl.conf (see xl.conf(5) man page for more information -on this option). Specifying another domain requires setting up a driver -domain which is outside the scope of this document. +defaults to domain 0. Specifying another domain requires setting up a +driver domain which is outside the scope of this document. ### rate diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3236aa9..dcb3df9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2819,13 +2819,6 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, rc = libxl__resolve_domid(gc, nic->backend_domname, &nic->backend_domid); if (rc < 0) return rc; - if (nic->backend_domid != LIBXL_TOOLSTACK_DOMID && run_hotplug_scripts) { - LOG(ERROR, "cannot use a backend domain different than %d if" - "hotplug scripts are executed from libxl", - LIBXL_TOOLSTACK_DOMID); - return ERROR_FAIL; - } - switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (!nic->nictype) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============0502018491519694792== 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 --===============0502018491519694792==-- From xen-changelog-bounces@lists.xen.org Fri Sep 13 21:22:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22: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 1VKaok-00065S-3P; Fri, 13 Sep 2013 21:22:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoi-000655-Td for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:17 +0000 Received: from [85.158.143.35:56186] by server-3.bemta-4.messagelabs.com id B0/FD-08835-80283325; Fri, 13 Sep 2013 21:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379107334!3781908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23965 invoked from network); 13 Sep 2013 21:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaog-0000dg-AQ for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaog-0006X6-7x for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:14 +0000 Date: Fri, 13 Sep 2013 21:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Allow network driver domains when run_hotplug_scritps is set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0502018491519694792==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0502018491519694792== Content-Type: text/plain commit 797e29bee13b80fc162aab0e19722045a11e8f65 Author: George Dunlap AuthorDate: Fri Jul 5 12:13:54 2013 +0100 Commit: Ian Jackson CommitDate: Fri Sep 13 14:39:39 2013 +0100 libxl: Allow network driver domains when run_hotplug_scritps is set As of commit 05bfd984dfe7014f1f5ea1133608b9bab589c120, hotplug scripts are not run if backend_domid != LIBXL_TOOSTACK_DOMID; so there is no reason to restrict this for network driver domains any more. This is a candidate for backporting to 4.3. Signed-off-by: George Dunlap Acked-by: Roger Pau Monné CC: Ian Campbell CC: Ian Jackson CC: Jan Beulich (cherry picked from commit 8f46b1cb99fe519ac39d10d0796c6be37fb1d178) --- docs/misc/xl-network-configuration.markdown | 6 ++---- tools/libxl/libxl.c | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/misc/xl-network-configuration.markdown b/docs/misc/xl-network-configuration.markdown index e0d3d2a..3c439d4 100644 --- a/docs/misc/xl-network-configuration.markdown +++ b/docs/misc/xl-network-configuration.markdown @@ -131,10 +131,8 @@ specified IP address to be used by the guest (blocking all others). ### backend Specifies the backend domain which this device should attach to. This -defaults to domain 0. This option does not work if `run_hotplug_scripts` -is not disabled in xl.conf (see xl.conf(5) man page for more information -on this option). Specifying another domain requires setting up a driver -domain which is outside the scope of this document. +defaults to domain 0. Specifying another domain requires setting up a +driver domain which is outside the scope of this document. ### rate diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3236aa9..dcb3df9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2819,13 +2819,6 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, rc = libxl__resolve_domid(gc, nic->backend_domname, &nic->backend_domid); if (rc < 0) return rc; - if (nic->backend_domid != LIBXL_TOOLSTACK_DOMID && run_hotplug_scripts) { - LOG(ERROR, "cannot use a backend domain different than %d if" - "hotplug scripts are executed from libxl", - LIBXL_TOOLSTACK_DOMID); - return ERROR_FAIL; - } - switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (!nic->nictype) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============0502018491519694792== 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 --===============0502018491519694792==-- From xen-changelog-bounces@lists.xen.org Fri Sep 13 21:22:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaou-00066M-6u; Fri, 13 Sep 2013 21:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaot-00065z-2S for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:27 +0000 Received: from [85.158.143.35:56639] by server-1.bemta-4.messagelabs.com id B6/5D-16125-21283325; Fri, 13 Sep 2013 21:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1379107344!3781502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5522 invoked from network); 13 Sep 2013 21:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoq-0000dp-LK for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaoq-0006XT-ER for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:24 +0000 Date: Fri, 13 Sep 2013 21:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: xen-mceinj: Add missing return value checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e36c0917dd54c932816e11a525f294101c77557d Author: Bastian Blank AuthorDate: Sun Aug 11 22:10:20 2013 +0200 Commit: Ian Jackson CommitDate: Fri Sep 13 14:39:51 2013 +0100 tools: xen-mceinj: Add missing return value checks The return value of vasprintf must be checked. This check is enforced with the compiler options used in Debian by request and in Ubuntu by default. Check the return value and abort on error. Signed-off-by: Bastian Blank Acked-by: Ian Jackson (cherry picked from commit 1efe90faa31be104a24fe75323429d227eae1d9f) --- tools/tests/mce-test/tools/xen-mceinj.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index e3e62f7..21a488b 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -92,7 +92,8 @@ static void Lprintf(const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); fprintf(LOGFILE, "%s", buf); va_end(args); free(buf); @@ -104,7 +105,8 @@ static void err(xc_interface *xc_handle, const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); perror(buf); va_end(args); free(buf); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 13 21:22:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Sep 2013 21:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaou-00066M-6u; Fri, 13 Sep 2013 21:22:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaot-00065z-2S for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:27 +0000 Received: from [85.158.143.35:56639] by server-1.bemta-4.messagelabs.com id B6/5D-16125-21283325; Fri, 13 Sep 2013 21:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1379107344!3781502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5522 invoked from network); 13 Sep 2013 21:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Sep 2013 21:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKaoq-0000dp-LK for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKaoq-0006XT-ER for xen-changelog@lists.xensource.com; Fri, 13 Sep 2013 21:22:24 +0000 Date: Fri, 13 Sep 2013 21:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools: xen-mceinj: Add missing return value checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e36c0917dd54c932816e11a525f294101c77557d Author: Bastian Blank AuthorDate: Sun Aug 11 22:10:20 2013 +0200 Commit: Ian Jackson CommitDate: Fri Sep 13 14:39:51 2013 +0100 tools: xen-mceinj: Add missing return value checks The return value of vasprintf must be checked. This check is enforced with the compiler options used in Debian by request and in Ubuntu by default. Check the return value and abort on error. Signed-off-by: Bastian Blank Acked-by: Ian Jackson (cherry picked from commit 1efe90faa31be104a24fe75323429d227eae1d9f) --- tools/tests/mce-test/tools/xen-mceinj.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index e3e62f7..21a488b 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -92,7 +92,8 @@ static void Lprintf(const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); fprintf(LOGFILE, "%s", buf); va_end(args); free(buf); @@ -104,7 +105,8 @@ static void err(xc_interface *xc_handle, const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); perror(buf); va_end(args); free(buf); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 14 01:55:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 14 Sep 2013 01:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4m-00034l-Id; Sat, 14 Sep 2013 01:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4l-00034d-UA for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:08 +0000 Received: from [85.158.137.68:56254] by server-8.bemta-3.messagelabs.com id 2B/EA-28652-BF1C3325; Sat, 14 Sep 2013 01:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379123705!2204008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15632 invoked from network); 14 Sep 2013 01:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2013 01:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4i-0001s7-N2 for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKf4i-0005Ys-5v for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:04 +0000 Date: Sat, 14 Sep 2013 01:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/gdbsx: fix build failure with glibc-2.17 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7071c972b4dfaadbc2e6bae6d9876315be4d1d5d Author: Olaf Hering AuthorDate: Thu Dec 6 16:50:48 2012 +0000 Commit: Ian Jackson CommitDate: Fri Sep 13 11:01:59 2013 +0100 tools/gdbsx: fix build failure with glibc-2.17 Signed-off-by: Olaf Hering Committed-by: Keir Fraser (cherry picked from commit 5d98adc3e5e859ba23f62ca63450f6a60a9c5e2f) --- tools/debugger/gdbsx/xg/xg_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index d2eec0b..64c7484 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -34,6 +34,7 @@ * XGTRC(): generic trace utility */ +#include #include #include #include -- 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 Sep 14 01:55:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 14 Sep 2013 01:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4m-00034l-Id; Sat, 14 Sep 2013 01:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4l-00034d-UA for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:08 +0000 Received: from [85.158.137.68:56254] by server-8.bemta-3.messagelabs.com id 2B/EA-28652-BF1C3325; Sat, 14 Sep 2013 01:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379123705!2204008!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15632 invoked from network); 14 Sep 2013 01:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2013 01:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4i-0001s7-N2 for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKf4i-0005Ys-5v for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:04 +0000 Date: Sat, 14 Sep 2013 01:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/gdbsx: fix build failure with glibc-2.17 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7071c972b4dfaadbc2e6bae6d9876315be4d1d5d Author: Olaf Hering AuthorDate: Thu Dec 6 16:50:48 2012 +0000 Commit: Ian Jackson CommitDate: Fri Sep 13 11:01:59 2013 +0100 tools/gdbsx: fix build failure with glibc-2.17 Signed-off-by: Olaf Hering Committed-by: Keir Fraser (cherry picked from commit 5d98adc3e5e859ba23f62ca63450f6a60a9c5e2f) --- tools/debugger/gdbsx/xg/xg_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index d2eec0b..64c7484 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -34,6 +34,7 @@ * XGTRC(): generic trace utility */ +#include #include #include #include -- 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 Sep 14 01:55:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 14 Sep 2013 01:55: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 1VKf4w-00035L-Le; Sat, 14 Sep 2013 01:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4v-00035D-M8 for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:17 +0000 Received: from [85.158.143.35:34686] by server-1.bemta-4.messagelabs.com id A7/E8-16125-502C3325; Sat, 14 Sep 2013 01:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379123715!3835657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4989 invoked from network); 14 Sep 2013 01:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2013 01:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4t-0001sA-1q for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKf4s-0005ZG-Ru for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:14 +0000 Date: Sat, 14 Sep 2013 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: xen-mceinj: Add missing return value checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18ac5a8fe17bf3bf78c3bdbc0f22fea8c388d70a Author: Bastian Blank AuthorDate: Sun Aug 11 22:10:20 2013 +0200 Commit: Ian Jackson CommitDate: Fri Sep 13 14:46:05 2013 +0100 tools: xen-mceinj: Add missing return value checks The return value of vasprintf must be checked. This check is enforced with the compiler options used in Debian by request and in Ubuntu by default. Check the return value and abort on error. Signed-off-by: Bastian Blank Acked-by: Ian Jackson (cherry picked from commit 1efe90faa31be104a24fe75323429d227eae1d9f) (cherry picked from commit e36c0917dd54c932816e11a525f294101c77557d) --- tools/tests/mce-test/tools/xen-mceinj.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index b69c65d..2519d58 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -92,7 +92,8 @@ static void Lprintf(const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); fprintf(LOGFILE, "%s", buf); va_end(args); free(buf); @@ -104,7 +105,8 @@ static void err(xc_interface *xc_handle, const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); perror(buf); va_end(args); free(buf); -- 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 Sep 14 01:55:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 14 Sep 2013 01:55: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 1VKf4w-00035L-Le; Sat, 14 Sep 2013 01:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4v-00035D-M8 for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:17 +0000 Received: from [85.158.143.35:34686] by server-1.bemta-4.messagelabs.com id A7/E8-16125-502C3325; Sat, 14 Sep 2013 01:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1379123715!3835657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4989 invoked from network); 14 Sep 2013 01:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2013 01:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VKf4t-0001sA-1q for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VKf4s-0005ZG-Ru for xen-changelog@lists.xensource.com; Sat, 14 Sep 2013 01:55:14 +0000 Date: Sat, 14 Sep 2013 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools: xen-mceinj: Add missing return value checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18ac5a8fe17bf3bf78c3bdbc0f22fea8c388d70a Author: Bastian Blank AuthorDate: Sun Aug 11 22:10:20 2013 +0200 Commit: Ian Jackson CommitDate: Fri Sep 13 14:46:05 2013 +0100 tools: xen-mceinj: Add missing return value checks The return value of vasprintf must be checked. This check is enforced with the compiler options used in Debian by request and in Ubuntu by default. Check the return value and abort on error. Signed-off-by: Bastian Blank Acked-by: Ian Jackson (cherry picked from commit 1efe90faa31be104a24fe75323429d227eae1d9f) (cherry picked from commit e36c0917dd54c932816e11a525f294101c77557d) --- tools/tests/mce-test/tools/xen-mceinj.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index b69c65d..2519d58 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -92,7 +92,8 @@ static void Lprintf(const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); fprintf(LOGFILE, "%s", buf); va_end(args); free(buf); @@ -104,7 +105,8 @@ static void err(xc_interface *xc_handle, const char *fmt, ...) va_list args; va_start(args, fmt); - vasprintf(&buf, fmt, args); + if (vasprintf(&buf, fmt, args) < 0) + abort(); perror(buf); va_end(args); free(buf); -- 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 Mon Sep 16 20:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20: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 1VLfp6-0003JC-M9; Mon, 16 Sep 2013 20:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfp5-0003J4-KO for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:07 +0000 Received: from [85.158.143.35:50059] by server-1.bemta-4.messagelabs.com id F5/13-16125-A2077325; Mon, 16 Sep 2013 20:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379364905!4550012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12293 invoked from network); 16 Sep 2013 20:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfp3-0003Ry-2a for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfp2-00068B-KY for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:04 +0000 Date: Mon, 16 Sep 2013 20:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl, hotplug/Linux: default to phy backend for raw format 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: multipart/mixed; boundary="===============1476634722187601314==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1476634722187601314== Content-Type: text/plain commit 11a63a1660453269ddd1893c15d0a98133b33ca7 Author: Wei Liu AuthorDate: Thu Sep 5 15:11:31 2013 +0100 Commit: Ian Jackson CommitDate: Fri Sep 13 11:09:21 2013 +0100 libxl, hotplug/Linux: default to phy backend for raw format file Modify libxl to allow raw format file to use phy backend. For the hotplug script part, learn from NetBSD's block hotplug script -- test the path and determine the actual type of file (block device or regular file) then use the actual type to determine which branch to run. With these changes, plus the current ordering of backend preference (phy > qdisk > tap), we will use phy backend for raw format file by default. Signed-off-by: Wei Liu Cc: Stefano Stabellini Acked-by: Roger Pau Monné Acked-by: Ian Jackson --- tools/hotplug/Linux/block | 16 +++++++++------- tools/libxl/libxl_linux.c | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index da26e22..8d2ee9d 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,6 +206,13 @@ and so cannot be mounted ${m2}${when}." t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') +p=$(xenstore_read "$XENBUS_PATH/params") +mode=$(xenstore_read "$XENBUS_PATH/mode") +if [ -b "$p" ]; then + truetype="phy" +elif [ -f "$p" ]; then + truetype="file" +fi case "$command" in add) @@ -217,16 +224,11 @@ case "$command" in exit 0 fi - if [ -n "$t" ] - then - p=$(xenstore_read "$XENBUS_PATH/params") - mode=$(xenstore_read "$XENBUS_PATH/mode") - fi FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $t in + case $truetype in phy) dev=$(expand_dev $p) @@ -319,7 +321,7 @@ mount it read-write in a guest domain." ;; remove) - case $t in + case $truetype in phy) exit 0 ;; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 37815eb..3cfa6da 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (!S_ISBLK(st_mode)) { - return 0; + if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { + return 1; } - return 1; + return 0; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1476634722187601314== 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 --===============1476634722187601314==-- From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20: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 1VLfp6-0003JC-M9; Mon, 16 Sep 2013 20:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfp5-0003J4-KO for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:07 +0000 Received: from [85.158.143.35:50059] by server-1.bemta-4.messagelabs.com id F5/13-16125-A2077325; Mon, 16 Sep 2013 20:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379364905!4550012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12293 invoked from network); 16 Sep 2013 20:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfp3-0003Ry-2a for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfp2-00068B-KY for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:04 +0000 Date: Mon, 16 Sep 2013 20:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl, hotplug/Linux: default to phy backend for raw format 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: multipart/mixed; boundary="===============1476634722187601314==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1476634722187601314== Content-Type: text/plain commit 11a63a1660453269ddd1893c15d0a98133b33ca7 Author: Wei Liu AuthorDate: Thu Sep 5 15:11:31 2013 +0100 Commit: Ian Jackson CommitDate: Fri Sep 13 11:09:21 2013 +0100 libxl, hotplug/Linux: default to phy backend for raw format file Modify libxl to allow raw format file to use phy backend. For the hotplug script part, learn from NetBSD's block hotplug script -- test the path and determine the actual type of file (block device or regular file) then use the actual type to determine which branch to run. With these changes, plus the current ordering of backend preference (phy > qdisk > tap), we will use phy backend for raw format file by default. Signed-off-by: Wei Liu Cc: Stefano Stabellini Acked-by: Roger Pau Monné Acked-by: Ian Jackson --- tools/hotplug/Linux/block | 16 +++++++++------- tools/libxl/libxl_linux.c | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index da26e22..8d2ee9d 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,6 +206,13 @@ and so cannot be mounted ${m2}${when}." t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') +p=$(xenstore_read "$XENBUS_PATH/params") +mode=$(xenstore_read "$XENBUS_PATH/mode") +if [ -b "$p" ]; then + truetype="phy" +elif [ -f "$p" ]; then + truetype="file" +fi case "$command" in add) @@ -217,16 +224,11 @@ case "$command" in exit 0 fi - if [ -n "$t" ] - then - p=$(xenstore_read "$XENBUS_PATH/params") - mode=$(xenstore_read "$XENBUS_PATH/mode") - fi FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $t in + case $truetype in phy) dev=$(expand_dev $p) @@ -319,7 +321,7 @@ mount it read-write in a guest domain." ;; remove) - case $t in + case $truetype in phy) exit 0 ;; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 37815eb..3cfa6da 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (!S_ISBLK(st_mode)) { - return 0; + if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { + return 1; } - return 1; + return 0; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1476634722187601314== 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 --===============1476634722187601314==-- From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20: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 1VLfpH-0003K6-PN; Mon, 16 Sep 2013 20:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpG-0003Jv-CR for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:18 +0000 Received: from [85.158.137.68:44343] by server-2.bemta-3.messagelabs.com id C9/98-14467-53077325; Mon, 16 Sep 2013 20:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379364915!2831333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3486 invoked from network); 16 Sep 2013 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpD-0003S1-Km for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpD-00068a-7o for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:15 +0000 Date: Mon, 16 Sep 2013 20:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: machine_restart() must not call acpi_dmar_reinstate() twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 Author: Jan Beulich AuthorDate: Fri Sep 13 14:27:34 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:27:34 2013 +0200 x86: machine_restart() must not call acpi_dmar_reinstate() twice .. as that function is not idempotent (it always alters the table checksum). The (generally) duplicate call was a result from it being made before machine_restart() re-invoking itself on the boot CPU. Considering that no problem arose so far from the table corruption I doubt that we need to restore the correct table signature on the reboot path in general. The only case I can see this as potentially necessary is the tboot one, hence do the call just in that case. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/shutdown.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 167905a..6eba271 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -466,8 +466,6 @@ void machine_restart(unsigned int delay_millisecs) console_start_sync(); spin_debug_disable(); - acpi_dmar_reinstate(); - local_irq_enable(); /* Ensure we are the boot CPU. */ @@ -492,7 +490,10 @@ void machine_restart(unsigned int delay_millisecs) mdelay(delay_millisecs); if ( tboot_in_measured_env() ) + { + acpi_dmar_reinstate(); tboot_shutdown(TB_SHUTDOWN_REBOOT); + } efi_reset_system(reboot_mode != 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20: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 1VLfpH-0003K6-PN; Mon, 16 Sep 2013 20:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpG-0003Jv-CR for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:18 +0000 Received: from [85.158.137.68:44343] by server-2.bemta-3.messagelabs.com id C9/98-14467-53077325; Mon, 16 Sep 2013 20:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379364915!2831333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3486 invoked from network); 16 Sep 2013 20:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpD-0003S1-Km for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpD-00068a-7o for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:15 +0000 Date: Mon, 16 Sep 2013 20:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: machine_restart() must not call acpi_dmar_reinstate() twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 Author: Jan Beulich AuthorDate: Fri Sep 13 14:27:34 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:27:34 2013 +0200 x86: machine_restart() must not call acpi_dmar_reinstate() twice .. as that function is not idempotent (it always alters the table checksum). The (generally) duplicate call was a result from it being made before machine_restart() re-invoking itself on the boot CPU. Considering that no problem arose so far from the table corruption I doubt that we need to restore the correct table signature on the reboot path in general. The only case I can see this as potentially necessary is the tboot one, hence do the call just in that case. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/shutdown.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 167905a..6eba271 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -466,8 +466,6 @@ void machine_restart(unsigned int delay_millisecs) console_start_sync(); spin_debug_disable(); - acpi_dmar_reinstate(); - local_irq_enable(); /* Ensure we are the boot CPU. */ @@ -492,7 +490,10 @@ void machine_restart(unsigned int delay_millisecs) mdelay(delay_millisecs); if ( tboot_in_measured_env() ) + { + acpi_dmar_reinstate(); tboot_shutdown(TB_SHUTDOWN_REBOOT); + } efi_reset_system(reboot_mode != 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55: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 1VLfpR-0003LA-SX; Mon, 16 Sep 2013 20:55:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpR-0003Kz-7n for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:29 +0000 Received: from [85.158.139.211:31108] by server-12.bemta-5.messagelabs.com id FA/D8-18373-04077325; Mon, 16 Sep 2013 20:55:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1379364926!2774491!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29493 invoked from network); 16 Sep 2013 20:55:27 -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; 16 Sep 2013 20:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpO-0003SB-Es for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpO-0006B3-CV for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:26 +0000 Date: Mon, 16 Sep 2013 20:55:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix `xl cpupool-list' behavior in case no pool name is provided X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3998afdbf99959582dcd9f9f4df5a6fe7ce4ded8 Author: Dario Faggioli AuthorDate: Wed Sep 11 13:06:22 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 12:50:39 2013 +0100 xl: fix `xl cpupool-list' behavior in case no pool name is provided since it errors out, asking for at least one argument, and does not display any useful output, which is wrong (we want the list and the info about all the existing cpupools). IOW, the output is as follows: ~# xl cpupool-list -c 'xl cpupool-list' requires at least 1 argument. ... While it should be as follows: ~# xl cpupool-list -c Name CPU list Pool-0 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 Signed-off-by: Dario Faggioli Acked-by: Juergen Gross --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 884f050..35b3e29 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6570,7 +6570,7 @@ int main_cpupoollist(int argc, char **argv) char *name; int ret = 0; - SWITCH_FOREACH_OPT(opt, "hc", opts, "cpupool-list", 1) { + SWITCH_FOREACH_OPT(opt, "hc", opts, "cpupool-list", 0) { case 'c': opt_cpus = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55: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 1VLfpR-0003LA-SX; Mon, 16 Sep 2013 20:55:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpR-0003Kz-7n for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:29 +0000 Received: from [85.158.139.211:31108] by server-12.bemta-5.messagelabs.com id FA/D8-18373-04077325; Mon, 16 Sep 2013 20:55:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1379364926!2774491!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29493 invoked from network); 16 Sep 2013 20:55:27 -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; 16 Sep 2013 20:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpO-0003SB-Es for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpO-0006B3-CV for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:26 +0000 Date: Mon, 16 Sep 2013 20:55:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix `xl cpupool-list' behavior in case no pool name is provided X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3998afdbf99959582dcd9f9f4df5a6fe7ce4ded8 Author: Dario Faggioli AuthorDate: Wed Sep 11 13:06:22 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 12:50:39 2013 +0100 xl: fix `xl cpupool-list' behavior in case no pool name is provided since it errors out, asking for at least one argument, and does not display any useful output, which is wrong (we want the list and the info about all the existing cpupools). IOW, the output is as follows: ~# xl cpupool-list -c 'xl cpupool-list' requires at least 1 argument. ... While it should be as follows: ~# xl cpupool-list -c Name CPU list Pool-0 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 Signed-off-by: Dario Faggioli Acked-by: Juergen Gross --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 884f050..35b3e29 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6570,7 +6570,7 @@ int main_cpupoollist(int argc, char **argv) char *name; int ret = 0; - SWITCH_FOREACH_OPT(opt, "hc", opts, "cpupool-list", 1) { + SWITCH_FOREACH_OPT(opt, "hc", opts, "cpupool-list", 0) { case 'c': opt_cpus = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55: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 1VLfpc-0003MQ-Vq; Mon, 16 Sep 2013 20:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpb-0003M8-JQ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:39 +0000 Received: from [85.158.139.211:19805] by server-1.bemta-5.messagelabs.com id F4/E0-26518-A4077325; Mon, 16 Sep 2013 20:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1379364937!2754082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9393 invoked from network); 16 Sep 2013 20:55:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpY-0003SM-WB for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpY-0006BU-Ij for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:36 +0000 Date: Mon, 16 Sep 2013 20:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: describe Xen boot protocol requirements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd9a0528ebc68ddb723feef6be57f75096d9df52 Author: Ian Campbell AuthorDate: Fri Aug 30 11:52:22 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 12:52:56 2013 +0100 xen: arm: describe Xen boot protocol requirements Signed-off-by: Ian Campbell --- docs/misc/arm/booting.txt | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/booting.txt b/docs/misc/arm/booting.txt new file mode 100644 index 0000000..9802e5e --- /dev/null +++ b/docs/misc/arm/booting.txt @@ -0,0 +1,30 @@ +Booting Xen +=========== + +Xen follows the zImage protocol defined for 32-bit ARM Linux[1] and the +Image protocol defined for ARM64 Linux[2]. + +In both cases the recommendation to boot in HYP/EL2 mode is a strict +requirement for Xen. + +The exceptions to this on 32-bit ARM are as follows: + + Xen does not require the machine type to be passed in r1. This + register is ignored (so may be invalid or the actual machine type). + + Xen does not support the ATAG list and requires Device + Tree. Therefore r2 must point to the physical address of device tree + block (dtb) in system RAM. + + NOTE: although Xen uses the zImage protocol there is no compression + actually used. This should be transparent to the bootloader. The + zImage protocol should still be used and not the stricter "raw + (non-zImage)" protocol described in arm/Booting. + +There are no exception on 64-bit ARM. + +[1] linux/Documentation/arm/Booting +Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arm/Booting + +[2] linux/Documentation/arm64/booting.txt +Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arm64/booting.txt -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55: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 1VLfpc-0003MQ-Vq; Mon, 16 Sep 2013 20:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpb-0003M8-JQ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:39 +0000 Received: from [85.158.139.211:19805] by server-1.bemta-5.messagelabs.com id F4/E0-26518-A4077325; Mon, 16 Sep 2013 20:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1379364937!2754082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9393 invoked from network); 16 Sep 2013 20:55:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpY-0003SM-WB for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpY-0006BU-Ij for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:36 +0000 Date: Mon, 16 Sep 2013 20:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: describe Xen boot protocol requirements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd9a0528ebc68ddb723feef6be57f75096d9df52 Author: Ian Campbell AuthorDate: Fri Aug 30 11:52:22 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 12:52:56 2013 +0100 xen: arm: describe Xen boot protocol requirements Signed-off-by: Ian Campbell --- docs/misc/arm/booting.txt | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/booting.txt b/docs/misc/arm/booting.txt new file mode 100644 index 0000000..9802e5e --- /dev/null +++ b/docs/misc/arm/booting.txt @@ -0,0 +1,30 @@ +Booting Xen +=========== + +Xen follows the zImage protocol defined for 32-bit ARM Linux[1] and the +Image protocol defined for ARM64 Linux[2]. + +In both cases the recommendation to boot in HYP/EL2 mode is a strict +requirement for Xen. + +The exceptions to this on 32-bit ARM are as follows: + + Xen does not require the machine type to be passed in r1. This + register is ignored (so may be invalid or the actual machine type). + + Xen does not support the ATAG list and requires Device + Tree. Therefore r2 must point to the physical address of device tree + block (dtb) in system RAM. + + NOTE: although Xen uses the zImage protocol there is no compression + actually used. This should be transparent to the bootloader. The + zImage protocol should still be used and not the stricter "raw + (non-zImage)" protocol described in arm/Booting. + +There are no exception on 64-bit ARM. + +[1] linux/Documentation/arm/Booting +Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arm/Booting + +[2] linux/Documentation/arm64/booting.txt +Latest version: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/arm64/booting.txt -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpn-0003Nq-36; Mon, 16 Sep 2013 20:55:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpm-0003Ne-67 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:50 +0000 Received: from [85.158.143.35:24742] by server-2.bemta-4.messagelabs.com id 0E/45-26052-55077325; Mon, 16 Sep 2013 20:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379364947!4566622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29120 invoked from network); 16 Sep 2013 20:55:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpj-0003SS-6U for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpj-0006CV-4A for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:47 +0000 Date: Mon, 16 Sep 2013 20:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_domain_get_guest_width() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0dd5b654107103765994243017a7f0eb15fda341 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:40 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:06:28 2013 +0100 libxc: introduce xc_domain_get_guest_width() As a wrapper to XEN_DOMCTL_get_address_size, and use it wherever the call was being issued directly via do_domctl(), saving quite some line of code. Actually, the function returns the guest width in bytes, rather than directly what XEN_DOMCTL_get_address_size provides (which is a number of bits), since that is what it is useful almost everywhere. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_core.c | 20 +------------------- tools/libxc/xc_cpuid_x86.c | 8 +++----- tools/libxc/xc_dom_x86.c | 13 +++---------- tools/libxc/xc_domain.c | 16 ++++++++++++++++ tools/libxc/xc_offline_page.c | 9 +-------- tools/libxc/xc_pagetab.c | 8 +++----- tools/libxc/xc_resume.c | 21 ++++----------------- tools/libxc/xenctrl.h | 13 +++++++++++++ tools/libxc/xg_save_restore.h | 9 +-------- tools/xentrace/xenctx.c | 9 +++------ 10 files changed, 48 insertions(+), 78 deletions(-) diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 4207eed..4bc1abb 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -417,24 +417,6 @@ elfnote_dump_format_version(xc_interface *xch, return dump_rtn(xch, args, (char*)&format_version, sizeof(format_version)); } -static int -get_guest_width(xc_interface *xch, - uint32_t domid, - unsigned int *guest_width) -{ - DECLARE_DOMCTL; - - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) - return 1; - - *guest_width = domctl.u.address_size.size / 8; - return 0; -} - int xc_domain_dumpcore_via_callback(xc_interface *xch, uint32_t domid, @@ -478,7 +460,7 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, struct xc_core_section_headers *sheaders = NULL; Elf64_Shdr *shdr; - if ( get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) { PERROR("Could not get address size for domain"); return sts; diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index fa47787..bbbf9b8 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -436,17 +436,15 @@ static void xc_cpuid_pv_policy( const unsigned int *input, unsigned int *regs) { DECLARE_DOMCTL; + unsigned int guest_width; int guest_64bit, xen_64bit = hypervisor_is_64bit(xch); char brand[13]; uint64_t xfeature_mask; xc_cpuid_brand_get(brand); - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - do_domctl(xch, &domctl); - guest_64bit = (domctl.u.address_size.size == 64); + xc_domain_get_guest_width(xch, domid, &guest_width); + guest_64bit = (guest_width == 8); /* Detecting Xen's atitude towards XSAVE */ memset(&domctl, 0, sizeof(domctl)); diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 41f59d3..7cc2ff2 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -54,24 +54,17 @@ const char *xc_domain_get_native_protocol(xc_interface *xch, int ret; uint32_t guest_width; const char *protocol; - DECLARE_DOMCTL; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - ret = do_domctl(xch, &domctl); + ret = xc_domain_get_guest_width(xch, domid, &guest_width); if ( ret ) return NULL; - guest_width = domctl.u.address_size.size; - switch (guest_width) { - case 32: /* 32 bit guest */ + case 4: /* 32 bit guest */ protocol = XEN_IO_PROTO_ABI_X86_32; break; - case 64: /* 64 bit guest */ + case 8: /* 64 bit guest */ protocol = XEN_IO_PROTO_ABI_X86_64; break; default: diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3257e2a..c0ce079 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -270,6 +270,22 @@ out: return ret; } +int xc_domain_get_guest_width(xc_interface *xch, uint32_t domid, + unsigned int *guest_width) +{ + DECLARE_DOMCTL; + + memset(&domctl, 0, sizeof(domctl)); + domctl.domain = domid; + domctl.cmd = XEN_DOMCTL_get_address_size; + + if ( do_domctl(xch, &domctl) != 0 ) + return 1; + + /* We want the result in bytes */ + *guest_width = domctl.u.address_size.size / 8; + return 0; +} int xc_domain_getinfo(xc_interface *xch, uint32_t first_domid, diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 36b9812..1f6dbc6 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -193,21 +193,14 @@ static int get_pt_level(xc_interface *xch, uint32_t domid, unsigned int *pt_level, unsigned int *gwidth) { - DECLARE_DOMCTL; xen_capabilities_info_t xen_caps = ""; if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) return -1; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) + if (xc_domain_get_guest_width(xch, domid, gwidth) != 0) return -1; - *gwidth = domctl.u.address_size.size / 8; - if (strstr(xen_caps, "xen-3.0-x86_64")) /* Depends on whether it's a compat 32-on-64 guest */ *pt_level = ( (*gwidth == 8) ? 4 : 3 ); diff --git a/tools/libxc/xc_pagetab.c b/tools/libxc/xc_pagetab.c index 27c4e9f..8525967 100644 --- a/tools/libxc/xc_pagetab.c +++ b/tools/libxc/xc_pagetab.c @@ -51,15 +51,13 @@ unsigned long xc_translate_foreign_address(xc_interface *xch, uint32_t dom, pt_levels = (ctx.msr_efer&EFER_LMA) ? 4 : (ctx.cr4&CR4_PAE) ? 3 : 2; paddr = ctx.cr3 & ((pt_levels == 3) ? ~0x1full : ~0xfffull); } else { - DECLARE_DOMCTL; + unsigned int gwidth; vcpu_guest_context_any_t ctx; if (xc_vcpu_getcontext(xch, dom, vcpu, &ctx) != 0) return 0; - domctl.domain = dom; - domctl.cmd = XEN_DOMCTL_get_address_size; - if ( do_domctl(xch, &domctl) != 0 ) + if (xc_domain_get_guest_width(xch, dom, &gwidth) != 0) return 0; - if (domctl.u.address_size.size == 64) { + if (gwidth == 8) { pt_levels = 4; paddr = (uint64_t)xen_cr3_to_pfn_x86_64(ctx.x64.ctrlreg[3]) << PAGE_SHIFT; diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index 1c43ec6..cb61650 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -24,19 +24,6 @@ #include #include -static int pv_guest_width(xc_interface *xch, uint32_t domid) -{ - DECLARE_DOMCTL; - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - if ( xc_domctl(xch, &domctl) != 0 ) - { - PERROR("Could not get guest address size"); - return -1; - } - return domctl.u.address_size.size / 8; -} - static int modify_returncode(xc_interface *xch, uint32_t domid) { vcpu_guest_context_any_t ctxt; @@ -71,8 +58,7 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) else { /* Probe PV guest address width. */ - dinfo->guest_width = pv_guest_width(xch, domid); - if ( dinfo->guest_width < 0 ) + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) ) return -1; } @@ -120,7 +106,8 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) xc_dominfo_t info; int i, rc = -1; #if defined(__i386__) || defined(__x86_64__) - struct domain_info_context _dinfo = { .p2m_size = 0 }; + struct domain_info_context _dinfo = { .guest_width = 0, + .p2m_size = 0 }; struct domain_info_context *dinfo = &_dinfo; unsigned long mfn; vcpu_guest_context_any_t ctxt; @@ -147,7 +134,7 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) return rc; } - dinfo->guest_width = pv_guest_width(xch, domid); + xc_domain_get_guest_width(xch, domid, &dinfo->guest_width); if ( dinfo->guest_width != sizeof(long) ) { ERROR("Cannot resume uncooperative cross-address-size guests"); diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index f2cebaf..58d51f3 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -560,6 +560,19 @@ int xc_vcpu_getaffinity(xc_interface *xch, int vcpu, xc_cpumap_t cpumap); + +/** + * This function will return the guest_width (in bytes) for the + * specified domain. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the domain id one wants the address size width of. + * @param addr_size the address size. + */ +int xc_domain_get_guest_width(xc_interface *xch, uint32_t domid, + unsigned int *guest_width); + + /** * This function will return information about one or more domains. It is * designed to iterate over the list of domains. If a single domain is diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index 6512003..f859621 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -301,7 +301,6 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, { xen_capabilities_info_t xen_caps = ""; xen_platform_parameters_t xen_params; - DECLARE_DOMCTL; if (xc_version(xch, XENVER_platform_parameters, &xen_params) != 0) return 0; @@ -313,15 +312,9 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, *hvirt_start = xen_params.virt_start; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = dom; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) + if ( xc_domain_get_guest_width(xch, dom, guest_width) != 0) return 0; - *guest_width = domctl.u.address_size.size / 8; - /* 64-bit tools will see the 64-bit hvirt_start, but 32-bit guests * will be using the compat one. */ if ( *guest_width < sizeof (unsigned long) ) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 060e480..1214185 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -771,12 +771,9 @@ static void dump_ctx(int vcpu) } ctxt_word_size = (strstr(xen_caps, "xen-3.0-x86_64")) ? 8 : 4; } else { - struct xen_domctl domctl; - memset(&domctl, 0, sizeof domctl); - domctl.domain = xenctx.domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - if (xc_domctl(xenctx.xc_handle, &domctl) == 0) - ctxt_word_size = guest_word_size = domctl.u.address_size.size / 8; + unsigned int gw; + if ( !xc_domain_get_guest_width(xenctx.xc_handle, xenctx.domid, &gw) ) + ctxt_word_size = guest_word_size = gw; } } #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpn-0003Nq-36; Mon, 16 Sep 2013 20:55:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpm-0003Ne-67 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:50 +0000 Received: from [85.158.143.35:24742] by server-2.bemta-4.messagelabs.com id 0E/45-26052-55077325; Mon, 16 Sep 2013 20:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379364947!4566622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29120 invoked from network); 16 Sep 2013 20:55:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:55:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpj-0003SS-6U for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpj-0006CV-4A for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:47 +0000 Date: Mon, 16 Sep 2013 20:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_domain_get_guest_width() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0dd5b654107103765994243017a7f0eb15fda341 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:40 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:06:28 2013 +0100 libxc: introduce xc_domain_get_guest_width() As a wrapper to XEN_DOMCTL_get_address_size, and use it wherever the call was being issued directly via do_domctl(), saving quite some line of code. Actually, the function returns the guest width in bytes, rather than directly what XEN_DOMCTL_get_address_size provides (which is a number of bits), since that is what it is useful almost everywhere. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_core.c | 20 +------------------- tools/libxc/xc_cpuid_x86.c | 8 +++----- tools/libxc/xc_dom_x86.c | 13 +++---------- tools/libxc/xc_domain.c | 16 ++++++++++++++++ tools/libxc/xc_offline_page.c | 9 +-------- tools/libxc/xc_pagetab.c | 8 +++----- tools/libxc/xc_resume.c | 21 ++++----------------- tools/libxc/xenctrl.h | 13 +++++++++++++ tools/libxc/xg_save_restore.h | 9 +-------- tools/xentrace/xenctx.c | 9 +++------ 10 files changed, 48 insertions(+), 78 deletions(-) diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 4207eed..4bc1abb 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -417,24 +417,6 @@ elfnote_dump_format_version(xc_interface *xch, return dump_rtn(xch, args, (char*)&format_version, sizeof(format_version)); } -static int -get_guest_width(xc_interface *xch, - uint32_t domid, - unsigned int *guest_width) -{ - DECLARE_DOMCTL; - - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) - return 1; - - *guest_width = domctl.u.address_size.size / 8; - return 0; -} - int xc_domain_dumpcore_via_callback(xc_interface *xch, uint32_t domid, @@ -478,7 +460,7 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, struct xc_core_section_headers *sheaders = NULL; Elf64_Shdr *shdr; - if ( get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) { PERROR("Could not get address size for domain"); return sts; diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index fa47787..bbbf9b8 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -436,17 +436,15 @@ static void xc_cpuid_pv_policy( const unsigned int *input, unsigned int *regs) { DECLARE_DOMCTL; + unsigned int guest_width; int guest_64bit, xen_64bit = hypervisor_is_64bit(xch); char brand[13]; uint64_t xfeature_mask; xc_cpuid_brand_get(brand); - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - do_domctl(xch, &domctl); - guest_64bit = (domctl.u.address_size.size == 64); + xc_domain_get_guest_width(xch, domid, &guest_width); + guest_64bit = (guest_width == 8); /* Detecting Xen's atitude towards XSAVE */ memset(&domctl, 0, sizeof(domctl)); diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 41f59d3..7cc2ff2 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -54,24 +54,17 @@ const char *xc_domain_get_native_protocol(xc_interface *xch, int ret; uint32_t guest_width; const char *protocol; - DECLARE_DOMCTL; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - ret = do_domctl(xch, &domctl); + ret = xc_domain_get_guest_width(xch, domid, &guest_width); if ( ret ) return NULL; - guest_width = domctl.u.address_size.size; - switch (guest_width) { - case 32: /* 32 bit guest */ + case 4: /* 32 bit guest */ protocol = XEN_IO_PROTO_ABI_X86_32; break; - case 64: /* 64 bit guest */ + case 8: /* 64 bit guest */ protocol = XEN_IO_PROTO_ABI_X86_64; break; default: diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3257e2a..c0ce079 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -270,6 +270,22 @@ out: return ret; } +int xc_domain_get_guest_width(xc_interface *xch, uint32_t domid, + unsigned int *guest_width) +{ + DECLARE_DOMCTL; + + memset(&domctl, 0, sizeof(domctl)); + domctl.domain = domid; + domctl.cmd = XEN_DOMCTL_get_address_size; + + if ( do_domctl(xch, &domctl) != 0 ) + return 1; + + /* We want the result in bytes */ + *guest_width = domctl.u.address_size.size / 8; + return 0; +} int xc_domain_getinfo(xc_interface *xch, uint32_t first_domid, diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 36b9812..1f6dbc6 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -193,21 +193,14 @@ static int get_pt_level(xc_interface *xch, uint32_t domid, unsigned int *pt_level, unsigned int *gwidth) { - DECLARE_DOMCTL; xen_capabilities_info_t xen_caps = ""; if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) return -1; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) + if (xc_domain_get_guest_width(xch, domid, gwidth) != 0) return -1; - *gwidth = domctl.u.address_size.size / 8; - if (strstr(xen_caps, "xen-3.0-x86_64")) /* Depends on whether it's a compat 32-on-64 guest */ *pt_level = ( (*gwidth == 8) ? 4 : 3 ); diff --git a/tools/libxc/xc_pagetab.c b/tools/libxc/xc_pagetab.c index 27c4e9f..8525967 100644 --- a/tools/libxc/xc_pagetab.c +++ b/tools/libxc/xc_pagetab.c @@ -51,15 +51,13 @@ unsigned long xc_translate_foreign_address(xc_interface *xch, uint32_t dom, pt_levels = (ctx.msr_efer&EFER_LMA) ? 4 : (ctx.cr4&CR4_PAE) ? 3 : 2; paddr = ctx.cr3 & ((pt_levels == 3) ? ~0x1full : ~0xfffull); } else { - DECLARE_DOMCTL; + unsigned int gwidth; vcpu_guest_context_any_t ctx; if (xc_vcpu_getcontext(xch, dom, vcpu, &ctx) != 0) return 0; - domctl.domain = dom; - domctl.cmd = XEN_DOMCTL_get_address_size; - if ( do_domctl(xch, &domctl) != 0 ) + if (xc_domain_get_guest_width(xch, dom, &gwidth) != 0) return 0; - if (domctl.u.address_size.size == 64) { + if (gwidth == 8) { pt_levels = 4; paddr = (uint64_t)xen_cr3_to_pfn_x86_64(ctx.x64.ctrlreg[3]) << PAGE_SHIFT; diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index 1c43ec6..cb61650 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -24,19 +24,6 @@ #include #include -static int pv_guest_width(xc_interface *xch, uint32_t domid) -{ - DECLARE_DOMCTL; - domctl.domain = domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - if ( xc_domctl(xch, &domctl) != 0 ) - { - PERROR("Could not get guest address size"); - return -1; - } - return domctl.u.address_size.size / 8; -} - static int modify_returncode(xc_interface *xch, uint32_t domid) { vcpu_guest_context_any_t ctxt; @@ -71,8 +58,7 @@ static int modify_returncode(xc_interface *xch, uint32_t domid) else { /* Probe PV guest address width. */ - dinfo->guest_width = pv_guest_width(xch, domid); - if ( dinfo->guest_width < 0 ) + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) ) return -1; } @@ -120,7 +106,8 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) xc_dominfo_t info; int i, rc = -1; #if defined(__i386__) || defined(__x86_64__) - struct domain_info_context _dinfo = { .p2m_size = 0 }; + struct domain_info_context _dinfo = { .guest_width = 0, + .p2m_size = 0 }; struct domain_info_context *dinfo = &_dinfo; unsigned long mfn; vcpu_guest_context_any_t ctxt; @@ -147,7 +134,7 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) return rc; } - dinfo->guest_width = pv_guest_width(xch, domid); + xc_domain_get_guest_width(xch, domid, &dinfo->guest_width); if ( dinfo->guest_width != sizeof(long) ) { ERROR("Cannot resume uncooperative cross-address-size guests"); diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index f2cebaf..58d51f3 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -560,6 +560,19 @@ int xc_vcpu_getaffinity(xc_interface *xch, int vcpu, xc_cpumap_t cpumap); + +/** + * This function will return the guest_width (in bytes) for the + * specified domain. + * + * @param xch a handle to an open hypervisor interface. + * @param domid the domain id one wants the address size width of. + * @param addr_size the address size. + */ +int xc_domain_get_guest_width(xc_interface *xch, uint32_t domid, + unsigned int *guest_width); + + /** * This function will return information about one or more domains. It is * designed to iterate over the list of domains. If a single domain is diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index 6512003..f859621 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -301,7 +301,6 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, { xen_capabilities_info_t xen_caps = ""; xen_platform_parameters_t xen_params; - DECLARE_DOMCTL; if (xc_version(xch, XENVER_platform_parameters, &xen_params) != 0) return 0; @@ -313,15 +312,9 @@ static inline int get_platform_info(xc_interface *xch, uint32_t dom, *hvirt_start = xen_params.virt_start; - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = dom; - domctl.cmd = XEN_DOMCTL_get_address_size; - - if ( do_domctl(xch, &domctl) != 0 ) + if ( xc_domain_get_guest_width(xch, dom, guest_width) != 0) return 0; - *guest_width = domctl.u.address_size.size / 8; - /* 64-bit tools will see the 64-bit hvirt_start, but 32-bit guests * will be using the compat one. */ if ( *guest_width < sizeof (unsigned long) ) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 060e480..1214185 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -771,12 +771,9 @@ static void dump_ctx(int vcpu) } ctxt_word_size = (strstr(xen_caps, "xen-3.0-x86_64")) ? 8 : 4; } else { - struct xen_domctl domctl; - memset(&domctl, 0, sizeof domctl); - domctl.domain = xenctx.domid; - domctl.cmd = XEN_DOMCTL_get_address_size; - if (xc_domctl(xenctx.xc_handle, &domctl) == 0) - ctxt_word_size = guest_word_size = domctl.u.address_size.size / 8; + unsigned int gw; + if ( !xc_domain_get_guest_width(xenctx.xc_handle, xenctx.domid, &gw) ) + ctxt_word_size = guest_word_size = gw; } } #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfpx-0003PV-6e; Mon, 16 Sep 2013 20:56:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpv-0003P5-U7 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:00 +0000 Received: from [85.158.139.211:35968] by server-1.bemta-5.messagelabs.com id 0D/01-26518-F5077325; Mon, 16 Sep 2013 20:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379364957!2765246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17728 invoked from network); 16 Sep 2013 20:55:58 -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; 16 Sep 2013 20:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpt-0003Sb-FC for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpt-0006Cr-B0 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:57 +0000 Date: Mon, 16 Sep 2013 20:55:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_vcpu_setcontext() instead of calling do_domctl() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6164856fa7300bf914fc4a53f012ff3941fe19b7 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:48 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:09:59 2013 +0100 libxc: use xc_vcpu_setcontext() instead of calling do_domctl() The wrapper is there already, so better use it in place of all the stuff required to issue a call to do_domctl() for XEN_DOMCTL_setvcpucontext. Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_boot.c | 14 ++++---------- tools/libxc/xc_domain_restore.c | 6 +----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index d4d57b4..cf509fa 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -62,19 +62,13 @@ static int setup_hypercall_page(struct xc_dom_image *dom) return rc; } -static int launch_vm(xc_interface *xch, domid_t domid, xc_hypercall_buffer_t *ctxt) +static int launch_vm(xc_interface *xch, domid_t domid, + vcpu_guest_context_any_t *ctxt) { - DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER_ARGUMENT(ctxt); int rc; xc_dom_printf(xch, "%s: called, ctxt=%p", __FUNCTION__, ctxt); - memset(&domctl, 0, sizeof(domctl)); - domctl.cmd = XEN_DOMCTL_setvcpucontext; - domctl.domain = domid; - domctl.u.vcpucontext.vcpu = 0; - set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt); - rc = do_domctl(xch, &domctl); + rc = xc_vcpu_setcontext(xch, domid, 0, ctxt); if ( rc != 0 ) xc_dom_panic(xch, XC_INTERNAL_ERROR, "%s: SETVCPUCONTEXT failed (rc=%d)", __FUNCTION__, rc); @@ -270,7 +264,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); - rc = launch_vm(dom->xch, dom->guest_domid, HYPERCALL_BUFFER(ctxt)); + rc = launch_vm(dom->xch, dom->guest_domid, ctxt); xc_hypercall_buffer_free(dom->xch, ctxt); return rc; diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 63d36cd..41a63cb 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -2113,11 +2113,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } ctxt->x64.ctrlreg[1] = FOLD_CR3(ctx->p2m[pfn]); } - domctl.cmd = XEN_DOMCTL_setvcpucontext; - domctl.domain = (domid_t)dom; - domctl.u.vcpucontext.vcpu = i; - set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt); - frc = xc_domctl(xch, &domctl); + frc = xc_vcpu_setcontext(xch, dom, i, ctxt); if ( frc != 0 ) { PERROR("Couldn't build vcpu%d", i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfpx-0003PV-6e; Mon, 16 Sep 2013 20:56:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpv-0003P5-U7 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:00 +0000 Received: from [85.158.139.211:35968] by server-1.bemta-5.messagelabs.com id 0D/01-26518-F5077325; Mon, 16 Sep 2013 20:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379364957!2765246!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17728 invoked from network); 16 Sep 2013 20:55:58 -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; 16 Sep 2013 20:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfpt-0003Sb-FC for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfpt-0006Cr-B0 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:55:57 +0000 Date: Mon, 16 Sep 2013 20:55:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_vcpu_setcontext() instead of calling do_domctl() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6164856fa7300bf914fc4a53f012ff3941fe19b7 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:48 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:09:59 2013 +0100 libxc: use xc_vcpu_setcontext() instead of calling do_domctl() The wrapper is there already, so better use it in place of all the stuff required to issue a call to do_domctl() for XEN_DOMCTL_setvcpucontext. Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_boot.c | 14 ++++---------- tools/libxc/xc_domain_restore.c | 6 +----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index d4d57b4..cf509fa 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -62,19 +62,13 @@ static int setup_hypercall_page(struct xc_dom_image *dom) return rc; } -static int launch_vm(xc_interface *xch, domid_t domid, xc_hypercall_buffer_t *ctxt) +static int launch_vm(xc_interface *xch, domid_t domid, + vcpu_guest_context_any_t *ctxt) { - DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER_ARGUMENT(ctxt); int rc; xc_dom_printf(xch, "%s: called, ctxt=%p", __FUNCTION__, ctxt); - memset(&domctl, 0, sizeof(domctl)); - domctl.cmd = XEN_DOMCTL_setvcpucontext; - domctl.domain = domid; - domctl.u.vcpucontext.vcpu = 0; - set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt); - rc = do_domctl(xch, &domctl); + rc = xc_vcpu_setcontext(xch, domid, 0, ctxt); if ( rc != 0 ) xc_dom_panic(xch, XC_INTERNAL_ERROR, "%s: SETVCPUCONTEXT failed (rc=%d)", __FUNCTION__, rc); @@ -270,7 +264,7 @@ int xc_dom_boot_image(struct xc_dom_image *dom) if ( (rc = dom->arch_hooks->vcpu(dom, ctxt)) != 0 ) return rc; xc_dom_unmap_all(dom); - rc = launch_vm(dom->xch, dom->guest_domid, HYPERCALL_BUFFER(ctxt)); + rc = launch_vm(dom->xch, dom->guest_domid, ctxt); xc_hypercall_buffer_free(dom->xch, ctxt); return rc; diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 63d36cd..41a63cb 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -2113,11 +2113,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, } ctxt->x64.ctrlreg[1] = FOLD_CR3(ctx->p2m[pfn]); } - domctl.cmd = XEN_DOMCTL_setvcpucontext; - domctl.domain = (domid_t)dom; - domctl.u.vcpucontext.vcpu = i; - set_xen_guest_handle(domctl.u.vcpucontext.ctxt, ctxt); - frc = xc_domctl(xch, &domctl); + frc = xc_vcpu_setcontext(xch, dom, i, ctxt); if ( frc != 0 ) { PERROR("Couldn't build vcpu%d", i); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq8-0003Rc-BB; Mon, 16 Sep 2013 20:56:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq6-0003RH-N3 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:10 +0000 Received: from [85.158.137.68:56630] by server-15.bemta-3.messagelabs.com id AE/BE-21409-96077325; Mon, 16 Sep 2013 20:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379364967!2829433!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1366 invoked from network); 16 Sep 2013 20:56:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq3-0003T7-Ko for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfq3-0006DN-Jd for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:07 +0000 Date: Mon, 16 Sep 2013 20:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_vcpu_getinfo() instead of calling do_domctl() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e2fa6ef6071d0369905e019b0273f3537cf5b9f Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:57 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:02 2013 +0100 libxc: use xc_vcpu_getinfo() instead of calling do_domctl() The wrapper is there already, so better use it in place of all the stuff required to issue a call to do_domctl() for XEN_DOMCTL_getdomaininfo. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_dom_boot.c | 17 ++++++++--------- tools/libxc/xc_domain_restore.c | 7 +++---- tools/libxc/xc_private.c | 8 +++----- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index cf509fa..71e1897 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -197,8 +197,8 @@ void *xc_dom_boot_domU_map(struct xc_dom_image *dom, xen_pfn_t pfn, int xc_dom_boot_image(struct xc_dom_image *dom) { - DECLARE_DOMCTL; DECLARE_HYPERCALL_BUFFER(vcpu_guest_context_any_t, ctxt); + xc_dominfo_t info; int rc; ctxt = xc_hypercall_buffer_alloc(dom->xch, ctxt, sizeof(*ctxt)); @@ -212,23 +212,22 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* collect some info */ - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = dom->guest_domid; - rc = do_domctl(dom->xch, &domctl); - if ( rc != 0 ) + rc = xc_domain_getinfo(dom->xch, dom->guest_domid, 1, &info); + if ( rc < 0 ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, "%s: getdomaininfo failed (rc=%d)", __FUNCTION__, rc); return rc; } - if ( domctl.domain != dom->guest_domid ) + if ( rc == 0 || info.domid != dom->guest_domid ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: Huh? domid mismatch (%d != %d)", __FUNCTION__, - domctl.domain, dom->guest_domid); + "%s: Huh? No domains found (nr_domains=%d) " + "or domid mismatch (%d != %d)", __FUNCTION__, + rc, info.domid, dom->guest_domid); return -1; } - dom->shared_info_mfn = domctl.u.getdomaininfo.shared_info_frame; + dom->shared_info_mfn = info.shared_info_frame; /* sanity checks */ if ( !xc_dom_compat_check(dom) ) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 41a63cb..b418963 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1406,6 +1406,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, struct restore_callbacks *callbacks) { DECLARE_DOMCTL; + xc_dominfo_t info; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; int vcpuextstate = 0; uint32_t vcpuextstate_size = 0; @@ -1562,14 +1563,12 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, ROUNDUP(MAX_BATCH_SIZE * sizeof(xen_pfn_t), PAGE_SHIFT)); /* Get the domain's shared-info frame. */ - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = (domid_t)dom; - if ( xc_domctl(xch, &domctl) < 0 ) + if ( xc_domain_getinfo(xch, (domid_t)dom, 1, &info) != 1 ) { PERROR("Could not get information on new domain"); goto out; } - shared_info_frame = domctl.u.getdomaininfo.shared_info_frame; + shared_info_frame = info.shared_info_frame; /* Mark all PFNs as invalid; we allocate on demand */ for ( pfn = 0; pfn < dinfo->p2m_size; pfn++ ) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index acaf9e0..a260257 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -609,11 +609,9 @@ int xc_get_pfn_list(xc_interface *xch, long xc_get_tot_pages(xc_interface *xch, uint32_t domid) { - DECLARE_DOMCTL; - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = (domid_t)domid; - return (do_domctl(xch, &domctl) < 0) ? - -1 : domctl.u.getdomaininfo.tot_pages; + xc_dominfo_t info; + return (xc_domain_getinfo(xch, domid, 1, &info) != 1) ? + -1 : info.nr_pages; } int xc_copy_to_domain_page(xc_interface *xch, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq8-0003Rc-BB; Mon, 16 Sep 2013 20:56:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq6-0003RH-N3 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:10 +0000 Received: from [85.158.137.68:56630] by server-15.bemta-3.messagelabs.com id AE/BE-21409-96077325; Mon, 16 Sep 2013 20:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379364967!2829433!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1366 invoked from network); 16 Sep 2013 20:56:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfq3-0003T7-Ko for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfq3-0006DN-Jd for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:07 +0000 Date: Mon, 16 Sep 2013 20:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use xc_vcpu_getinfo() instead of calling do_domctl() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e2fa6ef6071d0369905e019b0273f3537cf5b9f Author: Dario Faggioli AuthorDate: Tue Sep 10 19:53:57 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:02 2013 +0100 libxc: use xc_vcpu_getinfo() instead of calling do_domctl() The wrapper is there already, so better use it in place of all the stuff required to issue a call to do_domctl() for XEN_DOMCTL_getdomaininfo. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_dom_boot.c | 17 ++++++++--------- tools/libxc/xc_domain_restore.c | 7 +++---- tools/libxc/xc_private.c | 8 +++----- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index cf509fa..71e1897 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -197,8 +197,8 @@ void *xc_dom_boot_domU_map(struct xc_dom_image *dom, xen_pfn_t pfn, int xc_dom_boot_image(struct xc_dom_image *dom) { - DECLARE_DOMCTL; DECLARE_HYPERCALL_BUFFER(vcpu_guest_context_any_t, ctxt); + xc_dominfo_t info; int rc; ctxt = xc_hypercall_buffer_alloc(dom->xch, ctxt, sizeof(*ctxt)); @@ -212,23 +212,22 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; /* collect some info */ - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = dom->guest_domid; - rc = do_domctl(dom->xch, &domctl); - if ( rc != 0 ) + rc = xc_domain_getinfo(dom->xch, dom->guest_domid, 1, &info); + if ( rc < 0 ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, "%s: getdomaininfo failed (rc=%d)", __FUNCTION__, rc); return rc; } - if ( domctl.domain != dom->guest_domid ) + if ( rc == 0 || info.domid != dom->guest_domid ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: Huh? domid mismatch (%d != %d)", __FUNCTION__, - domctl.domain, dom->guest_domid); + "%s: Huh? No domains found (nr_domains=%d) " + "or domid mismatch (%d != %d)", __FUNCTION__, + rc, info.domid, dom->guest_domid); return -1; } - dom->shared_info_mfn = domctl.u.getdomaininfo.shared_info_frame; + dom->shared_info_mfn = info.shared_info_frame; /* sanity checks */ if ( !xc_dom_compat_check(dom) ) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 41a63cb..b418963 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1406,6 +1406,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, struct restore_callbacks *callbacks) { DECLARE_DOMCTL; + xc_dominfo_t info; int rc = 1, frc, i, j, n, m, pae_extended_cr3 = 0, ext_vcpucontext = 0; int vcpuextstate = 0; uint32_t vcpuextstate_size = 0; @@ -1562,14 +1563,12 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, ROUNDUP(MAX_BATCH_SIZE * sizeof(xen_pfn_t), PAGE_SHIFT)); /* Get the domain's shared-info frame. */ - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = (domid_t)dom; - if ( xc_domctl(xch, &domctl) < 0 ) + if ( xc_domain_getinfo(xch, (domid_t)dom, 1, &info) != 1 ) { PERROR("Could not get information on new domain"); goto out; } - shared_info_frame = domctl.u.getdomaininfo.shared_info_frame; + shared_info_frame = info.shared_info_frame; /* Mark all PFNs as invalid; we allocate on demand */ for ( pfn = 0; pfn < dinfo->p2m_size; pfn++ ) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index acaf9e0..a260257 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -609,11 +609,9 @@ int xc_get_pfn_list(xc_interface *xch, long xc_get_tot_pages(xc_interface *xch, uint32_t domid) { - DECLARE_DOMCTL; - domctl.cmd = XEN_DOMCTL_getdomaininfo; - domctl.domain = (domid_t)domid; - return (do_domctl(xch, &domctl) < 0) ? - -1 : domctl.u.getdomaininfo.tot_pages; + xc_dominfo_t info; + return (xc_domain_getinfo(xch, domid, 1, &info) != 1) ? + -1 : info.nr_pages; } int xc_copy_to_domain_page(xc_interface *xch, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqH-0003T5-Dx; Mon, 16 Sep 2013 20:56:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqG-0003Sq-6Q for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:20 +0000 Received: from [85.158.139.211:36648] by server-7.bemta-5.messagelabs.com id C5/FC-24315-37077325; Mon, 16 Sep 2013 20:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379364977!2767001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8948 invoked from network); 16 Sep 2013 20:56:18 -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; 16 Sep 2013 20:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqD-0003TG-Pt for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqD-0006Dm-OG for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:17 +0000 Date: Mon, 16 Sep 2013 20:56:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow for ctxt to be NULL in xc_vcpu_setcontext X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfdfcdc6f7c51ef7e5d0547120d0ac943ef43c67 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:05 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:05 2013 +0100 libxc: allow for ctxt to be NULL in xc_vcpu_setcontext Since, as can be seen in xen/common/domctl.c, that is legitimate (it results in Xen calling vcpu_reset() on the vcpu). Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c0ce079..3210e34 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1141,12 +1141,6 @@ int xc_vcpu_setcontext(xc_interface *xch, DECLARE_HYPERCALL_BOUNCE(ctxt, sizeof(vcpu_guest_context_any_t), XC_HYPERCALL_BUFFER_BOUNCE_IN); int rc; - if (ctxt == NULL) - { - errno = EINVAL; - return -1; - } - if ( xc_hypercall_bounce_pre(xch, ctxt) ) 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 Mon Sep 16 20:56:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqH-0003T5-Dx; Mon, 16 Sep 2013 20:56:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqG-0003Sq-6Q for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:20 +0000 Received: from [85.158.139.211:36648] by server-7.bemta-5.messagelabs.com id C5/FC-24315-37077325; Mon, 16 Sep 2013 20:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379364977!2767001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8948 invoked from network); 16 Sep 2013 20:56:18 -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; 16 Sep 2013 20:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqD-0003TG-Pt for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqD-0006Dm-OG for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:17 +0000 Date: Mon, 16 Sep 2013 20:56:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow for ctxt to be NULL in xc_vcpu_setcontext X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfdfcdc6f7c51ef7e5d0547120d0ac943ef43c67 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:05 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:05 2013 +0100 libxc: allow for ctxt to be NULL in xc_vcpu_setcontext Since, as can be seen in xen/common/domctl.c, that is legitimate (it results in Xen calling vcpu_reset() on the vcpu). Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c0ce079..3210e34 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1141,12 +1141,6 @@ int xc_vcpu_setcontext(xc_interface *xch, DECLARE_HYPERCALL_BOUNCE(ctxt, sizeof(vcpu_guest_context_any_t), XC_HYPERCALL_BUFFER_BOUNCE_IN); int rc; - if (ctxt == NULL) - { - errno = EINVAL; - return -1; - } - if ( xc_hypercall_bounce_pre(xch, ctxt) ) 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 Mon Sep 16 20:56:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqS-0003VW-HB; Mon, 16 Sep 2013 20:56:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqR-0003VA-6T for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:31 +0000 Received: from [193.109.254.147:58037] by server-15.bemta-14.messagelabs.com id 70/89-10716-E7077325; Mon, 16 Sep 2013 20:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1379364988!2455378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31734 invoked from network); 16 Sep 2013 20:56:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqN-0003TO-Vj for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqN-0006E8-Tu for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:27 +0000 Date: Mon, 16 Sep 2013 20:56:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_map_domain_meminfo (and xc_unmap_domain_meminfo) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 266abb240738bb37ccb28623806273c58523f422 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:12 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:07 2013 +0100 libxc: introduce xc_map_domain_meminfo (and xc_unmap_domain_meminfo) And use it in xc_exchange_page(). This is basically because the following change need something really similar to the set of steps that are here abstracted in these two functions. Despite of the change in the interface and in the signature of some functions, this is pure code motion. No functional changes involved. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 127 ++++++++++++++++++++++++++++ tools/libxc/xc_offline_page.c | 185 +++++++---------------------------------- tools/libxc/xenguest.h | 17 ++++ tools/libxc/xg_private.h | 9 ++ 4 files changed, 183 insertions(+), 155 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3210e34..81316d3 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -21,6 +21,8 @@ */ #include "xc_private.h" +#include "xc_core.h" +#include "xg_private.h" #include "xg_save_restore.h" #include #include @@ -1477,6 +1479,131 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +int xc_unmap_domain_meminfo(xc_interface *xch, struct xc_domain_meminfo *minfo) +{ + struct domain_info_context _di = { .guest_width = minfo->guest_width }; + struct domain_info_context *dinfo = &_di; + + free(minfo->pfn_type); + if ( minfo->p2m_table ) + munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); + minfo->p2m_table = NULL; + + return 0; +} + +int xc_map_domain_meminfo(xc_interface *xch, int domid, + struct xc_domain_meminfo *minfo) +{ + struct domain_info_context _di; + struct domain_info_context *dinfo = &_di; + + xc_dominfo_t info; + shared_info_any_t *live_shinfo; + xen_capabilities_info_t xen_caps = ""; + int i; + + /* Only be initialized once */ + if ( minfo->pfn_type || minfo->p2m_table ) + { + errno = EINVAL; + return -1; + } + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ) + { + PERROR("Could not get domain info"); + return -1; + } + + if ( xc_domain_get_guest_width(xch, domid, &minfo->guest_width) ) + { + PERROR("Could not get domain address size"); + return -1; + } + _di.guest_width = minfo->guest_width; + + /* Get page table levels (see get_platform_info() in xg_save_restore.h */ + if ( xc_version(xch, XENVER_capabilities, &xen_caps) ) + { + PERROR("Could not get Xen capabilities (for page table levels)"); + return -1; + } + if ( strstr(xen_caps, "xen-3.0-x86_64") ) + /* Depends on whether it's a compat 32-on-64 guest */ + minfo->pt_levels = ( (minfo->guest_width == 8) ? 4 : 3 ); + else if ( strstr(xen_caps, "xen-3.0-x86_32p") ) + minfo->pt_levels = 3; + else if ( strstr(xen_caps, "xen-3.0-x86_32") ) + minfo->pt_levels = 2; + else + { + errno = EFAULT; + return -1; + } + + /* We need the shared info page for mapping the P2M */ + live_shinfo = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + info.shared_info_frame); + if ( !live_shinfo ) + { + PERROR("Could not map the shared info frame (MFN 0x%lx)", + info.shared_info_frame); + return -1; + } + + if ( xc_core_arch_map_p2m_writable(xch, minfo->guest_width, &info, + live_shinfo, &minfo->p2m_table, + &minfo->p2m_size) ) + { + PERROR("Could not map the P2M table"); + munmap(live_shinfo, PAGE_SIZE); + return -1; + } + munmap(live_shinfo, PAGE_SIZE); + _di.p2m_size = minfo->p2m_size; + + /* Make space and prepare for getting the PFN types */ + minfo->pfn_type = calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); + if ( !minfo->pfn_type ) + { + PERROR("Could not allocate memory for the PFN types"); + goto failed; + } + for ( i = 0; i < minfo->p2m_size; i++ ) + minfo->pfn_type[i] = pfn_to_mfn(i, minfo->p2m_table, + minfo->guest_width); + + /* Retrieve PFN types in batches */ + for ( i = 0; i < minfo->p2m_size ; i+=1024 ) + { + int count = ((minfo->p2m_size - i ) > 1024 ) ? + 1024: (minfo->p2m_size - i); + + if ( xc_get_pfn_type_batch(xch, domid, count, minfo->pfn_type + i) ) + { + PERROR("Could not get %d-eth batch of PFN types", (i+1)/1024); + goto failed; + } + } + + return 0; + +failed: + if ( minfo->pfn_type ) + { + free(minfo->pfn_type); + minfo->pfn_type = NULL; + } + if ( minfo->p2m_table ) + { + munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); + minfo->p2m_table = NULL; + } + + return -1; +} + int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 1f6dbc6..fbb53f5 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -33,17 +33,6 @@ #include "xg_private.h" #include "xg_save_restore.h" -struct domain_mem_info{ - int domid; - unsigned int pt_level; - unsigned int guest_width; - xen_pfn_t *pfn_type; - xen_pfn_t *p2m_table; - unsigned long p2m_size; - xen_pfn_t *m2p_table; - int max_mfn; -}; - struct pte_backup_entry { xen_pfn_t table_mfn; @@ -180,139 +169,6 @@ static int xc_is_page_granted_v2(xc_interface *xch, xen_pfn_t gpfn, return (i != gnt_num); } -static xen_pfn_t pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int gwidth) -{ - return ((xen_pfn_t) ((gwidth==8)? - (((uint64_t *)p2m)[(pfn)]): - ((((uint32_t *)p2m)[(pfn)]) == 0xffffffffU ? - (-1UL) : - (((uint32_t *)p2m)[(pfn)])))); -} - -static int get_pt_level(xc_interface *xch, uint32_t domid, - unsigned int *pt_level, - unsigned int *gwidth) -{ - xen_capabilities_info_t xen_caps = ""; - - if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) - return -1; - - if (xc_domain_get_guest_width(xch, domid, gwidth) != 0) - return -1; - - if (strstr(xen_caps, "xen-3.0-x86_64")) - /* Depends on whether it's a compat 32-on-64 guest */ - *pt_level = ( (*gwidth == 8) ? 4 : 3 ); - else if (strstr(xen_caps, "xen-3.0-x86_32p")) - *pt_level = 3; - else if (strstr(xen_caps, "xen-3.0-x86_32")) - *pt_level = 2; - else - return -1; - - return 0; -} - -static int close_mem_info(xc_interface *xch, struct domain_mem_info *minfo) -{ - if (minfo->pfn_type) - free(minfo->pfn_type); - munmap(minfo->m2p_table, M2P_SIZE(minfo->max_mfn)); - munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); - minfo->p2m_table = minfo->m2p_table = NULL; - - return 0; -} - -static int init_mem_info(xc_interface *xch, int domid, - struct domain_mem_info *minfo, - xc_dominfo_t *info) -{ - uint64_aligned_t shared_info_frame; - shared_info_any_t *live_shinfo = NULL; - int i, rc; - - /* Only be initialized once */ - if (minfo->pfn_type || minfo->m2p_table || minfo->p2m_table) - return -EINVAL; - - if ( get_pt_level(xch, domid, &minfo->pt_level, - &minfo->guest_width) ) - { - ERROR("Unable to get PT level info."); - return -EFAULT; - } - dinfo->guest_width = minfo->guest_width; - - shared_info_frame = info->shared_info_frame; - - live_shinfo = xc_map_foreign_range(xch, domid, - PAGE_SIZE, PROT_READ, shared_info_frame); - if ( !live_shinfo ) - { - ERROR("Couldn't map live_shinfo"); - return -EFAULT; - } - - if ( (rc = xc_core_arch_map_p2m_writable(xch, minfo->guest_width, - info, live_shinfo, &minfo->p2m_table, &minfo->p2m_size)) ) - { - ERROR("Couldn't map p2m table %x\n", rc); - goto failed; - } - munmap(live_shinfo, PAGE_SIZE); - live_shinfo = NULL; - - dinfo->p2m_size = minfo->p2m_size; - - minfo->max_mfn = xc_maximum_ram_page(xch); - if ( !(minfo->m2p_table = - xc_map_m2p(xch, minfo->max_mfn, PROT_READ, NULL)) ) - { - ERROR("Failed to map live M2P table"); - goto failed; - } - - /* Get pfn type */ - minfo->pfn_type = calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); - if (!minfo->pfn_type) - { - ERROR("Failed to malloc pfn_type\n"); - goto failed; - } - - for (i = 0; i < minfo->p2m_size; i++) - minfo->pfn_type[i] = pfn_to_mfn(i, minfo->p2m_table, - minfo->guest_width); - - for (i = 0; i < minfo->p2m_size ; i+=1024) - { - int count = ((dinfo->p2m_size - i ) > 1024 ) ? 1024: (dinfo->p2m_size - i); - if ( ( rc = xc_get_pfn_type_batch(xch, domid, count, - minfo->pfn_type + i)) ) - { - ERROR("Failed to get pfn_type %x\n", rc); - goto failed; - } - } - return 0; - -failed: - if (minfo->pfn_type) - { - free(minfo->pfn_type); - minfo->pfn_type = NULL; - } - if (live_shinfo) - munmap(live_shinfo, PAGE_SIZE); - munmap(minfo->m2p_table, M2P_SIZE(minfo->max_mfn)); - munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); - minfo->p2m_table = minfo->m2p_table = NULL; - - return -1; -} - static int backup_ptes(xen_pfn_t table_mfn, int offset, struct pte_backup *backup) { @@ -402,7 +258,7 @@ static int __update_pte(xc_interface *xch, } static int change_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, pte_func func, @@ -412,7 +268,7 @@ static int change_pte(xc_interface *xch, int domid, uint64_t i; void *content = NULL; - pte_num = PAGE_SIZE / ((minfo->pt_level == 2) ? 4 : 8); + pte_num = PAGE_SIZE / ((minfo->pt_levels == 2) ? 4 : 8); for (i = 0; i < minfo->p2m_size; i++) { @@ -435,7 +291,7 @@ static int change_pte(xc_interface *xch, int domid, for (j = 0; j < pte_num; j++) { - if ( minfo->pt_level == 2 ) + if ( minfo->pt_levels == 2 ) pte = ((const uint32_t*)content)[j]; else pte = ((const uint64_t*)content)[j]; @@ -447,7 +303,7 @@ static int change_pte(xc_interface *xch, int domid, case 1: if ( xc_add_mmu_update(xch, mmu, table_mfn << PAGE_SHIFT | - j * ( (minfo->pt_level == 2) ? + j * ( (minfo->pt_levels == 2) ? sizeof(uint32_t): sizeof(uint64_t)) | MMU_PT_UPDATE_PRESERVE_AD, new_pte) ) @@ -480,7 +336,7 @@ failed: } static int update_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, unsigned long new_mfn) @@ -490,7 +346,7 @@ static int update_pte(xc_interface *xch, int domid, } static int clear_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, xen_pfn_t mfn) @@ -538,7 +394,7 @@ static int is_page_exchangable(xc_interface *xch, int domid, xen_pfn_t mfn, int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) { xc_dominfo_t info; - struct domain_mem_info minfo; + struct xc_domain_meminfo minfo; struct xc_mmu *mmu = NULL; struct pte_backup old_ptes = {NULL, 0, 0}; grant_entry_v1_t *gnttab_v1 = NULL; @@ -549,6 +405,8 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) int rc, result = -1; uint32_t status; xen_pfn_t new_mfn, gpfn; + xen_pfn_t *m2p_table; + int max_mfn; if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ) { @@ -568,10 +426,26 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) return -EINVAL; } - /* Get domain's memory information */ + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + PERROR("Failed to map live M2P table"); + return -EFAULT; + } + gpfn = m2p_table[mfn]; + + /* Map domain's memory information */ memset(&minfo, 0, sizeof(minfo)); - init_mem_info(xch, domid, &minfo, &info); - gpfn = minfo.m2p_table[mfn]; + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + PERROR("Could not map domain's memory information\n"); + return -EFAULT; + } + + /* For translation macros */ + dinfo->guest_width = minfo.guest_width; + dinfo->p2m_size = minfo.p2m_size; /* Don't exchange CR3 for PAE guest in PAE host environment */ if (minfo.guest_width > sizeof(long)) @@ -766,7 +640,8 @@ failed: if (gnttab_v2) munmap(gnttab_v2, gnt_num / (PAGE_SIZE/sizeof(grant_entry_v2_t))); - close_mem_info(xch, &minfo); + xc_unmap_domain_meminfo(xch, &minfo); + munmap(m2p_table, M2P_SIZE(max_mfn)); return result; } diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 4714bd2..c12091f 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -276,6 +276,23 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn); /** + * Memory related information, such as PFN types, the P2M table, + * the guest word width and the guest page table levels. + */ +struct xc_domain_meminfo { + unsigned int pt_levels; + unsigned int guest_width; + xen_pfn_t *pfn_type; + xen_pfn_t *p2m_table; + unsigned long p2m_size; +}; + +int xc_map_domain_meminfo(xc_interface *xch, int domid, + struct xc_domain_meminfo *minfo); + +int xc_unmap_domain_meminfo(xc_interface *xch, struct xc_domain_meminfo *mem); + +/** * This function map m2p table * @parm xch a handle to an open hypervisor interface * @parm max_mfn the max pfn diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index db02ccf..5ff2124 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -136,6 +136,15 @@ struct domain_info_context { unsigned long p2m_size; }; +static inline xen_pfn_t pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int gwidth) +{ + return ((xen_pfn_t) ((gwidth==8)? + (((uint64_t *)p2m)[(pfn)]): + ((((uint32_t *)p2m)[(pfn)]) == 0xffffffffU ? + (-1UL) : + (((uint32_t *)p2m)[(pfn)])))); +} + /* Number of xen_pfn_t in a page */ #define FPP (PAGE_SIZE/(dinfo->guest_width)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqS-0003VW-HB; Mon, 16 Sep 2013 20:56:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqR-0003VA-6T for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:31 +0000 Received: from [193.109.254.147:58037] by server-15.bemta-14.messagelabs.com id 70/89-10716-E7077325; Mon, 16 Sep 2013 20:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1379364988!2455378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31734 invoked from network); 16 Sep 2013 20:56:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqN-0003TO-Vj for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqN-0006E8-Tu for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:27 +0000 Date: Mon, 16 Sep 2013 20:56:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_map_domain_meminfo (and xc_unmap_domain_meminfo) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 266abb240738bb37ccb28623806273c58523f422 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:12 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:07 2013 +0100 libxc: introduce xc_map_domain_meminfo (and xc_unmap_domain_meminfo) And use it in xc_exchange_page(). This is basically because the following change need something really similar to the set of steps that are here abstracted in these two functions. Despite of the change in the interface and in the signature of some functions, this is pure code motion. No functional changes involved. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 127 ++++++++++++++++++++++++++++ tools/libxc/xc_offline_page.c | 185 +++++++---------------------------------- tools/libxc/xenguest.h | 17 ++++ tools/libxc/xg_private.h | 9 ++ 4 files changed, 183 insertions(+), 155 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3210e34..81316d3 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -21,6 +21,8 @@ */ #include "xc_private.h" +#include "xc_core.h" +#include "xg_private.h" #include "xg_save_restore.h" #include #include @@ -1477,6 +1479,131 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +int xc_unmap_domain_meminfo(xc_interface *xch, struct xc_domain_meminfo *minfo) +{ + struct domain_info_context _di = { .guest_width = minfo->guest_width }; + struct domain_info_context *dinfo = &_di; + + free(minfo->pfn_type); + if ( minfo->p2m_table ) + munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); + minfo->p2m_table = NULL; + + return 0; +} + +int xc_map_domain_meminfo(xc_interface *xch, int domid, + struct xc_domain_meminfo *minfo) +{ + struct domain_info_context _di; + struct domain_info_context *dinfo = &_di; + + xc_dominfo_t info; + shared_info_any_t *live_shinfo; + xen_capabilities_info_t xen_caps = ""; + int i; + + /* Only be initialized once */ + if ( minfo->pfn_type || minfo->p2m_table ) + { + errno = EINVAL; + return -1; + } + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ) + { + PERROR("Could not get domain info"); + return -1; + } + + if ( xc_domain_get_guest_width(xch, domid, &minfo->guest_width) ) + { + PERROR("Could not get domain address size"); + return -1; + } + _di.guest_width = minfo->guest_width; + + /* Get page table levels (see get_platform_info() in xg_save_restore.h */ + if ( xc_version(xch, XENVER_capabilities, &xen_caps) ) + { + PERROR("Could not get Xen capabilities (for page table levels)"); + return -1; + } + if ( strstr(xen_caps, "xen-3.0-x86_64") ) + /* Depends on whether it's a compat 32-on-64 guest */ + minfo->pt_levels = ( (minfo->guest_width == 8) ? 4 : 3 ); + else if ( strstr(xen_caps, "xen-3.0-x86_32p") ) + minfo->pt_levels = 3; + else if ( strstr(xen_caps, "xen-3.0-x86_32") ) + minfo->pt_levels = 2; + else + { + errno = EFAULT; + return -1; + } + + /* We need the shared info page for mapping the P2M */ + live_shinfo = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + info.shared_info_frame); + if ( !live_shinfo ) + { + PERROR("Could not map the shared info frame (MFN 0x%lx)", + info.shared_info_frame); + return -1; + } + + if ( xc_core_arch_map_p2m_writable(xch, minfo->guest_width, &info, + live_shinfo, &minfo->p2m_table, + &minfo->p2m_size) ) + { + PERROR("Could not map the P2M table"); + munmap(live_shinfo, PAGE_SIZE); + return -1; + } + munmap(live_shinfo, PAGE_SIZE); + _di.p2m_size = minfo->p2m_size; + + /* Make space and prepare for getting the PFN types */ + minfo->pfn_type = calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); + if ( !minfo->pfn_type ) + { + PERROR("Could not allocate memory for the PFN types"); + goto failed; + } + for ( i = 0; i < minfo->p2m_size; i++ ) + minfo->pfn_type[i] = pfn_to_mfn(i, minfo->p2m_table, + minfo->guest_width); + + /* Retrieve PFN types in batches */ + for ( i = 0; i < minfo->p2m_size ; i+=1024 ) + { + int count = ((minfo->p2m_size - i ) > 1024 ) ? + 1024: (minfo->p2m_size - i); + + if ( xc_get_pfn_type_batch(xch, domid, count, minfo->pfn_type + i) ) + { + PERROR("Could not get %d-eth batch of PFN types", (i+1)/1024); + goto failed; + } + } + + return 0; + +failed: + if ( minfo->pfn_type ) + { + free(minfo->pfn_type); + minfo->pfn_type = NULL; + } + if ( minfo->p2m_table ) + { + munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); + minfo->p2m_table = NULL; + } + + return -1; +} + int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 1f6dbc6..fbb53f5 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -33,17 +33,6 @@ #include "xg_private.h" #include "xg_save_restore.h" -struct domain_mem_info{ - int domid; - unsigned int pt_level; - unsigned int guest_width; - xen_pfn_t *pfn_type; - xen_pfn_t *p2m_table; - unsigned long p2m_size; - xen_pfn_t *m2p_table; - int max_mfn; -}; - struct pte_backup_entry { xen_pfn_t table_mfn; @@ -180,139 +169,6 @@ static int xc_is_page_granted_v2(xc_interface *xch, xen_pfn_t gpfn, return (i != gnt_num); } -static xen_pfn_t pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int gwidth) -{ - return ((xen_pfn_t) ((gwidth==8)? - (((uint64_t *)p2m)[(pfn)]): - ((((uint32_t *)p2m)[(pfn)]) == 0xffffffffU ? - (-1UL) : - (((uint32_t *)p2m)[(pfn)])))); -} - -static int get_pt_level(xc_interface *xch, uint32_t domid, - unsigned int *pt_level, - unsigned int *gwidth) -{ - xen_capabilities_info_t xen_caps = ""; - - if (xc_version(xch, XENVER_capabilities, &xen_caps) != 0) - return -1; - - if (xc_domain_get_guest_width(xch, domid, gwidth) != 0) - return -1; - - if (strstr(xen_caps, "xen-3.0-x86_64")) - /* Depends on whether it's a compat 32-on-64 guest */ - *pt_level = ( (*gwidth == 8) ? 4 : 3 ); - else if (strstr(xen_caps, "xen-3.0-x86_32p")) - *pt_level = 3; - else if (strstr(xen_caps, "xen-3.0-x86_32")) - *pt_level = 2; - else - return -1; - - return 0; -} - -static int close_mem_info(xc_interface *xch, struct domain_mem_info *minfo) -{ - if (minfo->pfn_type) - free(minfo->pfn_type); - munmap(minfo->m2p_table, M2P_SIZE(minfo->max_mfn)); - munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); - minfo->p2m_table = minfo->m2p_table = NULL; - - return 0; -} - -static int init_mem_info(xc_interface *xch, int domid, - struct domain_mem_info *minfo, - xc_dominfo_t *info) -{ - uint64_aligned_t shared_info_frame; - shared_info_any_t *live_shinfo = NULL; - int i, rc; - - /* Only be initialized once */ - if (minfo->pfn_type || minfo->m2p_table || minfo->p2m_table) - return -EINVAL; - - if ( get_pt_level(xch, domid, &minfo->pt_level, - &minfo->guest_width) ) - { - ERROR("Unable to get PT level info."); - return -EFAULT; - } - dinfo->guest_width = minfo->guest_width; - - shared_info_frame = info->shared_info_frame; - - live_shinfo = xc_map_foreign_range(xch, domid, - PAGE_SIZE, PROT_READ, shared_info_frame); - if ( !live_shinfo ) - { - ERROR("Couldn't map live_shinfo"); - return -EFAULT; - } - - if ( (rc = xc_core_arch_map_p2m_writable(xch, minfo->guest_width, - info, live_shinfo, &minfo->p2m_table, &minfo->p2m_size)) ) - { - ERROR("Couldn't map p2m table %x\n", rc); - goto failed; - } - munmap(live_shinfo, PAGE_SIZE); - live_shinfo = NULL; - - dinfo->p2m_size = minfo->p2m_size; - - minfo->max_mfn = xc_maximum_ram_page(xch); - if ( !(minfo->m2p_table = - xc_map_m2p(xch, minfo->max_mfn, PROT_READ, NULL)) ) - { - ERROR("Failed to map live M2P table"); - goto failed; - } - - /* Get pfn type */ - minfo->pfn_type = calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); - if (!minfo->pfn_type) - { - ERROR("Failed to malloc pfn_type\n"); - goto failed; - } - - for (i = 0; i < minfo->p2m_size; i++) - minfo->pfn_type[i] = pfn_to_mfn(i, minfo->p2m_table, - minfo->guest_width); - - for (i = 0; i < minfo->p2m_size ; i+=1024) - { - int count = ((dinfo->p2m_size - i ) > 1024 ) ? 1024: (dinfo->p2m_size - i); - if ( ( rc = xc_get_pfn_type_batch(xch, domid, count, - minfo->pfn_type + i)) ) - { - ERROR("Failed to get pfn_type %x\n", rc); - goto failed; - } - } - return 0; - -failed: - if (minfo->pfn_type) - { - free(minfo->pfn_type); - minfo->pfn_type = NULL; - } - if (live_shinfo) - munmap(live_shinfo, PAGE_SIZE); - munmap(minfo->m2p_table, M2P_SIZE(minfo->max_mfn)); - munmap(minfo->p2m_table, P2M_FLL_ENTRIES * PAGE_SIZE); - minfo->p2m_table = minfo->m2p_table = NULL; - - return -1; -} - static int backup_ptes(xen_pfn_t table_mfn, int offset, struct pte_backup *backup) { @@ -402,7 +258,7 @@ static int __update_pte(xc_interface *xch, } static int change_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, pte_func func, @@ -412,7 +268,7 @@ static int change_pte(xc_interface *xch, int domid, uint64_t i; void *content = NULL; - pte_num = PAGE_SIZE / ((minfo->pt_level == 2) ? 4 : 8); + pte_num = PAGE_SIZE / ((minfo->pt_levels == 2) ? 4 : 8); for (i = 0; i < minfo->p2m_size; i++) { @@ -435,7 +291,7 @@ static int change_pte(xc_interface *xch, int domid, for (j = 0; j < pte_num; j++) { - if ( minfo->pt_level == 2 ) + if ( minfo->pt_levels == 2 ) pte = ((const uint32_t*)content)[j]; else pte = ((const uint64_t*)content)[j]; @@ -447,7 +303,7 @@ static int change_pte(xc_interface *xch, int domid, case 1: if ( xc_add_mmu_update(xch, mmu, table_mfn << PAGE_SHIFT | - j * ( (minfo->pt_level == 2) ? + j * ( (minfo->pt_levels == 2) ? sizeof(uint32_t): sizeof(uint64_t)) | MMU_PT_UPDATE_PRESERVE_AD, new_pte) ) @@ -480,7 +336,7 @@ failed: } static int update_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, unsigned long new_mfn) @@ -490,7 +346,7 @@ static int update_pte(xc_interface *xch, int domid, } static int clear_pte(xc_interface *xch, int domid, - struct domain_mem_info *minfo, + struct xc_domain_meminfo *minfo, struct pte_backup *backup, struct xc_mmu *mmu, xen_pfn_t mfn) @@ -538,7 +394,7 @@ static int is_page_exchangable(xc_interface *xch, int domid, xen_pfn_t mfn, int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) { xc_dominfo_t info; - struct domain_mem_info minfo; + struct xc_domain_meminfo minfo; struct xc_mmu *mmu = NULL; struct pte_backup old_ptes = {NULL, 0, 0}; grant_entry_v1_t *gnttab_v1 = NULL; @@ -549,6 +405,8 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) int rc, result = -1; uint32_t status; xen_pfn_t new_mfn, gpfn; + xen_pfn_t *m2p_table; + int max_mfn; if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 ) { @@ -568,10 +426,26 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn) return -EINVAL; } - /* Get domain's memory information */ + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + PERROR("Failed to map live M2P table"); + return -EFAULT; + } + gpfn = m2p_table[mfn]; + + /* Map domain's memory information */ memset(&minfo, 0, sizeof(minfo)); - init_mem_info(xch, domid, &minfo, &info); - gpfn = minfo.m2p_table[mfn]; + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + PERROR("Could not map domain's memory information\n"); + return -EFAULT; + } + + /* For translation macros */ + dinfo->guest_width = minfo.guest_width; + dinfo->p2m_size = minfo.p2m_size; /* Don't exchange CR3 for PAE guest in PAE host environment */ if (minfo.guest_width > sizeof(long)) @@ -766,7 +640,8 @@ failed: if (gnttab_v2) munmap(gnttab_v2, gnt_num / (PAGE_SIZE/sizeof(grant_entry_v2_t))); - close_mem_info(xch, &minfo); + xc_unmap_domain_meminfo(xch, &minfo); + munmap(m2p_table, M2P_SIZE(max_mfn)); return result; } diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 4714bd2..c12091f 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -276,6 +276,23 @@ int xc_exchange_page(xc_interface *xch, int domid, xen_pfn_t mfn); /** + * Memory related information, such as PFN types, the P2M table, + * the guest word width and the guest page table levels. + */ +struct xc_domain_meminfo { + unsigned int pt_levels; + unsigned int guest_width; + xen_pfn_t *pfn_type; + xen_pfn_t *p2m_table; + unsigned long p2m_size; +}; + +int xc_map_domain_meminfo(xc_interface *xch, int domid, + struct xc_domain_meminfo *minfo); + +int xc_unmap_domain_meminfo(xc_interface *xch, struct xc_domain_meminfo *mem); + +/** * This function map m2p table * @parm xch a handle to an open hypervisor interface * @parm max_mfn the max pfn diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index db02ccf..5ff2124 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -136,6 +136,15 @@ struct domain_info_context { unsigned long p2m_size; }; +static inline xen_pfn_t pfn_to_mfn(xen_pfn_t pfn, xen_pfn_t *p2m, int gwidth) +{ + return ((xen_pfn_t) ((gwidth==8)? + (((uint64_t *)p2m)[(pfn)]): + ((((uint32_t *)p2m)[(pfn)]) == 0xffffffffU ? + (-1UL) : + (((uint32_t *)p2m)[(pfn)])))); +} + /* Number of xen_pfn_t in a page */ #define FPP (PAGE_SIZE/(dinfo->guest_width)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqc-0003Xw-KR; Mon, 16 Sep 2013 20:56:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqb-0003XT-CK for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:41 +0000 Received: from [85.158.143.35:28689] by server-1.bemta-4.messagelabs.com id 5E/93-16125-88077325; Mon, 16 Sep 2013 20:56:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1379364998!4541059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6850 invoked from network); 16 Sep 2013 20:56:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqY-0003TU-4m for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqY-0006EZ-2x for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:38 +0000 Date: Mon, 16 Sep 2013 20:56:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: introduce xen-mfndump. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae763e4224304983a1cde2fbb3d6e0c4d60b2688 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:20 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:10 2013 +0100 tools/misc: introduce xen-mfndump. A little development and debugging tool, useful when looking for information about MFN to PFN mappings, MFN/PFN mappings in a guest's PTEs, etc. This is what it can do as of now: $ /usr/sbin/xen-mfndump Usage: xen-mfndump [args] Commands: help show this help dump-m2p show M2P dump-p2m show P2M of dump-ptes show the PTEs in lookup-pte find the PTE mapping memcmp-mfns (str)compare content of & Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/misc/Makefile | 7 +- tools/misc/xen-mfndump.c | 425 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 430 insertions(+), 2 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 59def7a..17aeda5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -10,7 +10,7 @@ CFLAGS += $(CFLAGS_libxenstore) HDRS = $(wildcard *.h) TARGETS-y := xenperf xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xencov -TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd +TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) @@ -22,7 +22,7 @@ INSTALL_BIN := $(INSTALL_BIN-y) INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN := $(INSTALL_SBIN-y) @@ -75,6 +75,9 @@ xenlockprof: xenlockprof.o xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) +xen-mfndump: xen-mfndump.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) + xenwatchdogd: xenwatchdogd.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c new file mode 100644 index 0000000..3e8302e --- /dev/null +++ b/tools/misc/xen-mfndump.c @@ -0,0 +1,425 @@ +#include +#include +#include +#include +#include + +#include "xg_save_restore.h" + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + +static xc_interface *xch; + +int help_func(int argc, char *argv[]) +{ + fprintf(stderr, + "Usage: xen-mfndump [args]\n" + "Commands:\n" + " help show this help\n" + " dump-m2p show M2P\n" + " dump-p2m show P2M of \n" + " dump-ptes show the PTEs in \n" + " lookup-pte find the PTE mapping \n" + " memcmp-mfns \n" + " compare content of & \n" + ); + + return 0; +} + +int dump_m2p_func(int argc, char *argv[]) +{ + unsigned long i, max_mfn; + xen_pfn_t *m2p_table; + + if ( argc > 0 ) + { + help_func(0, NULL); + return 1; + } + + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + ERROR("Failed to map live M2P table"); + return -1; + } + + printf(" --- Dumping M2P ---\n"); + printf(" Max MFN: %lu\n", max_mfn); + for ( i = 0; i < max_mfn; i++ ) + { + printf(" mfn=0x%lx ==> pfn=0x%lx\n", i, m2p_table[i]); + } + printf(" --- End of M2P ---\n"); + + munmap(m2p_table, M2P_SIZE(max_mfn)); + return 0; +} + +int dump_p2m_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + unsigned long i; + int domid; + + if ( argc < 1 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + printf(" --- Dumping P2M for domain %d ---\n", domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + for ( i = 0; i < minfo.p2m_size; i++ ) + { + unsigned long pagetype = minfo.pfn_type[i] & + XEN_DOMCTL_PFINFO_LTAB_MASK; + + printf(" pfn=0x%lx ==> mfn=0x%lx (type 0x%lx)", i, minfo.p2m_table[i], + pagetype >> XEN_DOMCTL_PFINFO_LTAB_SHIFT); + + if ( is_mapped(minfo.p2m_table[i]) ) + printf(" [mapped]"); + + if ( pagetype & XEN_DOMCTL_PFINFO_LPINTAB ) + printf (" [pinned]"); + + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB ) + printf(" [xtab]"); + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + printf(" [broken]"); + if ( pagetype == XEN_DOMCTL_PFINFO_XALLOC ) + printf( " [xalloc]"); + + switch ( pagetype & XEN_DOMCTL_PFINFO_LTABTYPE_MASK ) + { + case XEN_DOMCTL_PFINFO_L1TAB: + printf(" L1 table"); + break; + + case XEN_DOMCTL_PFINFO_L2TAB: + printf(" L2 table"); + break; + + case XEN_DOMCTL_PFINFO_L3TAB: + printf(" L3 table"); + break; + + case XEN_DOMCTL_PFINFO_L4TAB: + printf(" L4 table"); + break; + } + + printf("\n"); + } + printf(" --- End of P2M for domain %d ---\n", domid); + + xc_unmap_domain_meminfo(xch, &minfo); + return 0; +} + +int dump_ptes_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + void *page = NULL; + unsigned long i, max_mfn; + int domid, pte_num, rc = 0; + xen_pfn_t pfn, mfn, *m2p_table; + + if ( argc < 2 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + mfn = strtoul(argv[1], NULL, 16); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( (mfn > max_mfn) || + !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + xc_unmap_domain_meminfo(xch, &minfo); + ERROR("Failed to map live M2P table"); + return -1; + } + + pfn = m2p_table[mfn]; + if ( pfn >= minfo.p2m_size ) + { + ERROR("pfn 0x%lx out of range for domain %d\n", pfn, domid); + rc = -1; + goto out; + } + + if ( !(minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) + { + ERROR("pfn 0x%lx for domain %d is not a PT\n", pfn, domid); + rc = -1; + goto out; + } + + page = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + minfo.p2m_table[pfn]); + if ( !page ) + { + ERROR("Failed to map 0x%lx\n", minfo.p2m_table[pfn]); + rc = -1; + goto out; + } + + pte_num = PAGE_SIZE / 8; + + printf(" --- Dumping %d PTEs for domain %d ---\n", pte_num, domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + printf(" pfn: 0x%lx, mfn: 0x%lx", + pfn, minfo.p2m_table[pfn]); + switch ( minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK ) + { + case XEN_DOMCTL_PFINFO_L1TAB: + printf(", L1 table"); + break; + case XEN_DOMCTL_PFINFO_L2TAB: + printf(", L2 table"); + break; + case XEN_DOMCTL_PFINFO_L3TAB: + printf(", L3 table"); + break; + case XEN_DOMCTL_PFINFO_L4TAB: + printf(", L4 table"); + break; + } + if ( minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LPINTAB ) + printf (" [pinned]"); + if ( is_mapped(minfo.p2m_table[pfn]) ) + printf(" [mapped]"); + printf("\n"); + + for ( i = 0; i < pte_num; i++ ) + printf(" pte[%lu]: 0x%lx\n", i, ((const uint64_t*)page)[i]); + + printf(" --- End of PTEs for domain %d, pfn=0x%lx (mfn=0x%lx) ---\n", + domid, pfn, minfo.p2m_table[pfn]); + + out: + munmap(page, PAGE_SIZE); + xc_unmap_domain_meminfo(xch, &minfo); + munmap(m2p_table, M2P_SIZE(max_mfn)); + return rc; +} + +int lookup_pte_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + void *page = NULL; + unsigned long i, j; + int domid, pte_num; + xen_pfn_t mfn; + + if ( argc < 2 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + mfn = strtoul(argv[1], NULL, 16); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + pte_num = PAGE_SIZE / 8; + + printf(" --- Lookig for PTEs mapping mfn 0x%lx for domain %d ---\n", + mfn, domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + + for ( i = 0; i < minfo.p2m_size; i++ ) + { + if ( !(minfo.pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) + continue; + + page = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + minfo.p2m_table[i]); + if ( !page ) + continue; + + for ( j = 0; j < pte_num; j++ ) + { + uint64_t pte = ((const uint64_t*)page)[j]; + +#define __MADDR_BITS_X86 ((minfo.guest_width == 8) ? 52 : 44) +#define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - PAGE_SHIFT_X86)) - 1) + if ( ((pte >> PAGE_SHIFT_X86) & __MFN_MASK_X86) == mfn) + printf(" 0x%lx <-- [0x%lx][%lu]: 0x%lx\n", + mfn, minfo.p2m_table[i], j, pte); +#undef __MADDR_BITS_X86 +#undef __MFN_MASK_X8 + } + + munmap(page, PAGE_SIZE); + page = NULL; + } + + xc_unmap_domain_meminfo(xch, &minfo); + + return 1; +} + +int memcmp_mfns_func(int argc, char *argv[]) +{ + xc_dominfo_t info1, info2; + void *page1 = NULL, *page2 = NULL; + int domid1, domid2; + xen_pfn_t mfn1, mfn2; + int rc = 0; + + if ( argc < 4 ) + { + help_func(0, NULL); + return 1; + } + domid1 = atoi(argv[0]); + domid2 = atoi(argv[2]); + mfn1 = strtoul(argv[1], NULL, 16); + mfn2 = strtoul(argv[3], NULL, 16); + + if ( xc_domain_getinfo(xch, domid1, 1, &info1) != 1 || + xc_domain_getinfo(xch, domid2, 1, &info2) != 1 || + info1.domid != domid1 || info2.domid != domid2) + { + ERROR("Failed to obtain info for domains\n"); + return -1; + } + + page1 = xc_map_foreign_range(xch, domid1, PAGE_SIZE, PROT_READ, mfn1); + page2 = xc_map_foreign_range(xch, domid2, PAGE_SIZE, PROT_READ, mfn2); + if ( !page1 || !page2 ) + { + ERROR("Failed to map either 0x%lx[dom %d] or 0x%lx[dom %d]\n", + mfn1, domid1, mfn2, domid2); + rc = -1; + goto out; + } + + printf(" --- Comparing the content of 2 MFNs ---\n"); + printf(" 1: 0x%lx[dom %d], 2: 0x%lx[dom %d]\n", + mfn1, domid1, mfn2, domid2); + printf(" memcpy(1, 2) = %d\n", memcmp(page1, page2, PAGE_SIZE)); + + out: + munmap(page1, PAGE_SIZE); + munmap(page2, PAGE_SIZE); + return rc; +} + + + +struct { + const char *name; + int (*func)(int argc, char *argv[]); +} opts[] = { + { "help", help_func }, + { "dump-m2p", dump_m2p_func }, + { "dump-p2m", dump_p2m_func }, + { "dump-ptes", dump_ptes_func }, + { "lookup-pte", lookup_pte_func }, + { "memcmp-mfns", memcmp_mfns_func}, +}; + +int main(int argc, char *argv[]) +{ + int i, ret; + + if (argc < 2) + { + help_func(0, NULL); + return 1; + } + + xch = xc_interface_open(0, 0, 0); + if ( !xch ) + { + ERROR("Failed to open an xc handler"); + return 1; + } + + for ( i = 0; i < ARRAY_SIZE(opts); i++ ) + { + if ( !strncmp(opts[i].name, argv[1], strlen(argv[1])) ) + break; + } + + if ( i == ARRAY_SIZE(opts) ) + { + fprintf(stderr, "Unknown option '%s'", argv[1]); + help_func(0, NULL); + return 1; + } + + ret = opts[i].func(argc - 2, argv + 2); + + xc_interface_close(xch); + + return !!ret; +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56: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 1VLfqc-0003Xw-KR; Mon, 16 Sep 2013 20:56:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqb-0003XT-CK for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:41 +0000 Received: from [85.158.143.35:28689] by server-1.bemta-4.messagelabs.com id 5E/93-16125-88077325; Mon, 16 Sep 2013 20:56:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1379364998!4541059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6850 invoked from network); 16 Sep 2013 20:56:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqY-0003TU-4m for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqY-0006EZ-2x for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:38 +0000 Date: Mon, 16 Sep 2013 20:56:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/misc: introduce xen-mfndump. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae763e4224304983a1cde2fbb3d6e0c4d60b2688 Author: Dario Faggioli AuthorDate: Tue Sep 10 19:54:20 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:10:10 2013 +0100 tools/misc: introduce xen-mfndump. A little development and debugging tool, useful when looking for information about MFN to PFN mappings, MFN/PFN mappings in a guest's PTEs, etc. This is what it can do as of now: $ /usr/sbin/xen-mfndump Usage: xen-mfndump [args] Commands: help show this help dump-m2p show M2P dump-p2m show P2M of dump-ptes show the PTEs in lookup-pte find the PTE mapping memcmp-mfns (str)compare content of & Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/misc/Makefile | 7 +- tools/misc/xen-mfndump.c | 425 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 430 insertions(+), 2 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 59def7a..17aeda5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -10,7 +10,7 @@ CFLAGS += $(CFLAGS_libxenstore) HDRS = $(wildcard *.h) TARGETS-y := xenperf xenpm xen-tmem-list-parse gtraceview gtracestat xenlockprof xenwatchdogd xencov -TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd +TARGETS-$(CONFIG_X86) += xen-detect xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump TARGETS-$(CONFIG_MIGRATE) += xen-hptool TARGETS := $(TARGETS-y) @@ -22,7 +22,7 @@ INSTALL_BIN := $(INSTALL_BIN-y) INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov -INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN := $(INSTALL_SBIN-y) @@ -75,6 +75,9 @@ xenlockprof: xenlockprof.o xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) +xen-mfndump: xen-mfndump.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) + xenwatchdogd: xenwatchdogd.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c new file mode 100644 index 0000000..3e8302e --- /dev/null +++ b/tools/misc/xen-mfndump.c @@ -0,0 +1,425 @@ +#include +#include +#include +#include +#include + +#include "xg_save_restore.h" + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + +static xc_interface *xch; + +int help_func(int argc, char *argv[]) +{ + fprintf(stderr, + "Usage: xen-mfndump [args]\n" + "Commands:\n" + " help show this help\n" + " dump-m2p show M2P\n" + " dump-p2m show P2M of \n" + " dump-ptes show the PTEs in \n" + " lookup-pte find the PTE mapping \n" + " memcmp-mfns \n" + " compare content of & \n" + ); + + return 0; +} + +int dump_m2p_func(int argc, char *argv[]) +{ + unsigned long i, max_mfn; + xen_pfn_t *m2p_table; + + if ( argc > 0 ) + { + help_func(0, NULL); + return 1; + } + + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + ERROR("Failed to map live M2P table"); + return -1; + } + + printf(" --- Dumping M2P ---\n"); + printf(" Max MFN: %lu\n", max_mfn); + for ( i = 0; i < max_mfn; i++ ) + { + printf(" mfn=0x%lx ==> pfn=0x%lx\n", i, m2p_table[i]); + } + printf(" --- End of M2P ---\n"); + + munmap(m2p_table, M2P_SIZE(max_mfn)); + return 0; +} + +int dump_p2m_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + unsigned long i; + int domid; + + if ( argc < 1 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + printf(" --- Dumping P2M for domain %d ---\n", domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + for ( i = 0; i < minfo.p2m_size; i++ ) + { + unsigned long pagetype = minfo.pfn_type[i] & + XEN_DOMCTL_PFINFO_LTAB_MASK; + + printf(" pfn=0x%lx ==> mfn=0x%lx (type 0x%lx)", i, minfo.p2m_table[i], + pagetype >> XEN_DOMCTL_PFINFO_LTAB_SHIFT); + + if ( is_mapped(minfo.p2m_table[i]) ) + printf(" [mapped]"); + + if ( pagetype & XEN_DOMCTL_PFINFO_LPINTAB ) + printf (" [pinned]"); + + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB ) + printf(" [xtab]"); + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + printf(" [broken]"); + if ( pagetype == XEN_DOMCTL_PFINFO_XALLOC ) + printf( " [xalloc]"); + + switch ( pagetype & XEN_DOMCTL_PFINFO_LTABTYPE_MASK ) + { + case XEN_DOMCTL_PFINFO_L1TAB: + printf(" L1 table"); + break; + + case XEN_DOMCTL_PFINFO_L2TAB: + printf(" L2 table"); + break; + + case XEN_DOMCTL_PFINFO_L3TAB: + printf(" L3 table"); + break; + + case XEN_DOMCTL_PFINFO_L4TAB: + printf(" L4 table"); + break; + } + + printf("\n"); + } + printf(" --- End of P2M for domain %d ---\n", domid); + + xc_unmap_domain_meminfo(xch, &minfo); + return 0; +} + +int dump_ptes_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + void *page = NULL; + unsigned long i, max_mfn; + int domid, pte_num, rc = 0; + xen_pfn_t pfn, mfn, *m2p_table; + + if ( argc < 2 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + mfn = strtoul(argv[1], NULL, 16); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + /* Map M2P and obtain gpfn */ + max_mfn = xc_maximum_ram_page(xch); + if ( (mfn > max_mfn) || + !(m2p_table = xc_map_m2p(xch, max_mfn, PROT_READ, NULL)) ) + { + xc_unmap_domain_meminfo(xch, &minfo); + ERROR("Failed to map live M2P table"); + return -1; + } + + pfn = m2p_table[mfn]; + if ( pfn >= minfo.p2m_size ) + { + ERROR("pfn 0x%lx out of range for domain %d\n", pfn, domid); + rc = -1; + goto out; + } + + if ( !(minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) + { + ERROR("pfn 0x%lx for domain %d is not a PT\n", pfn, domid); + rc = -1; + goto out; + } + + page = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + minfo.p2m_table[pfn]); + if ( !page ) + { + ERROR("Failed to map 0x%lx\n", minfo.p2m_table[pfn]); + rc = -1; + goto out; + } + + pte_num = PAGE_SIZE / 8; + + printf(" --- Dumping %d PTEs for domain %d ---\n", pte_num, domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + printf(" pfn: 0x%lx, mfn: 0x%lx", + pfn, minfo.p2m_table[pfn]); + switch ( minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK ) + { + case XEN_DOMCTL_PFINFO_L1TAB: + printf(", L1 table"); + break; + case XEN_DOMCTL_PFINFO_L2TAB: + printf(", L2 table"); + break; + case XEN_DOMCTL_PFINFO_L3TAB: + printf(", L3 table"); + break; + case XEN_DOMCTL_PFINFO_L4TAB: + printf(", L4 table"); + break; + } + if ( minfo.pfn_type[pfn] & XEN_DOMCTL_PFINFO_LPINTAB ) + printf (" [pinned]"); + if ( is_mapped(minfo.p2m_table[pfn]) ) + printf(" [mapped]"); + printf("\n"); + + for ( i = 0; i < pte_num; i++ ) + printf(" pte[%lu]: 0x%lx\n", i, ((const uint64_t*)page)[i]); + + printf(" --- End of PTEs for domain %d, pfn=0x%lx (mfn=0x%lx) ---\n", + domid, pfn, minfo.p2m_table[pfn]); + + out: + munmap(page, PAGE_SIZE); + xc_unmap_domain_meminfo(xch, &minfo); + munmap(m2p_table, M2P_SIZE(max_mfn)); + return rc; +} + +int lookup_pte_func(int argc, char *argv[]) +{ + struct xc_domain_meminfo minfo; + xc_dominfo_t info; + void *page = NULL; + unsigned long i, j; + int domid, pte_num; + xen_pfn_t mfn; + + if ( argc < 2 ) + { + help_func(0, NULL); + return 1; + } + domid = atoi(argv[0]); + mfn = strtoul(argv[1], NULL, 16); + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + ERROR("Failed to obtain info for domain %d\n", domid); + return -1; + } + + /* Retrieve all the info about the domain's memory */ + memset(&minfo, 0, sizeof(minfo)); + if ( xc_map_domain_meminfo(xch, domid, &minfo) ) + { + ERROR("Could not map domain %d memory information\n", domid); + return -1; + } + + pte_num = PAGE_SIZE / 8; + + printf(" --- Lookig for PTEs mapping mfn 0x%lx for domain %d ---\n", + mfn, domid); + printf(" Guest Width: %u, PT Levels: %u P2M size: = %lu\n", + minfo.guest_width, minfo.pt_levels, minfo.p2m_size); + + for ( i = 0; i < minfo.p2m_size; i++ ) + { + if ( !(minfo.pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) + continue; + + page = xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + minfo.p2m_table[i]); + if ( !page ) + continue; + + for ( j = 0; j < pte_num; j++ ) + { + uint64_t pte = ((const uint64_t*)page)[j]; + +#define __MADDR_BITS_X86 ((minfo.guest_width == 8) ? 52 : 44) +#define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - PAGE_SHIFT_X86)) - 1) + if ( ((pte >> PAGE_SHIFT_X86) & __MFN_MASK_X86) == mfn) + printf(" 0x%lx <-- [0x%lx][%lu]: 0x%lx\n", + mfn, minfo.p2m_table[i], j, pte); +#undef __MADDR_BITS_X86 +#undef __MFN_MASK_X8 + } + + munmap(page, PAGE_SIZE); + page = NULL; + } + + xc_unmap_domain_meminfo(xch, &minfo); + + return 1; +} + +int memcmp_mfns_func(int argc, char *argv[]) +{ + xc_dominfo_t info1, info2; + void *page1 = NULL, *page2 = NULL; + int domid1, domid2; + xen_pfn_t mfn1, mfn2; + int rc = 0; + + if ( argc < 4 ) + { + help_func(0, NULL); + return 1; + } + domid1 = atoi(argv[0]); + domid2 = atoi(argv[2]); + mfn1 = strtoul(argv[1], NULL, 16); + mfn2 = strtoul(argv[3], NULL, 16); + + if ( xc_domain_getinfo(xch, domid1, 1, &info1) != 1 || + xc_domain_getinfo(xch, domid2, 1, &info2) != 1 || + info1.domid != domid1 || info2.domid != domid2) + { + ERROR("Failed to obtain info for domains\n"); + return -1; + } + + page1 = xc_map_foreign_range(xch, domid1, PAGE_SIZE, PROT_READ, mfn1); + page2 = xc_map_foreign_range(xch, domid2, PAGE_SIZE, PROT_READ, mfn2); + if ( !page1 || !page2 ) + { + ERROR("Failed to map either 0x%lx[dom %d] or 0x%lx[dom %d]\n", + mfn1, domid1, mfn2, domid2); + rc = -1; + goto out; + } + + printf(" --- Comparing the content of 2 MFNs ---\n"); + printf(" 1: 0x%lx[dom %d], 2: 0x%lx[dom %d]\n", + mfn1, domid1, mfn2, domid2); + printf(" memcpy(1, 2) = %d\n", memcmp(page1, page2, PAGE_SIZE)); + + out: + munmap(page1, PAGE_SIZE); + munmap(page2, PAGE_SIZE); + return rc; +} + + + +struct { + const char *name; + int (*func)(int argc, char *argv[]); +} opts[] = { + { "help", help_func }, + { "dump-m2p", dump_m2p_func }, + { "dump-p2m", dump_p2m_func }, + { "dump-ptes", dump_ptes_func }, + { "lookup-pte", lookup_pte_func }, + { "memcmp-mfns", memcmp_mfns_func}, +}; + +int main(int argc, char *argv[]) +{ + int i, ret; + + if (argc < 2) + { + help_func(0, NULL); + return 1; + } + + xch = xc_interface_open(0, 0, 0); + if ( !xch ) + { + ERROR("Failed to open an xc handler"); + return 1; + } + + for ( i = 0; i < ARRAY_SIZE(opts); i++ ) + { + if ( !strncmp(opts[i].name, argv[1], strlen(argv[1])) ) + break; + } + + if ( i == ARRAY_SIZE(opts) ) + { + fprintf(stderr, "Unknown option '%s'", argv[1]); + help_func(0, NULL); + return 1; + } + + ret = opts[i].func(argc - 2, argv + 2); + + xc_interface_close(xch); + + return !!ret; +} + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqm-0003aJ-Pz; Mon, 16 Sep 2013 20:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfql-0003Zv-0E for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:51 +0000 Received: from [85.158.139.211:37452] by server-10.bemta-5.messagelabs.com id BF/04-23973-29077325; Mon, 16 Sep 2013 20:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379365008!87555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9696 invoked from network); 16 Sep 2013 20:56:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqi-0003Ta-Bc for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqi-0006Fh-9J for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:48 +0000 Date: Mon, 16 Sep 2013 20:56:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstat: Fix buffer over-run with new_domains being negative. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1438d36f96e90d1116bebc6b3013634ca21c49c8 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 10 11:08:30 2013 -0400 Commit: Ian Campbell CommitDate: Fri Sep 13 13:12:29 2013 +0100 xenstat: Fix buffer over-run with new_domains being negative. Coverity identified this as: CID 1055740 Out-of-bounds read - "In xenstat_get_node: Out-of-bounds read from a buffer (CWE-125)" And sure enough, if xc_domain_getinfolist returns us -1, we will try to use it later on in the for (i = 0; i < new_domains; ..) loop. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper --- tools/xenstat/libxenstat/src/xenstat.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index 104655d..e5facb8 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -208,15 +208,15 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) node->num_domains, DOMAIN_CHUNK_SIZE, domaininfo); + if (new_domains < 0) + goto err; tmp = realloc(node->domains, (node->num_domains + new_domains) * sizeof(xenstat_domain)); - if (tmp == NULL) { - free(node->domains); - free(node); - return NULL; - } + if (tmp == NULL) + goto err; + node->domains = tmp; domain = node->domains + node->num_domains; @@ -280,6 +280,10 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) } return node; +err: + free(node->domains); + free(node); + return NULL; } void xenstat_free_node(xenstat_node * node) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:56:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqm-0003aJ-Pz; Mon, 16 Sep 2013 20:56:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfql-0003Zv-0E for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:51 +0000 Received: from [85.158.139.211:37452] by server-10.bemta-5.messagelabs.com id BF/04-23973-29077325; Mon, 16 Sep 2013 20:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379365008!87555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9696 invoked from network); 16 Sep 2013 20:56:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqi-0003Ta-Bc for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqi-0006Fh-9J for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:48 +0000 Date: Mon, 16 Sep 2013 20:56:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstat: Fix buffer over-run with new_domains being negative. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1438d36f96e90d1116bebc6b3013634ca21c49c8 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 10 11:08:30 2013 -0400 Commit: Ian Campbell CommitDate: Fri Sep 13 13:12:29 2013 +0100 xenstat: Fix buffer over-run with new_domains being negative. Coverity identified this as: CID 1055740 Out-of-bounds read - "In xenstat_get_node: Out-of-bounds read from a buffer (CWE-125)" And sure enough, if xc_domain_getinfolist returns us -1, we will try to use it later on in the for (i = 0; i < new_domains; ..) loop. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper --- tools/xenstat/libxenstat/src/xenstat.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index 104655d..e5facb8 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -208,15 +208,15 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) node->num_domains, DOMAIN_CHUNK_SIZE, domaininfo); + if (new_domains < 0) + goto err; tmp = realloc(node->domains, (node->num_domains + new_domains) * sizeof(xenstat_domain)); - if (tmp == NULL) { - free(node->domains); - free(node); - return NULL; - } + if (tmp == NULL) + goto err; + node->domains = tmp; domain = node->domains + node->num_domains; @@ -280,6 +280,10 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) } return node; +err: + free(node->domains); + free(node); + return NULL; } void xenstat_free_node(xenstat_node * node) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqx-0003cE-TV; Mon, 16 Sep 2013 20:57:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqw-0003bo-9V for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:02 +0000 Received: from [85.158.137.68:62270] by server-12.bemta-3.messagelabs.com id 30/B4-11891-C9077325; Mon, 16 Sep 2013 20:57:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1379365018!2832431!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2572 invoked from network); 16 Sep 2013 20:56:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqs-0003Tk-Ha for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqs-0006G9-GA for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:58 +0000 Date: Mon, 16 Sep 2013 20:56:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl__device_disk_from_xs_be to parse backend domid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5263350460114589652==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5263350460114589652== Content-Type: text/plain commit a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d Author: Roger Pau Monne AuthorDate: Fri Sep 6 12:36:26 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:13:31 2013 +0100 libxl: fix libxl__device_disk_from_xs_be to parse backend domid libxl__device_disk_from_xs_be was ignoring the backend domid, setting it to 0 by default. Fix this by parsing the backend disk path in order to fetch the backend domid. This fixes the issue reported when trying to block-detach disks that have it's backend on a driver domain. Signed-off-by: Roger Pau Monné Reported-by: G.R. Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1bce4bb..7a7aaf9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2234,9 +2234,16 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned int len; char *tmp; + int rc; libxl_device_disk_init(disk); + rc = sscanf(be_path, "/local/domain/%d/", &disk->backend_domid); + if (rc != 1) { + LOG(ERROR, "Unable to fetch device backend domid from %s", be_path); + goto cleanup; + } + /* "params" may not be present; but everything else must be. */ tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/params", be_path), &len); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5263350460114589652== 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 --===============5263350460114589652==-- From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqx-0003cE-TV; Mon, 16 Sep 2013 20:57:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqw-0003bo-9V for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:02 +0000 Received: from [85.158.137.68:62270] by server-12.bemta-3.messagelabs.com id 30/B4-11891-C9077325; Mon, 16 Sep 2013 20:57:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1379365018!2832431!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2572 invoked from network); 16 Sep 2013 20:56:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfqs-0003Tk-Ha for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfqs-0006G9-GA for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:56:58 +0000 Date: Mon, 16 Sep 2013 20:56:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl__device_disk_from_xs_be to parse backend domid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5263350460114589652==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5263350460114589652== Content-Type: text/plain commit a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d Author: Roger Pau Monne AuthorDate: Fri Sep 6 12:36:26 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:13:31 2013 +0100 libxl: fix libxl__device_disk_from_xs_be to parse backend domid libxl__device_disk_from_xs_be was ignoring the backend domid, setting it to 0 by default. Fix this by parsing the backend disk path in order to fetch the backend domid. This fixes the issue reported when trying to block-detach disks that have it's backend on a driver domain. Signed-off-by: Roger Pau Monné Reported-by: G.R. Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1bce4bb..7a7aaf9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2234,9 +2234,16 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned int len; char *tmp; + int rc; libxl_device_disk_init(disk); + rc = sscanf(be_path, "/local/domain/%d/", &disk->backend_domid); + if (rc != 1) { + LOG(ERROR, "Unable to fetch device backend domid from %s", be_path); + goto cleanup; + } + /* "params" may not be present; but everything else must be. */ tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/params", be_path), &len); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5263350460114589652== 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 --===============5263350460114589652==-- From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfr7-0003e2-0F; Mon, 16 Sep 2013 20:57:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfr5-0003dl-A1 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:11 +0000 Received: from [85.158.143.35:29969] by server-2.bemta-4.messagelabs.com id F5/C5-26052-6A077325; Mon, 16 Sep 2013 20:57:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379365028!158237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30518 invoked from network); 16 Sep 2013 20:57:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfr2-0003UM-NM for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfr2-0006Gf-LU for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:08 +0000 Date: Mon, 16 Sep 2013 20:57:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix use-after-free in discard_events iteration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceb556178d59d6e06871b1b921e5c8b9be084582 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:17 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:37 2013 +0100 libxl: fix use-after-free in discard_events iteration We need to use the foreach variant which gets the next pointer before the loop body is executed. Coverity-ID: 1056193 Signed-off-by: Matthew Daley Acked-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7a7aaf9..0879f23 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -122,8 +122,8 @@ static void free_disable_deaths(libxl__gc *gc, static void discard_events(struct libxl__event_list *l) { /* doesn't bother unlinking from the list, so l is corrupt on return */ - libxl_event *ev; - LIBXL_TAILQ_FOREACH(ev, l, link) + libxl_event *ev, *next; + LIBXL_TAILQ_FOREACH_SAFE(ev, l, link, next) libxl_event_free(0, ev); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfr7-0003e2-0F; Mon, 16 Sep 2013 20:57:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfr5-0003dl-A1 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:11 +0000 Received: from [85.158.143.35:29969] by server-2.bemta-4.messagelabs.com id F5/C5-26052-6A077325; Mon, 16 Sep 2013 20:57:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379365028!158237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30518 invoked from network); 16 Sep 2013 20:57:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfr2-0003UM-NM for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfr2-0006Gf-LU for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:08 +0000 Date: Mon, 16 Sep 2013 20:57:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix use-after-free in discard_events iteration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceb556178d59d6e06871b1b921e5c8b9be084582 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:17 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:37 2013 +0100 libxl: fix use-after-free in discard_events iteration We need to use the foreach variant which gets the next pointer before the loop body is executed. Coverity-ID: 1056193 Signed-off-by: Matthew Daley Acked-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7a7aaf9..0879f23 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -122,8 +122,8 @@ static void free_disable_deaths(libxl__gc *gc, static void discard_events(struct libxl__event_list *l) { /* doesn't bother unlinking from the list, so l is corrupt on return */ - libxl_event *ev; - LIBXL_TAILQ_FOREACH(ev, l, link) + libxl_event *ev, *next; + LIBXL_TAILQ_FOREACH_SAFE(ev, l, link, next) libxl_event_free(0, ev); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrH-0003fp-3L; Mon, 16 Sep 2013 20:57:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrF-0003fR-Gd for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:21 +0000 Received: from [85.158.139.211:44440] by server-8.bemta-5.messagelabs.com id 3F/42-17437-0B077325; Mon, 16 Sep 2013 20:57:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1379365039!2769771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23724 invoked from network); 16 Sep 2013 20:57:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrC-0003US-T3 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrC-0006H3-Qv for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:18 +0000 Date: Mon, 16 Sep 2013 20:57:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correctly handle readlink() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6aa096e49a4ea78ca7816f6385c4d23c498fcd Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:18 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:41 2013 +0100 libxl: correctly handle readlink() errors readlink() returns a ssize_t with a negative value on failure. Coverity-ID: 1055566 Signed-off-by: Matthew Daley Acked-by: Ian Jackson --- tools/libxl/libxl_exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 98bfd71..7eddaef 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -33,7 +33,7 @@ static void check_open_fds(const char *what) for (i = 4; i < 256; i++) { #ifdef __linux__ - size_t len; + ssize_t len; char path[PATH_MAX]; char linkpath[PATH_MAX+1]; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrH-0003fp-3L; Mon, 16 Sep 2013 20:57:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrF-0003fR-Gd for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:21 +0000 Received: from [85.158.139.211:44440] by server-8.bemta-5.messagelabs.com id 3F/42-17437-0B077325; Mon, 16 Sep 2013 20:57:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1379365039!2769771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23724 invoked from network); 16 Sep 2013 20:57:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrC-0003US-T3 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrC-0006H3-Qv for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:18 +0000 Date: Mon, 16 Sep 2013 20:57:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correctly handle readlink() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6aa096e49a4ea78ca7816f6385c4d23c498fcd Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:18 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:41 2013 +0100 libxl: correctly handle readlink() errors readlink() returns a ssize_t with a negative value on failure. Coverity-ID: 1055566 Signed-off-by: Matthew Daley Acked-by: Ian Jackson --- tools/libxl/libxl_exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 98bfd71..7eddaef 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -33,7 +33,7 @@ static void check_open_fds(const char *what) for (i = 4; i < 256; i++) { #ifdef __linux__ - size_t len; + ssize_t len; char path[PATH_MAX]; char linkpath[PATH_MAX+1]; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrQ-0003hw-70; Mon, 16 Sep 2013 20:57:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrP-0003hj-Ly for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:31 +0000 Received: from [85.158.139.211:46314] by server-9.bemta-5.messagelabs.com id 26/76-24493-BB077325; Mon, 16 Sep 2013 20:57:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1379365049!2779970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22075 invoked from network); 16 Sep 2013 20:57:30 -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; 16 Sep 2013 20:57:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrN-0003Ua-2O for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrN-0006HQ-0f for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:29 +0000 Date: Mon, 16 Sep 2013 20:57:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix use-after-free in xs_daemon_close event iteration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72b9c3e88c1cd205b39b178ce5e684868a1117c2 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:19 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:51 2013 +0100 mini-os: fix use-after-free in xs_daemon_close event iteration We need to get the next pointer before the freeing of the event. Coverity-ID: 1056173 Signed-off-by: Matthew Daley Acked-By: Samuel Thibault --- extras/mini-os/lib/xs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c index a2a1220..c603d17 100644 --- a/extras/mini-os/lib/xs.c +++ b/extras/mini-os/lib/xs.c @@ -29,9 +29,12 @@ struct xs_handle *xs_daemon_open() void xs_daemon_close(struct xs_handle *h) { int fd = _xs_fileno(h); - struct xenbus_event *event; - for (event = files[fd].xenbus.events; event; event = event->next) + struct xenbus_event *event, *next; + for (event = files[fd].xenbus.events; event; event = next) + { + next = event->next; free(event); + } files[fd].type = FTYPE_NONE; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrQ-0003hw-70; Mon, 16 Sep 2013 20:57:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrP-0003hj-Ly for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:31 +0000 Received: from [85.158.139.211:46314] by server-9.bemta-5.messagelabs.com id 26/76-24493-BB077325; Mon, 16 Sep 2013 20:57:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1379365049!2779970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22075 invoked from network); 16 Sep 2013 20:57:30 -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; 16 Sep 2013 20:57:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrN-0003Ua-2O for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrN-0006HQ-0f for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:29 +0000 Date: Mon, 16 Sep 2013 20:57:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix use-after-free in xs_daemon_close event iteration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72b9c3e88c1cd205b39b178ce5e684868a1117c2 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:19 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:14:51 2013 +0100 mini-os: fix use-after-free in xs_daemon_close event iteration We need to get the next pointer before the freeing of the event. Coverity-ID: 1056173 Signed-off-by: Matthew Daley Acked-By: Samuel Thibault --- extras/mini-os/lib/xs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c index a2a1220..c603d17 100644 --- a/extras/mini-os/lib/xs.c +++ b/extras/mini-os/lib/xs.c @@ -29,9 +29,12 @@ struct xs_handle *xs_daemon_open() void xs_daemon_close(struct xs_handle *h) { int fd = _xs_fileno(h); - struct xenbus_event *event; - for (event = files[fd].xenbus.events; event; event = event->next) + struct xenbus_event *event, *next; + for (event = files[fd].xenbus.events; event; event = next) + { + next = event->next; free(event); + } files[fd].type = FTYPE_NONE; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrb-0003jq-AS; Mon, 16 Sep 2013 20:57:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfra-0003jc-16 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:42 +0000 Received: from [85.158.137.68:18701] by server-10.bemta-3.messagelabs.com id E7/28-30473-5C077325; Mon, 16 Sep 2013 20:57:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1379365059!2830620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23231 invoked from network); 16 Sep 2013 20:57:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrX-0003Ug-8H for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrX-0006Hr-6D for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:39 +0000 Date: Mon, 16 Sep 2013 20:57:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: handle possibly overlong _nodename in init_consfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6425b20c0f10eff1843807f83d9cc0895bf91082 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:20 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:02 2013 +0100 mini-os: handle possibly overlong _nodename in init_consfront The only current user that passes a non-NULL _nodename limits it to 64 bytes anyway. Coverity-ID: 1054993 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/console/xenbus.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 23d4d32..4194982 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -70,8 +70,10 @@ struct consfront_dev *init_consfront(char *_nodename) if (!_nodename) snprintf(nodename, sizeof(nodename), "device/console/%d", consfrontends); - else - strncpy(nodename, _nodename, sizeof(nodename)); + else { + strncpy(nodename, _nodename, sizeof(nodename) - 1); + nodename[sizeof(nodename) - 1] = 0; + } printk("******************* CONSFRONT for %s **********\n\n\n", nodename); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57: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 1VLfrb-0003jq-AS; Mon, 16 Sep 2013 20:57:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfra-0003jc-16 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:42 +0000 Received: from [85.158.137.68:18701] by server-10.bemta-3.messagelabs.com id E7/28-30473-5C077325; Mon, 16 Sep 2013 20:57:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1379365059!2830620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23231 invoked from network); 16 Sep 2013 20:57:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrX-0003Ug-8H for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrX-0006Hr-6D for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:39 +0000 Date: Mon, 16 Sep 2013 20:57:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: handle possibly overlong _nodename in init_consfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6425b20c0f10eff1843807f83d9cc0895bf91082 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:20 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:02 2013 +0100 mini-os: handle possibly overlong _nodename in init_consfront The only current user that passes a non-NULL _nodename limits it to 64 bytes anyway. Coverity-ID: 1054993 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/console/xenbus.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 23d4d32..4194982 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -70,8 +70,10 @@ struct consfront_dev *init_consfront(char *_nodename) if (!_nodename) snprintf(nodename, sizeof(nodename), "device/console/%d", consfrontends); - else - strncpy(nodename, _nodename, sizeof(nodename)); + else { + strncpy(nodename, _nodename, sizeof(nodename) - 1); + nodename[sizeof(nodename) - 1] = 0; + } printk("******************* CONSFRONT for %s **********\n\n\n", nodename); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrl-0003mG-D5; Mon, 16 Sep 2013 20:57:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrk-0003lp-13 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:52 +0000 Received: from [85.158.139.211:45276] by server-6.bemta-5.messagelabs.com id 58/4C-05559-FC077325; Mon, 16 Sep 2013 20:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1379365069!2769820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24468 invoked from network); 16 Sep 2013 20:57:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrh-0003Um-DZ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrh-0006Ik-BW for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:49 +0000 Date: Mon, 16 Sep 2013 20:57:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kdd: fix free of array-typed value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da89e7ef29c2e310e620d3ee05e86e9c164cf17b Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:21 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:09 2013 +0100 kdd: fix free of array-typed value g->id is an array and is allocated as part of g itself; it's not a separate allocation. Coverity-ID: 1054980 Signed-off-by: Matthew Daley Acked-by: Tim Deegan Reviewed-by: Andrew Cooper --- tools/debugger/kdd/kdd-xen.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index 4fbea7d..f3f9529 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -619,7 +619,6 @@ void kdd_guest_teardown(kdd_guest *g) { flush_maps(g); xc_interface_close(g->xc_handle); - free(g->id); free(g->hvm_buf); free(g); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:57:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrl-0003mG-D5; Mon, 16 Sep 2013 20:57:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrk-0003lp-13 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:52 +0000 Received: from [85.158.139.211:45276] by server-6.bemta-5.messagelabs.com id 58/4C-05559-FC077325; Mon, 16 Sep 2013 20:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1379365069!2769820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24468 invoked from network); 16 Sep 2013 20:57:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:57:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrh-0003Um-DZ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrh-0006Ik-BW for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:49 +0000 Date: Mon, 16 Sep 2013 20:57:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kdd: fix free of array-typed value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da89e7ef29c2e310e620d3ee05e86e9c164cf17b Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:21 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:09 2013 +0100 kdd: fix free of array-typed value g->id is an array and is allocated as part of g itself; it's not a separate allocation. Coverity-ID: 1054980 Signed-off-by: Matthew Daley Acked-by: Tim Deegan Reviewed-by: Andrew Cooper --- tools/debugger/kdd/kdd-xen.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/debugger/kdd/kdd-xen.c b/tools/debugger/kdd/kdd-xen.c index 4fbea7d..f3f9529 100644 --- a/tools/debugger/kdd/kdd-xen.c +++ b/tools/debugger/kdd/kdd-xen.c @@ -619,7 +619,6 @@ void kdd_guest_teardown(kdd_guest *g) { flush_maps(g); xc_interface_close(g->xc_handle); - free(g->id); free(g->hvm_buf); free(g); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfrv-0003oS-Fg; Mon, 16 Sep 2013 20:58:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrt-0003oA-Vp for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:02 +0000 Received: from [85.158.143.35:2754] by server-2.bemta-4.messagelabs.com id 8F/06-26052-9D077325; Mon, 16 Sep 2013 20:58:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379365079!4566520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5609 invoked from network); 16 Sep 2013 20:58:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrr-0003Uv-Kv for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrr-0006J7-J4 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:59 +0000 Date: Mon, 16 Sep 2013 20:57:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: fix possible, but unlikely, stack overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba033a204b022cd4a2a8fd2c836d874090cb78e9 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:22 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:30 2013 +0100 xenstored: fix possible, but unlikely, stack overflow ...when reading xenbus port from xenfs. Coverity-ID: 1055741 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Jackson --- tools/xenstore/xenstored_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_linux.c b/tools/xenstore/xenstored_linux.c index 5460ca5..cf40213 100644 --- a/tools/xenstore/xenstored_linux.c +++ b/tools/xenstore/xenstored_linux.c @@ -32,7 +32,7 @@ evtchn_port_t xenbus_evtchn(void) if (fd == -1) return -1; - rc = read(fd, str, sizeof(str)); + rc = read(fd, str, sizeof(str) - 1); if (rc == -1) { int err = errno; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfrv-0003oS-Fg; Mon, 16 Sep 2013 20:58:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrt-0003oA-Vp for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:02 +0000 Received: from [85.158.143.35:2754] by server-2.bemta-4.messagelabs.com id 8F/06-26052-9D077325; Mon, 16 Sep 2013 20:58:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379365079!4566520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5609 invoked from network); 16 Sep 2013 20:58:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfrr-0003Uv-Kv for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfrr-0006J7-J4 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:57:59 +0000 Date: Mon, 16 Sep 2013 20:57:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: fix possible, but unlikely, stack overflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba033a204b022cd4a2a8fd2c836d874090cb78e9 Author: Matthew Daley AuthorDate: Wed Sep 11 02:34:22 2013 +1200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:15:30 2013 +0100 xenstored: fix possible, but unlikely, stack overflow ...when reading xenbus port from xenfs. Coverity-ID: 1055741 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Jackson --- tools/xenstore/xenstored_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_linux.c b/tools/xenstore/xenstored_linux.c index 5460ca5..cf40213 100644 --- a/tools/xenstore/xenstored_linux.c +++ b/tools/xenstore/xenstored_linux.c @@ -32,7 +32,7 @@ evtchn_port_t xenbus_evtchn(void) if (fd == -1) return -1; - rc = read(fd, str, sizeof(str)); + rc = read(fd, str, sizeof(str) - 1); if (rc == -1) { int err = errno; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs5-0003qa-JE; Mon, 16 Sep 2013 20:58:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs4-0003qJ-Bg for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:12 +0000 Received: from [193.109.254.147:38914] by server-5.bemta-14.messagelabs.com id 3D/60-04931-3E077325; Mon, 16 Sep 2013 20:58:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1379365090!1789526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15057 invoked from network); 16 Sep 2013 20:58:10 -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; 16 Sep 2013 20:58:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs1-0003VU-R7 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfs1-0006Jj-PL for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:09 +0000 Date: Mon, 16 Sep 2013 20:58:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Spice vdagent support for upstream qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17b29c1cd830acf8b8ecbc6080264cc5b8ad3c6f Author: Fabio Fantoni AuthorDate: Tue Sep 10 16:46:13 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:18:18 2013 +0100 libxl: Spice vdagent support for upstream qemu Usage: - spicevdagent=1|0 (default=0) Enables spice vdagent. The Spice vdagent is an optional component for enhancing user experience and performing guest-oriented management tasks. Its features includes: client mouse mode (no need to grab mouse by client, no mouse lag), automatic adjustment of screen resolution, copy and paste (text and image) between client and domU. It also requires vdagent service installed on domU o.s. to work. - spice_clipboard_sharing=1|0 (default=0) Enables Spice clipboard sharing (copy/paste). It requires spicevdagent enabled. Signed-off-by: Fabio Fantoni Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 14 ++++++++++++++ tools/libxl/libxl.h | 11 +++++++++++ tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dm.c | 10 ++++++++++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 4 ++++ 6 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 08d6cc4..769767b 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1130,6 +1130,20 @@ Specify the ticket password which is used by a client for connection. Whether SPICE agent is used for client mouse mode. The default is true (1) (turn on) +=item B + +Enables spice vdagent. The Spice vdagent is an optional component for +enhancing user experience and performing guest-oriented management +tasks. Its features includes: client mouse mode (no need to grab mouse +by client, no mouse lag), automatic adjustment of screen resolution, +copy and paste (text and image) between client and domU. It also +requires vdagent service installed on domU o.s. to work. The default is 0. + +=item B + +Enables Spice clipboard sharing (copy/paste). It requires spicevdagent +enabled. The default is false (0). + =back =head3 Miscellaneous Emulated Hardware diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index be19bf5..4cab294 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -344,6 +344,17 @@ */ #define LIBXL_HAVE_DOMINFO_OUTSTANDING_MEMKB 1 +/* + * LIBXL_HAVE_SPICE_VDAGENT + * + * If defined, then the libxl_spice_info structure will contain a boolean type: + * vdagent and clipboard_sharing. These values define if Spice vdagent and + * clipboard sharing are enabled. + * + * If this is not defined, the Spice vdagent support is ignored. + */ +#define LIBXL_HAVE_SPICE_VDAGENT 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0c32d0b..7567238 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -272,6 +272,9 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.spice.disable_ticketing, false); libxl_defbool_setdefault(&b_info->u.hvm.spice.agent_mouse, true); + libxl_defbool_setdefault(&b_info->u.hvm.spice.vdagent, false); + libxl_defbool_setdefault(&b_info->u.hvm.spice.clipboard_sharing, + false); } libxl_defbool_setdefault(&b_info->u.hvm.nographic, false); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4035b6d..43c3bec 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -351,6 +351,10 @@ static char *dm_spice_options(libxl__gc *gc, opt = libxl__sprintf(gc, "%s,password=%s", opt, spice->passwd); opt = libxl__sprintf(gc, "%s,agent-mouse=%s", opt, libxl_defbool_val(spice->agent_mouse) ? "on" : "off"); + + if (!libxl_defbool_val(spice->clipboard_sharing)) + opt = libxl__sprintf(gc, "%s,disable-copy-paste", opt); + return opt; } @@ -472,6 +476,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); + if (libxl_defbool_val(b_info->u.hvm.spice.vdagent)) { + flexarray_vappend(dm_args, "-device", "virtio-serial", + "-chardev", "spicevmc,id=vdagent,name=vdagent", "-device", + "virtserialport,chardev=vdagent,name=com.redhat.spice.0", + NULL); + } } switch (b_info->u.hvm.vga.kind) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 10f95f4..049dbb5 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -181,6 +181,8 @@ libxl_spice_info = Struct("spice_info", [ ("disable_ticketing", libxl_defbool), ("passwd", string), ("agent_mouse", libxl_defbool), + ("vdagent", libxl_defbool), + ("clipboard_sharing", libxl_defbool), ]) libxl_sdl_info = Struct("sdl_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 35b3e29..3d7eaad 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1495,6 +1495,10 @@ skip_vfb: &b_info->u.hvm.spice.passwd, 0); xlu_cfg_get_defbool(config, "spiceagent_mouse", &b_info->u.hvm.spice.agent_mouse, 0); + xlu_cfg_get_defbool(config, "spicevdagent", + &b_info->u.hvm.spice.vdagent, 0); + xlu_cfg_get_defbool(config, "spice_clipboard_sharing", + &b_info->u.hvm.spice.clipboard_sharing, 0); xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0); xlu_cfg_get_defbool(config, "gfx_passthru", &b_info->u.hvm.gfx_passthru, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs5-0003qa-JE; Mon, 16 Sep 2013 20:58:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs4-0003qJ-Bg for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:12 +0000 Received: from [193.109.254.147:38914] by server-5.bemta-14.messagelabs.com id 3D/60-04931-3E077325; Mon, 16 Sep 2013 20:58:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1379365090!1789526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15057 invoked from network); 16 Sep 2013 20:58:10 -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; 16 Sep 2013 20:58:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfs1-0003VU-R7 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfs1-0006Jj-PL for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:09 +0000 Date: Mon, 16 Sep 2013 20:58:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Spice vdagent support for upstream qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17b29c1cd830acf8b8ecbc6080264cc5b8ad3c6f Author: Fabio Fantoni AuthorDate: Tue Sep 10 16:46:13 2013 +0200 Commit: Ian Campbell CommitDate: Fri Sep 13 13:18:18 2013 +0100 libxl: Spice vdagent support for upstream qemu Usage: - spicevdagent=1|0 (default=0) Enables spice vdagent. The Spice vdagent is an optional component for enhancing user experience and performing guest-oriented management tasks. Its features includes: client mouse mode (no need to grab mouse by client, no mouse lag), automatic adjustment of screen resolution, copy and paste (text and image) between client and domU. It also requires vdagent service installed on domU o.s. to work. - spice_clipboard_sharing=1|0 (default=0) Enables Spice clipboard sharing (copy/paste). It requires spicevdagent enabled. Signed-off-by: Fabio Fantoni Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 14 ++++++++++++++ tools/libxl/libxl.h | 11 +++++++++++ tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dm.c | 10 ++++++++++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 4 ++++ 6 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 08d6cc4..769767b 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1130,6 +1130,20 @@ Specify the ticket password which is used by a client for connection. Whether SPICE agent is used for client mouse mode. The default is true (1) (turn on) +=item B + +Enables spice vdagent. The Spice vdagent is an optional component for +enhancing user experience and performing guest-oriented management +tasks. Its features includes: client mouse mode (no need to grab mouse +by client, no mouse lag), automatic adjustment of screen resolution, +copy and paste (text and image) between client and domU. It also +requires vdagent service installed on domU o.s. to work. The default is 0. + +=item B + +Enables Spice clipboard sharing (copy/paste). It requires spicevdagent +enabled. The default is false (0). + =back =head3 Miscellaneous Emulated Hardware diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index be19bf5..4cab294 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -344,6 +344,17 @@ */ #define LIBXL_HAVE_DOMINFO_OUTSTANDING_MEMKB 1 +/* + * LIBXL_HAVE_SPICE_VDAGENT + * + * If defined, then the libxl_spice_info structure will contain a boolean type: + * vdagent and clipboard_sharing. These values define if Spice vdagent and + * clipboard sharing are enabled. + * + * If this is not defined, the Spice vdagent support is ignored. + */ +#define LIBXL_HAVE_SPICE_VDAGENT 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0c32d0b..7567238 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -272,6 +272,9 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.spice.disable_ticketing, false); libxl_defbool_setdefault(&b_info->u.hvm.spice.agent_mouse, true); + libxl_defbool_setdefault(&b_info->u.hvm.spice.vdagent, false); + libxl_defbool_setdefault(&b_info->u.hvm.spice.clipboard_sharing, + false); } libxl_defbool_setdefault(&b_info->u.hvm.nographic, false); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4035b6d..43c3bec 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -351,6 +351,10 @@ static char *dm_spice_options(libxl__gc *gc, opt = libxl__sprintf(gc, "%s,password=%s", opt, spice->passwd); opt = libxl__sprintf(gc, "%s,agent-mouse=%s", opt, libxl_defbool_val(spice->agent_mouse) ? "on" : "off"); + + if (!libxl_defbool_val(spice->clipboard_sharing)) + opt = libxl__sprintf(gc, "%s,disable-copy-paste", opt); + return opt; } @@ -472,6 +476,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); + if (libxl_defbool_val(b_info->u.hvm.spice.vdagent)) { + flexarray_vappend(dm_args, "-device", "virtio-serial", + "-chardev", "spicevmc,id=vdagent,name=vdagent", "-device", + "virtserialport,chardev=vdagent,name=com.redhat.spice.0", + NULL); + } } switch (b_info->u.hvm.vga.kind) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 10f95f4..049dbb5 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -181,6 +181,8 @@ libxl_spice_info = Struct("spice_info", [ ("disable_ticketing", libxl_defbool), ("passwd", string), ("agent_mouse", libxl_defbool), + ("vdagent", libxl_defbool), + ("clipboard_sharing", libxl_defbool), ]) libxl_sdl_info = Struct("sdl_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 35b3e29..3d7eaad 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1495,6 +1495,10 @@ skip_vfb: &b_info->u.hvm.spice.passwd, 0); xlu_cfg_get_defbool(config, "spiceagent_mouse", &b_info->u.hvm.spice.agent_mouse, 0); + xlu_cfg_get_defbool(config, "spicevdagent", + &b_info->u.hvm.spice.vdagent, 0); + xlu_cfg_get_defbool(config, "spice_clipboard_sharing", + &b_info->u.hvm.spice.clipboard_sharing, 0); xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0); xlu_cfg_get_defbool(config, "gfx_passthru", &b_info->u.hvm.gfx_passthru, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsG-0003tC-BZ; Mon, 16 Sep 2013 20:58:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsE-0003sS-80 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:22 +0000 Received: from [193.109.254.147:10121] by server-7.bemta-14.messagelabs.com id 37/E4-04456-DE077325; Mon, 16 Sep 2013 20:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1379365100!214214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31803 invoked from network); 16 Sep 2013 20:58:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsC-0003Va-0p for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsB-0006K5-V2 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:19 +0000 Date: Mon, 16 Sep 2013 20:58:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/tests: tweak .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 255d252c0afafd0d2b6a9e4c2ad4dadbd2f00051 Author: Andrew Cooper AuthorDate: Tue Sep 10 14:53:50 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 13:18:43 2013 +0100 tools/tests: tweak .gitignore c/s e7803f184a moved x86_emulate and friends into their own subdirectory. c/s cc8ad39c1f introduced xen-access, but seemingly without an ingore. For both of the above add/adjust the ingore rules for generated files. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- .gitignore | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c82a372..8e539b4 100644 --- a/.gitignore +++ b/.gitignore @@ -230,10 +230,11 @@ 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/x86_emulator/blowfish.bin +tools/tests/x86_emulator/blowfish.h +tools/tests/x86_emulator/test_x86_emulator +tools/tests/x86_emulator/x86_emulate +tools/tests/xen-access/xen-access tools/tests/regression/installed/* tools/tests/regression/build/* tools/tests/regression/downloads/* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsG-0003tC-BZ; Mon, 16 Sep 2013 20:58:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsE-0003sS-80 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:22 +0000 Received: from [193.109.254.147:10121] by server-7.bemta-14.messagelabs.com id 37/E4-04456-DE077325; Mon, 16 Sep 2013 20:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1379365100!214214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31803 invoked from network); 16 Sep 2013 20:58:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsC-0003Va-0p for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsB-0006K5-V2 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:19 +0000 Date: Mon, 16 Sep 2013 20:58:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/tests: tweak .gitignore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 255d252c0afafd0d2b6a9e4c2ad4dadbd2f00051 Author: Andrew Cooper AuthorDate: Tue Sep 10 14:53:50 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 13:18:43 2013 +0100 tools/tests: tweak .gitignore c/s e7803f184a moved x86_emulate and friends into their own subdirectory. c/s cc8ad39c1f introduced xen-access, but seemingly without an ingore. For both of the above add/adjust the ingore rules for generated files. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- .gitignore | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c82a372..8e539b4 100644 --- a/.gitignore +++ b/.gitignore @@ -230,10 +230,11 @@ 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/x86_emulator/blowfish.bin +tools/tests/x86_emulator/blowfish.h +tools/tests/x86_emulator/test_x86_emulator +tools/tests/x86_emulator/x86_emulate +tools/tests/xen-access/xen-access tools/tests/regression/installed/* tools/tests/regression/build/* tools/tests/regression/downloads/* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsQ-0003wv-EH; Mon, 16 Sep 2013 20:58:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsO-0003vf-Lz for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:32 +0000 Received: from [85.158.139.211:48038] by server-4.bemta-5.messagelabs.com id F9/5D-17194-7F077325; Mon, 16 Sep 2013 20:58:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379365110!2765467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27656 invoked from network); 16 Sep 2013 20:58:31 -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; 16 Sep 2013 20:58:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsM-0003Vi-7D for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsM-0006Kg-5u for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:30 +0000 Date: Mon, 16 Sep 2013 20:58:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c71a3e6d83fb6d03eeae8df08eafd4ea02d9e278 Merge: a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 255d252c0afafd0d2b6a9e4c2ad4dadbd2f00051 Author: Jan Beulich AuthorDate: Fri Sep 13 14:28:46 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:28:46 2013 +0200 Merge. .gitignore | 9 +- docs/man/xl.cfg.pod.5 | 14 + docs/misc/arm/booting.txt | 30 +++ extras/mini-os/console/xenbus.c | 6 +- extras/mini-os/lib/xs.c | 7 +- tools/debugger/kdd/kdd-xen.c | 1 - tools/libxc/xc_core.c | 20 +-- tools/libxc/xc_cpuid_x86.c | 8 +- tools/libxc/xc_dom_boot.c | 31 +-- tools/libxc/xc_dom_x86.c | 13 +- tools/libxc/xc_domain.c | 149 +++++++++++- tools/libxc/xc_domain_restore.c | 13 +- tools/libxc/xc_offline_page.c | 192 +++------------ tools/libxc/xc_pagetab.c | 8 +- tools/libxc/xc_private.c | 8 +- tools/libxc/xc_resume.c | 21 +-- tools/libxc/xenctrl.h | 13 + tools/libxc/xenguest.h | 17 ++ tools/libxc/xg_private.h | 9 + tools/libxc/xg_save_restore.h | 9 +- tools/libxl/libxl.c | 11 +- tools/libxl/libxl.h | 11 + tools/libxl/libxl_create.c | 3 + tools/libxl/libxl_dm.c | 10 + tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_types.idl | 2 + tools/libxl/xl_cmdimpl.c | 6 +- tools/misc/Makefile | 7 +- tools/misc/xen-mfndump.c | 425 ++++++++++++++++++++++++++++++++ tools/xenstat/libxenstat/src/xenstat.c | 14 +- tools/xenstore/xenstored_linux.c | 2 +- tools/xentrace/xenctx.c | 9 +- 32 files changed, 788 insertions(+), 292 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsQ-0003wv-EH; Mon, 16 Sep 2013 20:58:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsO-0003vf-Lz for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:32 +0000 Received: from [85.158.139.211:48038] by server-4.bemta-5.messagelabs.com id F9/5D-17194-7F077325; Mon, 16 Sep 2013 20:58:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1379365110!2765467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27656 invoked from network); 16 Sep 2013 20:58:31 -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; 16 Sep 2013 20:58:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsM-0003Vi-7D for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsM-0006Kg-5u for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:30 +0000 Date: Mon, 16 Sep 2013 20:58:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c71a3e6d83fb6d03eeae8df08eafd4ea02d9e278 Merge: a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 255d252c0afafd0d2b6a9e4c2ad4dadbd2f00051 Author: Jan Beulich AuthorDate: Fri Sep 13 14:28:46 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:28:46 2013 +0200 Merge. .gitignore | 9 +- docs/man/xl.cfg.pod.5 | 14 + docs/misc/arm/booting.txt | 30 +++ extras/mini-os/console/xenbus.c | 6 +- extras/mini-os/lib/xs.c | 7 +- tools/debugger/kdd/kdd-xen.c | 1 - tools/libxc/xc_core.c | 20 +-- tools/libxc/xc_cpuid_x86.c | 8 +- tools/libxc/xc_dom_boot.c | 31 +-- tools/libxc/xc_dom_x86.c | 13 +- tools/libxc/xc_domain.c | 149 +++++++++++- tools/libxc/xc_domain_restore.c | 13 +- tools/libxc/xc_offline_page.c | 192 +++------------ tools/libxc/xc_pagetab.c | 8 +- tools/libxc/xc_private.c | 8 +- tools/libxc/xc_resume.c | 21 +-- tools/libxc/xenctrl.h | 13 + tools/libxc/xenguest.h | 17 ++ tools/libxc/xg_private.h | 9 + tools/libxc/xg_save_restore.h | 9 +- tools/libxl/libxl.c | 11 +- tools/libxl/libxl.h | 11 + tools/libxl/libxl_create.c | 3 + tools/libxl/libxl_dm.c | 10 + tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_types.idl | 2 + tools/libxl/xl_cmdimpl.c | 6 +- tools/misc/Makefile | 7 +- tools/misc/xen-mfndump.c | 425 ++++++++++++++++++++++++++++++++ tools/xenstat/libxenstat/src/xenstat.c | 14 +- tools/xenstore/xenstored_linux.c | 2 +- tools/xentrace/xenctx.c | 9 +- 32 files changed, 788 insertions(+), 292 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsZ-0003zU-Gq; Mon, 16 Sep 2013 20:58:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsZ-0003z9-0E for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:43 +0000 Received: from [85.158.137.68:8322] by server-15.bemta-3.messagelabs.com id E3/EF-21409-20177325; Mon, 16 Sep 2013 20:58:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1379365120!2841616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25199 invoked from network); 16 Sep 2013 20:58:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsW-0003Vr-E2 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsW-0006LB-Ae for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:40 +0000 Date: Mon, 16 Sep 2013 20:58:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched/credit: Remove redundant assignments from alloc_* functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c57b3fbdf2706a9441680cdae652c959b40dffe Author: Andrew Cooper AuthorDate: Fri Sep 13 14:30:02 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:30:02 2013 +0200 sched/credit: Remove redundant assignments from alloc_* functions Noticed because Coverity was complaining at the atomic_set(), but because of the use of xzalloc(), these assignments of 0 are completely redundent. Signed-off-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/sched_credit.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 0b81662..dbe6de6 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -858,8 +858,6 @@ csched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) INIT_LIST_HEAD(&svc->active_vcpu_elem); svc->sdom = dd; svc->vcpu = vc; - atomic_set(&svc->credit, 0); - svc->flags = 0U; svc->pri = is_idle_domain(vc->domain) ? CSCHED_PRI_IDLE : CSCHED_PRI_TS_UNDER; SCHED_VCPU_STATS_RESET(svc); @@ -1081,11 +1079,9 @@ csched_alloc_domdata(const struct scheduler *ops, struct domain *dom) /* Initialize credit and weight */ INIT_LIST_HEAD(&sdom->active_vcpu); - sdom->active_vcpu_count = 0; INIT_LIST_HEAD(&sdom->active_sdom_elem); sdom->dom = dom; sdom->weight = CSCHED_DEFAULT_WEIGHT; - sdom->cap = 0U; return (void *)sdom; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsZ-0003zU-Gq; Mon, 16 Sep 2013 20:58:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsZ-0003z9-0E for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:43 +0000 Received: from [85.158.137.68:8322] by server-15.bemta-3.messagelabs.com id E3/EF-21409-20177325; Mon, 16 Sep 2013 20:58:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1379365120!2841616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25199 invoked from network); 16 Sep 2013 20:58:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:58:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsW-0003Vr-E2 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsW-0006LB-Ae for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:40 +0000 Date: Mon, 16 Sep 2013 20:58:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched/credit: Remove redundant assignments from alloc_* functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c57b3fbdf2706a9441680cdae652c959b40dffe Author: Andrew Cooper AuthorDate: Fri Sep 13 14:30:02 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 13 14:30:02 2013 +0200 sched/credit: Remove redundant assignments from alloc_* functions Noticed because Coverity was complaining at the atomic_set(), but because of the use of xzalloc(), these assignments of 0 are completely redundent. Signed-off-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/sched_credit.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 0b81662..dbe6de6 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -858,8 +858,6 @@ csched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) INIT_LIST_HEAD(&svc->active_vcpu_elem); svc->sdom = dd; svc->vcpu = vc; - atomic_set(&svc->credit, 0); - svc->flags = 0U; svc->pri = is_idle_domain(vc->domain) ? CSCHED_PRI_IDLE : CSCHED_PRI_TS_UNDER; SCHED_VCPU_STATS_RESET(svc); @@ -1081,11 +1079,9 @@ csched_alloc_domdata(const struct scheduler *ops, struct domain *dom) /* Initialize credit and weight */ INIT_LIST_HEAD(&sdom->active_vcpu); - sdom->active_vcpu_count = 0; INIT_LIST_HEAD(&sdom->active_sdom_elem); sdom->dom = dom; sdom->weight = CSCHED_DEFAULT_WEIGHT; - sdom->cap = 0U; return (void *)sdom; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsj-00042F-KH; Mon, 16 Sep 2013 20:58:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsj-000420-2p for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:53 +0000 Received: from [85.158.139.211:48666] by server-4.bemta-5.messagelabs.com id 23/8D-17194-C0177325; Mon, 16 Sep 2013 20:58:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1379365130!2771155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6380 invoked from network); 16 Sep 2013 20:58:51 -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; 16 Sep 2013 20:58:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsg-0003Vx-JY for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsg-0006MG-Ha for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:50 +0000 Date: Mon, 16 Sep 2013 20:58:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .gitignore: add tools/misc/xen-hptool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b639592b24dbe8f48edae17b01aec09b5e4f5a0e Author: Dario Faggioli AuthorDate: Fri Sep 13 14:11:37 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 14:11:37 2013 +0100 .gitignore: add tools/misc/xen-hptool as ae763e4224304 ("tools/misc: introduce xen-mfndump") forgot to do so. Signed-off-by: Dario Faggioli --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8e539b4..3253675 100644 --- a/.gitignore +++ b/.gitignore @@ -356,6 +356,7 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool +tools/misc/xen-mfndump tools/libxl/_*.[ch] tools/libxl/testidl tools/libxl/testidl.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:58:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:58: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 1VLfsj-00042F-KH; Mon, 16 Sep 2013 20:58:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsj-000420-2p for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:53 +0000 Received: from [85.158.139.211:48666] by server-4.bemta-5.messagelabs.com id 23/8D-17194-C0177325; Mon, 16 Sep 2013 20:58:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1379365130!2771155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6380 invoked from network); 16 Sep 2013 20:58:51 -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; 16 Sep 2013 20:58:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsg-0003Vx-JY for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsg-0006MG-Ha for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:58:50 +0000 Date: Mon, 16 Sep 2013 20:58:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .gitignore: add tools/misc/xen-hptool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b639592b24dbe8f48edae17b01aec09b5e4f5a0e Author: Dario Faggioli AuthorDate: Fri Sep 13 14:11:37 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 13 14:11:37 2013 +0100 .gitignore: add tools/misc/xen-hptool as ae763e4224304 ("tools/misc: introduce xen-mfndump") forgot to do so. Signed-off-by: Dario Faggioli --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8e539b4..3253675 100644 --- a/.gitignore +++ b/.gitignore @@ -356,6 +356,7 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool +tools/misc/xen-mfndump tools/libxl/_*.[ch] tools/libxl/testidl tools/libxl/testidl.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLfsu-00044p-Nn; Mon, 16 Sep 2013 20:59:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfst-00044W-AX for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:03 +0000 Received: from [85.158.139.211:48918] by server-1.bemta-5.messagelabs.com id E2/E2-26518-61177325; Mon, 16 Sep 2013 20:59:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379365140!87779!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21922 invoked from network); 16 Sep 2013 20:59:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsq-0003W6-Oa for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsq-0006Mj-NJ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:00 +0000 Date: Mon, 16 Sep 2013 20:59:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen-mfndump: Use inttypes.h to format uint64_t types. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 593470233ff38385df9dcf5690cc58c7a4fb290d Author: Ian Campbell AuthorDate: Sat Sep 14 08:38:26 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 14 08:40:17 2013 +0100 xen-mfndump: Use inttypes.h to format uint64_t types. Fixes 32-bit build: cc1: warnings being treated as errors xen-mfndump.c: In function 'dump_ptes_func': xen-mfndump.c:236: error: format '%lx' expects type 'long unsigned int', but argument 3 has type 'uint64_t' xen-mfndump.c: In function 'lookup_pte_func': xen-mfndump.c:305: error: format '%lx' expects type 'long unsigned int', but argument 5 has type 'uint64_t' Signed-off-by: Ian Campbell --- tools/misc/xen-mfndump.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index 3e8302e..ce73e5b 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "xg_save_restore.h" @@ -233,7 +234,7 @@ int dump_ptes_func(int argc, char *argv[]) printf("\n"); for ( i = 0; i < pte_num; i++ ) - printf(" pte[%lu]: 0x%lx\n", i, ((const uint64_t*)page)[i]); + printf(" pte[%lu]: 0x%"PRIx64"\n", i, ((const uint64_t*)page)[i]); printf(" --- End of PTEs for domain %d, pfn=0x%lx (mfn=0x%lx) ---\n", domid, pfn, minfo.p2m_table[pfn]); @@ -301,7 +302,7 @@ int lookup_pte_func(int argc, char *argv[]) #define __MADDR_BITS_X86 ((minfo.guest_width == 8) ? 52 : 44) #define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - PAGE_SHIFT_X86)) - 1) if ( ((pte >> PAGE_SHIFT_X86) & __MFN_MASK_X86) == mfn) - printf(" 0x%lx <-- [0x%lx][%lu]: 0x%lx\n", + printf(" 0x%lx <-- [0x%lx][%lu]: 0x%"PRIx64"\n", mfn, minfo.p2m_table[i], j, pte); #undef __MADDR_BITS_X86 #undef __MFN_MASK_X8 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLfsu-00044p-Nn; Mon, 16 Sep 2013 20:59:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfst-00044W-AX for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:03 +0000 Received: from [85.158.139.211:48918] by server-1.bemta-5.messagelabs.com id E2/E2-26518-61177325; Mon, 16 Sep 2013 20:59:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379365140!87779!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21922 invoked from network); 16 Sep 2013 20:59:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfsq-0003W6-Oa for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLfsq-0006Mj-NJ for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:00 +0000 Date: Mon, 16 Sep 2013 20:59:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen-mfndump: Use inttypes.h to format uint64_t types. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 593470233ff38385df9dcf5690cc58c7a4fb290d Author: Ian Campbell AuthorDate: Sat Sep 14 08:38:26 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 14 08:40:17 2013 +0100 xen-mfndump: Use inttypes.h to format uint64_t types. Fixes 32-bit build: cc1: warnings being treated as errors xen-mfndump.c: In function 'dump_ptes_func': xen-mfndump.c:236: error: format '%lx' expects type 'long unsigned int', but argument 3 has type 'uint64_t' xen-mfndump.c: In function 'lookup_pte_func': xen-mfndump.c:305: error: format '%lx' expects type 'long unsigned int', but argument 5 has type 'uint64_t' Signed-off-by: Ian Campbell --- tools/misc/xen-mfndump.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index 3e8302e..ce73e5b 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "xg_save_restore.h" @@ -233,7 +234,7 @@ int dump_ptes_func(int argc, char *argv[]) printf("\n"); for ( i = 0; i < pte_num; i++ ) - printf(" pte[%lu]: 0x%lx\n", i, ((const uint64_t*)page)[i]); + printf(" pte[%lu]: 0x%"PRIx64"\n", i, ((const uint64_t*)page)[i]); printf(" --- End of PTEs for domain %d, pfn=0x%lx (mfn=0x%lx) ---\n", domid, pfn, minfo.p2m_table[pfn]); @@ -301,7 +302,7 @@ int lookup_pte_func(int argc, char *argv[]) #define __MADDR_BITS_X86 ((minfo.guest_width == 8) ? 52 : 44) #define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - PAGE_SHIFT_X86)) - 1) if ( ((pte >> PAGE_SHIFT_X86) & __MFN_MASK_X86) == mfn) - printf(" 0x%lx <-- [0x%lx][%lu]: 0x%lx\n", + printf(" 0x%lx <-- [0x%lx][%lu]: 0x%"PRIx64"\n", mfn, minfo.p2m_table[i], j, pte); #undef __MADDR_BITS_X86 #undef __MFN_MASK_X8 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftF-00048W-RC; Mon, 16 Sep 2013 20:59:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftE-00048K-Uc for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:25 +0000 Received: from [85.158.139.211:49705] by server-5.bemta-5.messagelabs.com id 54/91-29992-C2177325; Mon, 16 Sep 2013 20:59:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379365161!2773178!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6353 invoked from network); 16 Sep 2013 20:59:22 -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; 16 Sep 2013 20:59:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftB-0003Wi-6W for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftB-0006Nf-4u for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:21 +0000 Date: Mon, 16 Sep 2013 20:59:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD-Vi: Fix IVRS HPET special->handle override X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2fd0975f4d61ba7214297e063afe029077004fd3 Author: Suravee Suthikulpanit AuthorDate: Mon Sep 16 12:23:50 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:23:50 2013 +0200 AMD-Vi: Fix IVRS HPET special->handle override Signed-off-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 89b359c..9feab86 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -671,6 +671,7 @@ static void __init parse_ivrs_hpet(char *str) if ( !s || *s ) return; + hpet_sbdf.id = id; hpet_sbdf.bdf = PCI_BDF(bus, dev, func); hpet_sbdf.seg = seg; hpet_sbdf.cmdline = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftF-00048W-RC; Mon, 16 Sep 2013 20:59:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftE-00048K-Uc for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:25 +0000 Received: from [85.158.139.211:49705] by server-5.bemta-5.messagelabs.com id 54/91-29992-C2177325; Mon, 16 Sep 2013 20:59:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379365161!2773178!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6353 invoked from network); 16 Sep 2013 20:59:22 -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; 16 Sep 2013 20:59:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftB-0003Wi-6W for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftB-0006Nf-4u for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:21 +0000 Date: Mon, 16 Sep 2013 20:59:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD-Vi: Fix IVRS HPET special->handle override X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2fd0975f4d61ba7214297e063afe029077004fd3 Author: Suravee Suthikulpanit AuthorDate: Mon Sep 16 12:23:50 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:23:50 2013 +0200 AMD-Vi: Fix IVRS HPET special->handle override Signed-off-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 89b359c..9feab86 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -671,6 +671,7 @@ static void __init parse_ivrs_hpet(char *str) if ( !s || *s ) return; + hpet_sbdf.id = id; hpet_sbdf.bdf = PCI_BDF(bus, dev, func); hpet_sbdf.seg = seg; hpet_sbdf.cmdline = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftI-00049Q-UT; Mon, 16 Sep 2013 20:59:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftH-000493-GO for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:27 +0000 Received: from [193.109.254.147:18097] by server-16.bemta-14.messagelabs.com id 76/C9-06264-E2177325; Mon, 16 Sep 2013 20:59:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379365165!2429468!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20288 invoked from network); 16 Sep 2013 20:59:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLft1-0003Wf-0n for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLft0-0006NG-TM for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:10 +0000 Date: Mon, 16 Sep 2013 20:59:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/vpmu: Prevent dump handlers from incorrectly mutating state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42c5b1214071d363a52c6356dfe2ed820f500849 Author: Andrew Cooper AuthorDate: Mon Sep 16 12:22:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:22:20 2013 +0200 hvm/vpmu: Prevent dump handlers from incorrectly mutating state Discovered by Coverity, CID 1055181 core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it was intending to check for it. Signed-off-by: Andrew Cooper This would have been avoided if the dump function declared all its pointers "const" - doing this now (also in SVM). Also fixing some indentation issues at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/arch/x86/hvm/svm/vpmu.c | 12 ++++++------ xen/arch/x86/hvm/vmx/vpmu_core2.c | 19 ++++++++++--------- xen/include/asm-x86/hvm/vpmu.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 4d1fbc8..66a3815 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu *v) } /* VPMU part of the 'q' keyhandler */ -static void amd_vpmu_dump(struct vcpu *v) +static void amd_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - struct amd_vpmu_context *ctxt = vpmu->context; + const struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct amd_vpmu_context *ctxt = vpmu->context; unsigned int i; printk(" VPMU state: 0x%x ", vpmu->flags); @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v) rdmsrl(ctrls[i], ctrl); rdmsrl(counters[i], cntr); - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n", - ctrls[i], ctxt->ctrls[i], ctrl, - counters[i], ctxt->counters[i], cntr); + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n", + ctrls[i], ctxt->ctrls[i], ctrl, + counters[i], ctxt->counters[i], cntr); } } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8c556c7..2682223 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, } /* Dump vpmu info on console, called in the context of keyhandler 'q'. */ -static void core2_vpmu_dump(struct vcpu *v) +static void core2_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct vpmu_struct *vpmu = vcpu_vpmu(v); int i, num; - struct core2_vpmu_context *core2_vpmu_cxt = NULL; + const struct core2_vpmu_context *core2_vpmu_cxt = NULL; u64 val; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_RUNNING) ) { - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) ) + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) printk(" vPMU loaded\n"); else printk(" vPMU allocated\n"); @@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu *v) /* Print the contents of the counter and its configuration msr. */ for ( i = 0; i < num; i++ ) { - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair; + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair; + if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] ) printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n", - i, msr_pair[i].counter, msr_pair[i].control); + i, msr_pair[i].counter, msr_pair[i].control); } /* * The configuration of the fixed counter is 4 bits each in the @@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu *v) for ( i = 0; i < core2_fix_counters.num; i++ ) { if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] ) - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n", - i, core2_vpmu_cxt->fix_counters[i], - val & FIXED_CTR_CTRL_MASK); + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n", + i, core2_vpmu_cxt->fix_counters[i], + val & FIXED_CTR_CTRL_MASK); val >>= FIXED_CTR_CTRL_BITS; } } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 03b9462..40f63fb 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -54,7 +54,7 @@ struct arch_vpmu_ops { void (*arch_vpmu_destroy)(struct vcpu *v); int (*arch_vpmu_save)(struct vcpu *v); void (*arch_vpmu_load)(struct vcpu *v); - void (*arch_vpmu_dump)(struct vcpu *v); + void (*arch_vpmu_dump)(const struct vcpu *); }; int vmx_vpmu_initialise(struct vcpu *, unsigned int 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 Mon Sep 16 20:59:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftI-00049Q-UT; Mon, 16 Sep 2013 20:59:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftH-000493-GO for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:27 +0000 Received: from [193.109.254.147:18097] by server-16.bemta-14.messagelabs.com id 76/C9-06264-E2177325; Mon, 16 Sep 2013 20:59:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379365165!2429468!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20288 invoked from network); 16 Sep 2013 20:59:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLft1-0003Wf-0n for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLft0-0006NG-TM for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:10 +0000 Date: Mon, 16 Sep 2013 20:59:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvm/vpmu: Prevent dump handlers from incorrectly mutating state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42c5b1214071d363a52c6356dfe2ed820f500849 Author: Andrew Cooper AuthorDate: Mon Sep 16 12:22:20 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:22:20 2013 +0200 hvm/vpmu: Prevent dump handlers from incorrectly mutating state Discovered by Coverity, CID 1055181 core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it was intending to check for it. Signed-off-by: Andrew Cooper This would have been avoided if the dump function declared all its pointers "const" - doing this now (also in SVM). Also fixing some indentation issues at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/arch/x86/hvm/svm/vpmu.c | 12 ++++++------ xen/arch/x86/hvm/vmx/vpmu_core2.c | 19 ++++++++++--------- xen/include/asm-x86/hvm/vpmu.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 4d1fbc8..66a3815 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu *v) } /* VPMU part of the 'q' keyhandler */ -static void amd_vpmu_dump(struct vcpu *v) +static void amd_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - struct amd_vpmu_context *ctxt = vpmu->context; + const struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct amd_vpmu_context *ctxt = vpmu->context; unsigned int i; printk(" VPMU state: 0x%x ", vpmu->flags); @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v) rdmsrl(ctrls[i], ctrl); rdmsrl(counters[i], cntr); - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n", - ctrls[i], ctxt->ctrls[i], ctrl, - counters[i], ctxt->counters[i], cntr); + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n", + ctrls[i], ctxt->ctrls[i], ctrl, + counters[i], ctxt->counters[i], cntr); } } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 8c556c7..2682223 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, } /* Dump vpmu info on console, called in the context of keyhandler 'q'. */ -static void core2_vpmu_dump(struct vcpu *v) +static void core2_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct vpmu_struct *vpmu = vcpu_vpmu(v); int i, num; - struct core2_vpmu_context *core2_vpmu_cxt = NULL; + const struct core2_vpmu_context *core2_vpmu_cxt = NULL; u64 val; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_RUNNING) ) { - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) ) + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) printk(" vPMU loaded\n"); else printk(" vPMU allocated\n"); @@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu *v) /* Print the contents of the counter and its configuration msr. */ for ( i = 0; i < num; i++ ) { - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair; + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair; + if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] ) printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n", - i, msr_pair[i].counter, msr_pair[i].control); + i, msr_pair[i].counter, msr_pair[i].control); } /* * The configuration of the fixed counter is 4 bits each in the @@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu *v) for ( i = 0; i < core2_fix_counters.num; i++ ) { if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] ) - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n", - i, core2_vpmu_cxt->fix_counters[i], - val & FIXED_CTR_CTRL_MASK); + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n", + i, core2_vpmu_cxt->fix_counters[i], + val & FIXED_CTR_CTRL_MASK); val >>= FIXED_CTR_CTRL_BITS; } } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 03b9462..40f63fb 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -54,7 +54,7 @@ struct arch_vpmu_ops { void (*arch_vpmu_destroy)(struct vcpu *v); int (*arch_vpmu_save)(struct vcpu *v); void (*arch_vpmu_load)(struct vcpu *v); - void (*arch_vpmu_dump)(struct vcpu *v); + void (*arch_vpmu_dump)(const struct vcpu *); }; int vmx_vpmu_initialise(struct vcpu *, unsigned int 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 Mon Sep 16 20:59:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftP-0004BG-1V; Mon, 16 Sep 2013 20:59:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftO-0004As-30 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:34 +0000 Received: from [85.158.137.68:33817] by server-17.bemta-3.messagelabs.com id EF/B9-03449-53177325; Mon, 16 Sep 2013 20:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379365171!500782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31742 invoked from network); 16 Sep 2013 20:59:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftL-0003Wr-D8 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftL-0006Rv-AV for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:31 +0000 Date: Mon, 16 Sep 2013 20:59:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD-Vi: also match IVRS overrides on device ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3722827b3719a193df2b4103f61ef8666a0e7d67 Author: Jan Beulich AuthorDate: Mon Sep 16 12:24:19 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:24:19 2013 +0200 AMD-Vi: also match IVRS overrides on device ID Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 9feab86..bd66c65 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -714,6 +714,24 @@ static u16 __init parse_ivhd_device_special( * consistency here --- whether entry's IOAPIC ID is valid and * whether there are conflicting/duplicated entries. */ + apic = find_first_bit(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); + while ( apic < ARRAY_SIZE(ioapic_sbdf) ) + { + if ( ioapic_sbdf[apic].bdf == bdf && + ioapic_sbdf[apic].seg == seg ) + break; + apic = find_next_bit(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf), + apic + 1); + } + if ( apic < ARRAY_SIZE(ioapic_sbdf) ) + { + AMD_IOMMU_DEBUG("IVHD: Command line override present for IO-APIC %#x" + "(IVRS: %#x devID %04x:%02x:%02x.%u)\n", + apic, special->handle, seg, PCI_BUS(bdf), + PCI_SLOT(bdf), PCI_FUNC(bdf)); + break; + } + for ( apic = 0; apic < nr_ioapics; apic++ ) { if ( IO_APIC_ID(apic) != special->handle ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftP-0004BG-1V; Mon, 16 Sep 2013 20:59:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftO-0004As-30 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:34 +0000 Received: from [85.158.137.68:33817] by server-17.bemta-3.messagelabs.com id EF/B9-03449-53177325; Mon, 16 Sep 2013 20:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379365171!500782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31742 invoked from network); 16 Sep 2013 20:59:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftL-0003Wr-D8 for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftL-0006Rv-AV for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:31 +0000 Date: Mon, 16 Sep 2013 20:59:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD-Vi: also match IVRS overrides on device ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3722827b3719a193df2b4103f61ef8666a0e7d67 Author: Jan Beulich AuthorDate: Mon Sep 16 12:24:19 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 12:24:19 2013 +0200 AMD-Vi: also match IVRS overrides on device ID Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 9feab86..bd66c65 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -714,6 +714,24 @@ static u16 __init parse_ivhd_device_special( * consistency here --- whether entry's IOAPIC ID is valid and * whether there are conflicting/duplicated entries. */ + apic = find_first_bit(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); + while ( apic < ARRAY_SIZE(ioapic_sbdf) ) + { + if ( ioapic_sbdf[apic].bdf == bdf && + ioapic_sbdf[apic].seg == seg ) + break; + apic = find_next_bit(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf), + apic + 1); + } + if ( apic < ARRAY_SIZE(ioapic_sbdf) ) + { + AMD_IOMMU_DEBUG("IVHD: Command line override present for IO-APIC %#x" + "(IVRS: %#x devID %04x:%02x:%02x.%u)\n", + apic, special->handle, seg, PCI_BUS(bdf), + PCI_SLOT(bdf), PCI_FUNC(bdf)); + break; + } + for ( apic = 0; apic < nr_ioapics; apic++ ) { if ( IO_APIC_ID(apic) != special->handle ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftZ-0004Dz-7E; Mon, 16 Sep 2013 20:59:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftX-0004DX-Pt for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:43 +0000 Received: from [193.109.254.147:18673] by server-12.bemta-14.messagelabs.com id 7B/4D-27329-F3177325; Mon, 16 Sep 2013 20:59:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379365181!2427542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20781 invoked from network); 16 Sep 2013 20:59:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftV-0003Wz-IH for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftV-0006SL-Gr for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:41 +0000 Date: Mon, 16 Sep 2013 20:59:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add ARINC653 scheduler maintainers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f395582b4e1c669bb4dc28b1431abf215abe491 Author: Nathan Studer AuthorDate: Mon Sep 16 13:12:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 13:12:14 2013 +0200 add ARINC653 scheduler maintainers Previously the ARINC653 scheduler was indirectly maintained by Kathy Hadley and Josh Holtrop being cc'd on changes by George Dunlap. Maintenance is currently being done by Robert VanVossen and myself. To avoid potential communication problems in the future, make Robbie and I the official maintainers. Signed-off-by: Nathan Studer Acked-by: George Dunlap Acked-by: Ian Jackson --- MAINTAINERS | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 843f9e3..adacac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,6 +117,13 @@ M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ +ARINC653 SCHEDULER +M: Nathan Studer +M: Robert VanVossen +S: Supported +F: xen/common/sched_arinc653.c +F: tools/libxc/xc_arinc653.c + ARM (W/ VIRTUALISATION EXTENSIONS) ARCHITECTURE M: Ian Campbell M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftZ-0004Dz-7E; Mon, 16 Sep 2013 20:59:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftX-0004DX-Pt for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:43 +0000 Received: from [193.109.254.147:18673] by server-12.bemta-14.messagelabs.com id 7B/4D-27329-F3177325; Mon, 16 Sep 2013 20:59:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379365181!2427542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20781 invoked from network); 16 Sep 2013 20:59:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftV-0003Wz-IH for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftV-0006SL-Gr for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:41 +0000 Date: Mon, 16 Sep 2013 20:59:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add ARINC653 scheduler maintainers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f395582b4e1c669bb4dc28b1431abf215abe491 Author: Nathan Studer AuthorDate: Mon Sep 16 13:12:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 16 13:12:14 2013 +0200 add ARINC653 scheduler maintainers Previously the ARINC653 scheduler was indirectly maintained by Kathy Hadley and Josh Holtrop being cc'd on changes by George Dunlap. Maintenance is currently being done by Robert VanVossen and myself. To avoid potential communication problems in the future, make Robbie and I the official maintainers. Signed-off-by: Nathan Studer Acked-by: George Dunlap Acked-by: Ian Jackson --- MAINTAINERS | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 843f9e3..adacac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,6 +117,13 @@ M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ +ARINC653 SCHEDULER +M: Nathan Studer +M: Robert VanVossen +S: Supported +F: xen/common/sched_arinc653.c +F: tools/libxc/xc_arinc653.c + ARM (W/ VIRTUALISATION EXTENSIONS) ARCHITECTURE M: Ian Campbell M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftj-0004GR-9y; Mon, 16 Sep 2013 20:59:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfti-0004G3-4f for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:54 +0000 Received: from [85.158.143.35:39995] by server-3.bemta-4.messagelabs.com id 47/D5-08835-94177325; Mon, 16 Sep 2013 20:59:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379365191!4550506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21355 invoked from network); 16 Sep 2013 20:59:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftf-0003X5-Na for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftf-0006TD-ME for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:51 +0000 Date: Mon, 16 Sep 2013 20:59:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl, hotplug/Linux: default to phy backend for raw format 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 0119ce986098a388c8476856a659c89e303d176d Author: Ian Campbell AuthorDate: Mon Sep 16 14:29:47 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 16 14:29:47 2013 +0100 Revert "libxl, hotplug/Linux: default to phy backend for raw format file" This reverts commit 11a63a1660453269ddd1893c15d0a98133b33ca7. The change causes issues with live migration. --- tools/hotplug/Linux/block | 16 +++++++--------- tools/libxl/libxl_linux.c | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index 8d2ee9d..da26e22 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,13 +206,6 @@ and so cannot be mounted ${m2}${when}." t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') -p=$(xenstore_read "$XENBUS_PATH/params") -mode=$(xenstore_read "$XENBUS_PATH/mode") -if [ -b "$p" ]; then - truetype="phy" -elif [ -f "$p" ]; then - truetype="file" -fi case "$command" in add) @@ -224,11 +217,16 @@ case "$command" in exit 0 fi + if [ -n "$t" ] + then + p=$(xenstore_read "$XENBUS_PATH/params") + mode=$(xenstore_read "$XENBUS_PATH/mode") + fi FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $truetype in + case $t in phy) dev=$(expand_dev $p) @@ -321,7 +319,7 @@ mount it read-write in a guest domain." ;; remove) - case $truetype in + case $t in phy) exit 0 ;; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 3cfa6da..37815eb 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { - return 1; + if (!S_ISBLK(st_mode)) { + return 0; } - return 0; + return 1; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 16 20:59:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Sep 2013 20:59: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 1VLftj-0004GR-9y; Mon, 16 Sep 2013 20:59:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLfti-0004G3-4f for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:54 +0000 Received: from [85.158.143.35:39995] by server-3.bemta-4.messagelabs.com id 47/D5-08835-94177325; Mon, 16 Sep 2013 20:59:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379365191!4550506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21355 invoked from network); 16 Sep 2013 20:59:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2013 20:59:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VLftf-0003X5-Na for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VLftf-0006TD-ME for xen-changelog@lists.xensource.com; Mon, 16 Sep 2013 20:59:51 +0000 Date: Mon, 16 Sep 2013 20:59:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "libxl, hotplug/Linux: default to phy backend for raw format 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 0119ce986098a388c8476856a659c89e303d176d Author: Ian Campbell AuthorDate: Mon Sep 16 14:29:47 2013 +0100 Commit: Ian Campbell CommitDate: Mon Sep 16 14:29:47 2013 +0100 Revert "libxl, hotplug/Linux: default to phy backend for raw format file" This reverts commit 11a63a1660453269ddd1893c15d0a98133b33ca7. The change causes issues with live migration. --- tools/hotplug/Linux/block | 16 +++++++--------- tools/libxl/libxl_linux.c | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/hotplug/Linux/block b/tools/hotplug/Linux/block index 8d2ee9d..da26e22 100644 --- a/tools/hotplug/Linux/block +++ b/tools/hotplug/Linux/block @@ -206,13 +206,6 @@ and so cannot be mounted ${m2}${when}." t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') -p=$(xenstore_read "$XENBUS_PATH/params") -mode=$(xenstore_read "$XENBUS_PATH/mode") -if [ -b "$p" ]; then - truetype="phy" -elif [ -f "$p" ]; then - truetype="file" -fi case "$command" in add) @@ -224,11 +217,16 @@ case "$command" in exit 0 fi + if [ -n "$t" ] + then + p=$(xenstore_read "$XENBUS_PATH/params") + mode=$(xenstore_read "$XENBUS_PATH/mode") + fi FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") FRONTEND_UUID=$(xenstore_read_default \ "/local/domain/$FRONTEND_ID/vm" 'unknown') - case $truetype in + case $t in phy) dev=$(expand_dev $p) @@ -321,7 +319,7 @@ mount it read-write in a guest domain." ;; remove) - case $truetype in + case $t in phy) exit 0 ;; diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 3cfa6da..37815eb 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -19,11 +19,11 @@ int libxl__try_phy_backend(mode_t st_mode) { - if (S_ISBLK(st_mode) || S_ISREG(st_mode)) { - return 1; + if (!S_ISBLK(st_mode)) { + return 0; } - return 0; + return 1; } #define EXT_SHIFT 28 -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 21:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Sep 2013 21: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 1VM2tP-0003js-3c; Tue, 17 Sep 2013 21: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 1VM2tO-0003jk-B5 for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:06 +0000 Received: from [85.158.143.35:55227] by server-3.bemta-4.messagelabs.com id 5D/4C-08835-19AC8325; Tue, 17 Sep 2013 21:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379453583!1810!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21671 invoked from network); 17 Sep 2013 21:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2013 21:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VM2tL-0002VF-Kt for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VM2tL-0000T7-3c for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:03 +0000 Date: Tue, 17 Sep 2013 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use LOG_ERRNO rather than ERRNOVAL in libxl_pci.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5e9596cd095e3b96a090002d9e6629a980904eb Author: George Dunlap AuthorDate: Mon Sep 16 14:23:09 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 16 16:47:34 2013 +0100 libxl: Use LOG_ERRNO rather than ERRNOVAL in libxl_pci.c The xc_* functions (now) return -1 on error and set errno. Signed-off-by: George Dunlap CC: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 88bf91e..b9960bb 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -889,7 +889,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i if (flags & PCI_BAR_IO) { rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); fclose(f); return ERROR_FAIL; } @@ -897,7 +897,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); fclose(f); return ERROR_FAIL; } @@ -915,13 +915,13 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i if ((fscanf(f, "%u", &irq) == 1) && irq) { rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_physdev_map_pirq irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); fclose(f); return ERROR_FAIL; } rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_irq_permission irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); fclose(f); return ERROR_FAIL; } @@ -946,7 +946,7 @@ out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); if (rc < 0 && (hvm || errno != ENOSYS)) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_assign_device failed"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_assign_device failed"); return ERROR_FAIL; } } @@ -1220,12 +1220,12 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, if (flags & PCI_BAR_IO) { rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 0); if (rc < 0) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_ioport_permission error 0x%x/0x%x", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_ioport_permission error 0x%x/0x%x", start, size); } else { rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 0); if (rc < 0) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_iomem_permission error 0x%x/0x%x", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_iomem_permission error 0x%x/0x%x", start, size); } } } @@ -1241,11 +1241,11 @@ skip1: if ((fscanf(f, "%u", &irq) == 1) && irq) { rc = xc_physdev_unmap_pirq(ctx->xch, domid, irq); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_physdev_unmap_pirq irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_physdev_unmap_pirq irq=%d", irq); } rc = xc_domain_irq_permission(ctx->xch, domid, irq, 0); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_irq_permission irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_irq_permission irq=%d", irq); } } fclose(f); @@ -1263,7 +1263,7 @@ out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_deassign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); if (rc < 0 && (hvm || errno != ENOSYS)) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_deassign_device failed"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_deassign_device failed"); } stubdomid = libxl_get_stubdom_id(ctx, domid); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 17 21:33:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Sep 2013 21: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 1VM2tP-0003js-3c; Tue, 17 Sep 2013 21: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 1VM2tO-0003jk-B5 for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:06 +0000 Received: from [85.158.143.35:55227] by server-3.bemta-4.messagelabs.com id 5D/4C-08835-19AC8325; Tue, 17 Sep 2013 21:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379453583!1810!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21671 invoked from network); 17 Sep 2013 21:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2013 21:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VM2tL-0002VF-Kt for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VM2tL-0000T7-3c for xen-changelog@lists.xensource.com; Tue, 17 Sep 2013 21:33:03 +0000 Date: Tue, 17 Sep 2013 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use LOG_ERRNO rather than ERRNOVAL in libxl_pci.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5e9596cd095e3b96a090002d9e6629a980904eb Author: George Dunlap AuthorDate: Mon Sep 16 14:23:09 2013 +0100 Commit: Ian Jackson CommitDate: Mon Sep 16 16:47:34 2013 +0100 libxl: Use LOG_ERRNO rather than ERRNOVAL in libxl_pci.c The xc_* functions (now) return -1 on error and set errno. Signed-off-by: George Dunlap CC: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_pci.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 88bf91e..b9960bb 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -889,7 +889,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i if (flags & PCI_BAR_IO) { rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); fclose(f); return ERROR_FAIL; } @@ -897,7 +897,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); fclose(f); return ERROR_FAIL; } @@ -915,13 +915,13 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i if ((fscanf(f, "%u", &irq) == 1) && irq) { rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_physdev_map_pirq irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); fclose(f); return ERROR_FAIL; } rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error: xc_domain_irq_permission irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); fclose(f); return ERROR_FAIL; } @@ -946,7 +946,7 @@ out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); if (rc < 0 && (hvm || errno != ENOSYS)) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_assign_device failed"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_assign_device failed"); return ERROR_FAIL; } } @@ -1220,12 +1220,12 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, if (flags & PCI_BAR_IO) { rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 0); if (rc < 0) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_ioport_permission error 0x%x/0x%x", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_ioport_permission error 0x%x/0x%x", start, size); } else { rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 0); if (rc < 0) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_iomem_permission error 0x%x/0x%x", start, size); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_iomem_permission error 0x%x/0x%x", start, size); } } } @@ -1241,11 +1241,11 @@ skip1: if ((fscanf(f, "%u", &irq) == 1) && irq) { rc = xc_physdev_unmap_pirq(ctx->xch, domid, irq); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_physdev_unmap_pirq irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_physdev_unmap_pirq irq=%d", irq); } rc = xc_domain_irq_permission(ctx->xch, domid, irq, 0); if (rc < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_irq_permission irq=%d", irq); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_irq_permission irq=%d", irq); } } fclose(f); @@ -1263,7 +1263,7 @@ out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_deassign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); if (rc < 0 && (hvm || errno != ENOSYS)) - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_deassign_device failed"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_deassign_device failed"); } stubdomid = libxl_get_stubdom_id(ctx, domid); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22: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 1VNEhs-0004tE-51; Sat, 21 Sep 2013 04:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEhr-0004t5-0p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:07 +0000 Received: from [85.158.139.211:50725] by server-10.bemta-5.messagelabs.com id 9A/70-23973-EEE1D325; Sat, 21 Sep 2013 04:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1379737324!3747326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6932 invoked from network); 21 Sep 2013 04:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEho-0000PL-2m for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEhn-0000mA-Rx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:03 +0000 Date: Sat, 21 Sep 2013 04:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: set mtu from bridge for tap interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3f5f1927f0d3aef9e3d2ce554dbfa0de73487d5 Author: Charles Arnold AuthorDate: Mon Sep 16 14:18:37 2013 -0600 Commit: Ian Campbell CommitDate: Tue Sep 17 15:26:27 2013 +0100 tools/hotplug: set mtu from bridge for tap interface With changeset 22885 support was added for setting the MTU in the vif-bridge script for when a vif interface was set to 'online'. The was not done for the 'add' operation. The 'add' operation was added to the script for when tap devices were specified (c/s 21944). With the setting of the MTU for the 'online' case was there a reason for omitting the 'add'? This patch sets the MTU for both 'online' and 'add' in the vif-bridge script. Signed-off-by: Charles Arnold Acked-by: Ian Campbell --- tools/hotplug/Linux/vif-bridge | 7 ++----- tools/hotplug/Linux/xen-network-common.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 9a6f82a..678262d 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -81,11 +81,7 @@ fi case "$command" in online) setup_virtual_bridge_port "$dev" - mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set $dev mtu $mtu || : - fi + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; @@ -96,6 +92,7 @@ case "$command" in add) setup_virtual_bridge_port "$dev" + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8cff156..50b8711 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -132,3 +132,13 @@ add_to_bridge () { ip link set ${dev} up } +# Usage: set_mtu bridge dev +set_mtu () { + local bridge=$1 + local dev=$2 + mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set ${dev} mtu $mtu || : + fi +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22: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 1VNEhs-0004tE-51; Sat, 21 Sep 2013 04:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEhr-0004t5-0p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:07 +0000 Received: from [85.158.139.211:50725] by server-10.bemta-5.messagelabs.com id 9A/70-23973-EEE1D325; Sat, 21 Sep 2013 04:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1379737324!3747326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6932 invoked from network); 21 Sep 2013 04:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEho-0000PL-2m for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEhn-0000mA-Rx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:03 +0000 Date: Sat, 21 Sep 2013 04:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: set mtu from bridge for tap interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f3f5f1927f0d3aef9e3d2ce554dbfa0de73487d5 Author: Charles Arnold AuthorDate: Mon Sep 16 14:18:37 2013 -0600 Commit: Ian Campbell CommitDate: Tue Sep 17 15:26:27 2013 +0100 tools/hotplug: set mtu from bridge for tap interface With changeset 22885 support was added for setting the MTU in the vif-bridge script for when a vif interface was set to 'online'. The was not done for the 'add' operation. The 'add' operation was added to the script for when tap devices were specified (c/s 21944). With the setting of the MTU for the 'online' case was there a reason for omitting the 'add'? This patch sets the MTU for both 'online' and 'add' in the vif-bridge script. Signed-off-by: Charles Arnold Acked-by: Ian Campbell --- tools/hotplug/Linux/vif-bridge | 7 ++----- tools/hotplug/Linux/xen-network-common.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 9a6f82a..678262d 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -81,11 +81,7 @@ fi case "$command" in online) setup_virtual_bridge_port "$dev" - mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set $dev mtu $mtu || : - fi + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; @@ -96,6 +92,7 @@ case "$command" in add) setup_virtual_bridge_port "$dev" + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8cff156..50b8711 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -132,3 +132,13 @@ add_to_bridge () { ip link set ${dev} up } +# Usage: set_mtu bridge dev +set_mtu () { + local bridge=$1 + local dev=$2 + mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set ${dev} mtu $mtu || : + fi +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi2-0004tz-7v; Sat, 21 Sep 2013 04:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi1-0004tn-I0 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:17 +0000 Received: from [85.158.139.211:29555] by server-4.bemta-5.messagelabs.com id FF/3A-17194-8FE1D325; Sat, 21 Sep 2013 04:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379737334!3744887!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22042 invoked from network); 21 Sep 2013 04:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEhy-0000PS-FH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEhy-0000mY-7X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:14 +0000 Date: Sat, 21 Sep 2013 04:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Constify device_tree_flattened X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fe65ea7397b114c1d90e4a445395955220f099c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:08 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:15 2013 +0100 xen/dts: Constify device_tree_flattened The Flat Device Tree is given by the bootloader. Xen doesn't need to modify it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/setup.c | 12 ++++++++---- xen/common/device_tree.c | 2 +- xen/include/xen/device_tree.h | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 77e2a61..bde041e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -475,7 +475,7 @@ static int map_devices_from_device_tree(struct domain *d) static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) { - void *fdt; + const void *fdt; int new_size; int ret; paddr_t end; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4b31623..aa87fb1 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -289,6 +289,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) unsigned long dtb_pages; unsigned long boot_mfn_start, boot_mfn_end; int i = 0; + void *fdt; /* TODO: Handle non-contiguous memory bank */ if ( !early_info.mem.nr_banks ) @@ -363,8 +364,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * * TODO: handle other payloads too. */ - device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); + fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + device_tree_flattened = fdt; /* Add non-xenheap memory */ s = ram_start; @@ -410,6 +412,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) int bank; unsigned long xenheap_pages = 0; unsigned long dtb_pages; + void *fdt; total_pages = 0; for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ ) @@ -469,8 +472,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * * TODO: handle other payloads too. */ - device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); + fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + device_tree_flattened = fdt; setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index c4f0f2c..a5abdaa 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -26,7 +26,7 @@ #include struct dt_early_info __initdata early_info; -void *device_tree_flattened; +const void *device_tree_flattened; dt_irq_xlate_func dt_irq_xlate; /* Host device tree */ struct dt_device_node *dt_host; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5cc1905..2e5564e 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -164,7 +164,7 @@ typedef int (*device_tree_node_func)(const void *fdt, void *data); extern struct dt_early_info early_info; -extern void *device_tree_flattened; +extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi2-0004tz-7v; Sat, 21 Sep 2013 04:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi1-0004tn-I0 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:17 +0000 Received: from [85.158.139.211:29555] by server-4.bemta-5.messagelabs.com id FF/3A-17194-8FE1D325; Sat, 21 Sep 2013 04:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379737334!3744887!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22042 invoked from network); 21 Sep 2013 04:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEhy-0000PS-FH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEhy-0000mY-7X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:14 +0000 Date: Sat, 21 Sep 2013 04:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Constify device_tree_flattened X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fe65ea7397b114c1d90e4a445395955220f099c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:08 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:15 2013 +0100 xen/dts: Constify device_tree_flattened The Flat Device Tree is given by the bootloader. Xen doesn't need to modify it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/setup.c | 12 ++++++++---- xen/common/device_tree.c | 2 +- xen/include/xen/device_tree.h | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 77e2a61..bde041e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -475,7 +475,7 @@ static int map_devices_from_device_tree(struct domain *d) static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) { - void *fdt; + const void *fdt; int new_size; int ret; paddr_t end; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4b31623..aa87fb1 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -289,6 +289,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) unsigned long dtb_pages; unsigned long boot_mfn_start, boot_mfn_end; int i = 0; + void *fdt; /* TODO: Handle non-contiguous memory bank */ if ( !early_info.mem.nr_banks ) @@ -363,8 +364,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * * TODO: handle other payloads too. */ - device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); + fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + device_tree_flattened = fdt; /* Add non-xenheap memory */ s = ram_start; @@ -410,6 +412,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) int bank; unsigned long xenheap_pages = 0; unsigned long dtb_pages; + void *fdt; total_pages = 0; for ( bank = 0 ; bank < early_info.mem.nr_banks; bank++ ) @@ -469,8 +472,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * * TODO: handle other payloads too. */ - device_tree_flattened = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); - copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); + fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + copy_from_paddr(fdt, dtb_paddr, dtb_size, BUFFERABLE); + device_tree_flattened = fdt; setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index c4f0f2c..a5abdaa 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -26,7 +26,7 @@ #include struct dt_early_info __initdata early_info; -void *device_tree_flattened; +const void *device_tree_flattened; dt_irq_xlate_func dt_irq_xlate; /* Host device tree */ struct dt_device_node *dt_host; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5cc1905..2e5564e 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -164,7 +164,7 @@ typedef int (*device_tree_node_func)(const void *fdt, void *data); extern struct dt_early_info early_info; -extern void *device_tree_flattened; +extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22: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 1VNEiD-0004v6-Ap; Sat, 21 Sep 2013 04:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiC-0004uY-7L for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:28 +0000 Received: from [85.158.137.68:54938] by server-6.bemta-3.messagelabs.com id 90/ED-04812-20F1D325; Sat, 21 Sep 2013 04:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1379737344!3845191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14470 invoked from network); 21 Sep 2013 04:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi8-0000PY-Lq for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEi8-0000nQ-KO for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:24 +0000 Date: Sat, 21 Sep 2013 04:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Prefix device tree macro by dt_ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff2cc632483e3870984c501b99f17f0d0f5bbc5 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:09 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:37 2013 +0100 xen/dts: Prefix device tree macro by dt_ There is 2 macros: for_each_device_node and for_each_property_of_node with a too generic name. Also replace all call-site with the new function names. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 10 +++++----- xen/include/xen/device_tree.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index a5abdaa..2c2dc52 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -624,7 +624,7 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from, struct dt_device_node *dt; dt = from ? from->allnext : dt_host; - for_each_device_node(dt, np) + dt_for_each_device_node(dt, np) if ( np->name && (dt_node_cmp(np->name, name) == 0) ) break; @@ -635,7 +635,7 @@ struct dt_device_node *dt_find_node_by_path(const char *path) { struct dt_device_node *np; - for_each_device_node(dt_host, np) + dt_for_each_device_node(dt_host, np) if ( np->full_name && (dt_node_cmp(np->full_name, path) == 0) ) break; @@ -672,7 +672,7 @@ dt_find_compatible_node(struct dt_device_node *from, struct dt_device_node *dt; dt = from ? from->allnext : dt_host; - for_each_device_node(dt, np) + dt_for_each_device_node(dt, np) { if ( type && !(np->type && (dt_node_cmp(np->type, type) == 0)) ) @@ -1009,7 +1009,7 @@ static const struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) { const struct dt_device_node *np; - for_each_device_node(dt_host, np) + dt_for_each_device_node(dt_host, np) if ( np->phandle == handle ) break; @@ -1679,7 +1679,7 @@ static void __init dt_alias_scan(void) if ( !aliases ) return; - for_each_property_of_node( aliases, pp ) + dt_for_each_property_node( aliases, pp ) { const char *start = pp->name; const char *end = start + strlen(start); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 2e5564e..ca8371e 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -236,10 +236,10 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 #define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 -#define for_each_property_of_node(dn, pp) \ +#define dt_for_each_property_node(dn, pp) \ for ( pp = dn->properties; pp != NULL; pp = pp->next ) -#define for_each_device_node(dt, dn) \ +#define dt_for_each_device_node(dt, dn) \ for ( dn = dt; dn != NULL; dn = dn->allnext ) /* Helper to read a big number; size is in cells (not bytes) */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22: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 1VNEiD-0004v6-Ap; Sat, 21 Sep 2013 04:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiC-0004uY-7L for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:28 +0000 Received: from [85.158.137.68:54938] by server-6.bemta-3.messagelabs.com id 90/ED-04812-20F1D325; Sat, 21 Sep 2013 04:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1379737344!3845191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14470 invoked from network); 21 Sep 2013 04:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEi8-0000PY-Lq for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEi8-0000nQ-KO for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:24 +0000 Date: Sat, 21 Sep 2013 04:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Prefix device tree macro by dt_ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff2cc632483e3870984c501b99f17f0d0f5bbc5 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:09 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:37 2013 +0100 xen/dts: Prefix device tree macro by dt_ There is 2 macros: for_each_device_node and for_each_property_of_node with a too generic name. Also replace all call-site with the new function names. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 10 +++++----- xen/include/xen/device_tree.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index a5abdaa..2c2dc52 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -624,7 +624,7 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from, struct dt_device_node *dt; dt = from ? from->allnext : dt_host; - for_each_device_node(dt, np) + dt_for_each_device_node(dt, np) if ( np->name && (dt_node_cmp(np->name, name) == 0) ) break; @@ -635,7 +635,7 @@ struct dt_device_node *dt_find_node_by_path(const char *path) { struct dt_device_node *np; - for_each_device_node(dt_host, np) + dt_for_each_device_node(dt_host, np) if ( np->full_name && (dt_node_cmp(np->full_name, path) == 0) ) break; @@ -672,7 +672,7 @@ dt_find_compatible_node(struct dt_device_node *from, struct dt_device_node *dt; dt = from ? from->allnext : dt_host; - for_each_device_node(dt, np) + dt_for_each_device_node(dt, np) { if ( type && !(np->type && (dt_node_cmp(np->type, type) == 0)) ) @@ -1009,7 +1009,7 @@ static const struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) { const struct dt_device_node *np; - for_each_device_node(dt_host, np) + dt_for_each_device_node(dt_host, np) if ( np->phandle == handle ) break; @@ -1679,7 +1679,7 @@ static void __init dt_alias_scan(void) if ( !aliases ) return; - for_each_property_of_node( aliases, pp ) + dt_for_each_property_node( aliases, pp ) { const char *start = pp->name; const char *end = start + strlen(start); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 2e5564e..ca8371e 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -236,10 +236,10 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 #define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 -#define for_each_property_of_node(dn, pp) \ +#define dt_for_each_property_node(dn, pp) \ for ( pp = dn->properties; pp != NULL; pp = pp->next ) -#define for_each_device_node(dt, dn) \ +#define dt_for_each_device_node(dt, dn) \ for ( dn = dt; dn != NULL; dn = dn->allnext ) /* Helper to read a big number; size is in cells (not bytes) */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiM-0004wF-E8; Sat, 21 Sep 2013 04:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiL-0004w1-IL for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:37 +0000 Received: from [85.158.143.35:46029] by server-1.bemta-4.messagelabs.com id 6A/5A-16125-C0F1D325; Sat, 21 Sep 2013 04:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379737355!5711851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20320 invoked from network); 21 Sep 2013 04:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiI-0000Pg-UZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEiI-0000nq-Q2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:34 +0000 Date: Sat, 21 Sep 2013 04:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Don't add a fake property "name" in the 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 190ece328e74d04bcf1c1bed386a7d1cfe9b031e Author: Julien Grall AuthorDate: Fri Sep 13 13:49:10 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:43 2013 +0100 xen/dts: Don't add a fake property "name" in the device tree On new Flat Device Tree version, the property "name" may not exist. The property is never used in Xen code except to set the field "name" of dt_device_node. For convenience, remove the fake property. It will save space during the creation of the dom0 FDT. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 2c2dc52..61134fe 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1563,8 +1563,17 @@ static unsigned long __init unflatten_dt_node(const void *fdt, pp->name = "name"; pp->length = sz; pp->value = pp + 1; + /* + * The device tree creation code assume that the property + * "name" is not a fake. + * To avoid a big divergence with Linux code, only remove + * property link. In this case we will lose a bit of memory + */ +#if 0 *prev_pp = pp; prev_pp = &pp->next; +#endif + np->name = pp->value; memcpy(pp->value, ps, sz - 1); ((char *)pp->value)[sz - 1] = 0; dt_dprintk("fixed up name for %s -> %s\n", pathp, @@ -1574,7 +1583,7 @@ static unsigned long __init unflatten_dt_node(const void *fdt, if ( allnextpp ) { *prev_pp = NULL; - np->name = dt_get_property(np, "name", NULL); + np->name = (np->name) ? : dt_get_property(np, "name", NULL); np->type = dt_get_property(np, "device_type", NULL); if ( !np->name ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiM-0004wF-E8; Sat, 21 Sep 2013 04:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiL-0004w1-IL for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:37 +0000 Received: from [85.158.143.35:46029] by server-1.bemta-4.messagelabs.com id 6A/5A-16125-C0F1D325; Sat, 21 Sep 2013 04:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379737355!5711851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20320 invoked from network); 21 Sep 2013 04:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiI-0000Pg-UZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEiI-0000nq-Q2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:34 +0000 Date: Sat, 21 Sep 2013 04:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Don't add a fake property "name" in the 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 190ece328e74d04bcf1c1bed386a7d1cfe9b031e Author: Julien Grall AuthorDate: Fri Sep 13 13:49:10 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:43 2013 +0100 xen/dts: Don't add a fake property "name" in the device tree On new Flat Device Tree version, the property "name" may not exist. The property is never used in Xen code except to set the field "name" of dt_device_node. For convenience, remove the fake property. It will save space during the creation of the dom0 FDT. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 2c2dc52..61134fe 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1563,8 +1563,17 @@ static unsigned long __init unflatten_dt_node(const void *fdt, pp->name = "name"; pp->length = sz; pp->value = pp + 1; + /* + * The device tree creation code assume that the property + * "name" is not a fake. + * To avoid a big divergence with Linux code, only remove + * property link. In this case we will lose a bit of memory + */ +#if 0 *prev_pp = pp; prev_pp = &pp->next; +#endif + np->name = pp->value; memcpy(pp->value, ps, sz - 1); ((char *)pp->value)[sz - 1] = 0; dt_dprintk("fixed up name for %s -> %s\n", pathp, @@ -1574,7 +1583,7 @@ static unsigned long __init unflatten_dt_node(const void *fdt, if ( allnextpp ) { *prev_pp = NULL; - np->name = dt_get_property(np, "name", NULL); + np->name = (np->name) ? : dt_get_property(np, "name", NULL); np->type = dt_get_property(np, "device_type", NULL); if ( !np->name ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04: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 1VNEiY-0004yC-HQ; Sat, 21 Sep 2013 04:22:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiW-0004xb-PG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:49 +0000 Received: from [85.158.137.68:49769] by server-1.bemta-3.messagelabs.com id E8/07-04901-71F1D325; Sat, 21 Sep 2013 04:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1379737365!3828167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16150 invoked from network); 21 Sep 2013 04:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiT-0000Pm-6p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEiT-0000oK-4G for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:45 +0000 Date: Sat, 21 Sep 2013 04:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Add new helpers to use the 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 c88d32f463f75664285fd98856a7cdc6e01409bc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:11 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:48 2013 +0100 xen/dts: Add new helpers to use the device tree List of new helpers taken from linux (commit 74b9272): - dt_property_read_string - dt_match_node - dt_find_maching_node - dt_device_is_available - dt_prop_cmp Other new helpers: - dt_set_cell - dt_for_each_child - dt_set_range - dt_cells_to_size - dt_next_cell - dt_get_range - dt_node_name_is_equal - dt_node_path_is_equal - dt_property_name_is_equal Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 109 +++++++++++++++++++++++++++-- xen/include/xen/device_tree.h | 151 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 252 insertions(+), 8 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 61134fe..7e451b1 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -182,23 +182,38 @@ void __init device_tree_get_reg(const u32 **cell, u32 address_cells, get_val(cell, size_cells, size); } -static void __init set_val(u32 **cell, u32 cells, u64 val) +void dt_get_range(const __be32 **cell, const struct dt_device_node *np, + u64 *address, u64 *size) { - u32 c = cells; + *address = dt_next_cell(dt_n_addr_cells(np), cell); + *size = dt_next_cell(dt_n_size_cells(np), cell); +} + +void dt_set_cell(__be32 **cellp, int size, u64 val) +{ + int cells = size; - while ( c-- ) + while ( size-- ) { - (*cell)[c] = cpu_to_fdt32(val); + (*cellp)[size] = cpu_to_fdt32(val); val >>= 32; } - (*cell) += cells; + + (*cellp) += cells; } void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size) { - set_val(cell, address_cells, start); - set_val(cell, size_cells, size); + dt_set_cell(cell, address_cells, start); + dt_set_cell(cell, size_cells, size); +} + +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size) +{ + dt_set_cell(cellp, dt_n_addr_cells(np), address); + dt_set_cell(cellp, dt_n_size_cells(np), size); } u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, @@ -583,6 +598,23 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, return 1; } +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string) +{ + const struct dt_property *pp = dt_find_property(np, propname, NULL); + + if ( !pp ) + return -EINVAL; + if ( !pp->value ) + return -ENODATA; + if ( strnlen(pp->value, pp->length) >= pp->length ) + return -EILSEQ; + + *out_string = pp->value; + + return 0; +} + bool_t dt_device_is_compatible(const struct dt_device_node *device, const char *compat) { @@ -655,6 +687,34 @@ struct dt_device_node *dt_find_node_by_alias(const char *alias) return NULL; } +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node) +{ + if ( !matches ) + return 0; + + while ( matches->path || matches->type || matches->compatible ) + { + bool_t match = 1; + + if ( matches->path ) + match &= dt_node_path_is_equal(node, matches->path); + + if ( matches->type ) + match &= dt_device_type_is_equal(node, matches->type); + + if ( matches->compatible ) + match &= dt_device_is_compatible(node, matches->compatible); + + if ( match ) + return match; + + matches++; + } + + return 0; +} + const struct dt_device_node *dt_get_parent(const struct dt_device_node *node) { if ( !node ) @@ -684,6 +744,23 @@ dt_find_compatible_node(struct dt_device_node *from, return np; } +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches) +{ + struct dt_device_node *np; + struct dt_device_node *dt; + + dt = from ? from->allnext : dt_host; + dt_for_each_device_node(dt, np) + { + if ( dt_match_node(matches, np) ) + return np; + } + + return NULL; +} + int dt_n_addr_cells(const struct dt_device_node *np) { const __be32 *ip; @@ -1372,6 +1449,24 @@ int dt_device_get_irq(const struct dt_device_node *device, int index, return dt_irq_translate(&raw, out_irq); } +bool_t dt_device_is_available(const struct dt_device_node *device) +{ + const char *status; + u32 statlen; + + status = dt_get_property(device, "status", &statlen); + if ( status == NULL ) + return 1; + + if ( statlen > 0 ) + { + if ( !strcmp(status, "okay") || !strcmp(status, "ok") ) + return 1; + } + + return 0; +} + /** * unflatten_dt_node - Alloc and populate a device_node from the flat tree * @fdt: The parent device tree blob diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index ca8371e..91caf1f 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -54,6 +54,19 @@ struct dt_early_info { struct dt_module_info modules; }; +/* + * Struct used for matching a device + */ +struct dt_device_match { + const char *path; + const char *type; + const char *compatible; +}; + +#define DT_MATCH_PATH(p) { .path = p } +#define DT_MATCH_TYPE(typ) { .type = typ } +#define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } + typedef u32 dt_phandle; /** @@ -229,6 +242,7 @@ extern const struct dt_device_node *dt_interrupt_controller; */ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); +#define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) #define dt_node_cmp(s1, s2) strcmp((s1), (s2)) #define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) @@ -242,6 +256,9 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_for_each_device_node(dt, dn) \ for ( dn = dt; dn != NULL; dn = dn->allnext ) +#define dt_for_each_child_node(dt, dn) \ + for ( dn = dt->child; dn != NULL; dn = dn->sibling ) + /* Helper to read a big number; size is in cells (not bytes) */ static inline u64 dt_read_number(const __be32 *cell, int size) { @@ -252,6 +269,20 @@ static inline u64 dt_read_number(const __be32 *cell, int size) return r; } +/* Helper to convert a number of cells in bytes */ +static inline int dt_cells_to_size(int size) +{ + return (size * sizeof (u32)); +} + +static inline u64 dt_next_cell(int s, const __be32 **cellp) +{ + const __be32 *p = *cellp; + + *cellp = p + s; + return dt_read_number(p, s); +} + static inline const char *dt_node_full_name(const struct dt_device_node *np) { return (np && np->full_name) ? np->full_name : ""; @@ -262,6 +293,18 @@ static inline const char *dt_node_name(const struct dt_device_node *np) return (np && np->name) ? np->name : ""; } +static inline bool_t dt_node_name_is_equal(const struct dt_device_node *np, + const char *name) +{ + return !dt_node_cmp(np->name, name); +} + +static inline bool_t dt_node_path_is_equal(const struct dt_device_node *np, + const char *path) +{ + return !dt_node_cmp(np->full_name, path); +} + static inline bool_t dt_device_type_is_equal(const struct dt_device_node *device, const char *type) @@ -281,6 +324,12 @@ static inline domid_t dt_device_used_by(const struct dt_device_node *device) return device->used_by; } +static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, + const char *name) +{ + return !dt_prop_cmp(pp->name, name); +} + /** * dt_find_compatible_node - Find a node based on type and one of the * tokens in its "compatible" property @@ -315,6 +364,23 @@ const void *dt_get_property(const struct dt_device_node *np, */ bool_t dt_property_read_u32(const struct dt_device_node *np, const char *name, u32 *out_value); +/** + * dt_property_read_string - Find and read a string from a property + * @np: Device node from which the property value is to be read + * @propname: Name of the property to be searched + * @out_string: Pointer to null terminated return string, modified only + * if return value if 0. + * + * Search for a property in a device tree node and retrieve a null + * terminated string value (pointer to data, not a copy). Returns 0 on + * success, -EINVAL if the property does not exist, -ENODATA if property + * doest not have value, and -EILSEQ if the string is not + * null-terminated with the length of the property data. + * + * The out_string pointer is modified only if a valid string can be decoded. + */ +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string); /** * Checks if the given "compat" string matches one of the strings in @@ -450,4 +516,87 @@ int dt_n_size_cells(const struct dt_device_node *np); */ int dt_n_addr_cells(const struct dt_device_node *np); -#endif +/** + * dt_device_is_available - Check if a device is available for use + * + * @device: Node to check for availability + * + * Returns true if the status property is absent or set to "okay" or "ok", + * false otherwise. + */ +bool_t dt_device_is_available(const struct dt_device_node *device); + +/** + * dt_match_node - Tell if a device_node has a matching of dt_device_match + * @matches: array of dt_device_match structures to search in + * @node: the dt_device_node structure to match against + * + * Returns true if the device node match one of dt_device_match. + */ +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node); + +/** + * dt_find_matching_node - Find a node based on an dt_device_match match table + * @from: The node to start searching from or NULL, the node you pass + * will not be searched, only the next one will; typically, you pass + * what the returned call returned + * @matches: array of dt_device_match structures to search in + * + * Returns a node pointer. + */ +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches); + +/** + * dt_set_cell - Write a value into a series of cells + * + * @cellp: Pointer to cells + * @size: number of cells to write the value + * @value: number to write + * + * Write a value into a series of cells and update cellp to point to the + * cell just after. + */ +void dt_set_cell(__be32 **cellp, int size, u64 val); + +/** + * dt_set_range - Write range into a series of cells + * + * @cellp: Pointer to cells + * @np: Node which contains the encoding for the address and the size + * @address: Start of range + * @size: Size of the range + * + * Write a range into a series of cells and update cellp to point to the + * cell just after. + */ +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size); + +/** + * dt_get_range - Read a range (address/size) from a series of cells + * + * @cellp: Pointer to cells + * @np Node which contains the encoding for the addresss and the size + * @address: Address filled by this function + * @size: Size filled by this function + * + * WARNING: This function should not be used to decode an address + * This function reads a range (address/size) from a series of cells and + * update cellp to point to the cell just after. + */ +void dt_get_range(const __be32 **cellp, const struct dt_device_node *np, + u64 *address, u64 *size); + +#endif /* __XEN_DEVICE_TREE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:22:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04: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 1VNEiY-0004yC-HQ; Sat, 21 Sep 2013 04:22:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiW-0004xb-PG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:49 +0000 Received: from [85.158.137.68:49769] by server-1.bemta-3.messagelabs.com id E8/07-04901-71F1D325; Sat, 21 Sep 2013 04:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1379737365!3828167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16150 invoked from network); 21 Sep 2013 04:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiT-0000Pm-6p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEiT-0000oK-4G for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:45 +0000 Date: Sat, 21 Sep 2013 04:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Add new helpers to use the 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 c88d32f463f75664285fd98856a7cdc6e01409bc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:11 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:48 2013 +0100 xen/dts: Add new helpers to use the device tree List of new helpers taken from linux (commit 74b9272): - dt_property_read_string - dt_match_node - dt_find_maching_node - dt_device_is_available - dt_prop_cmp Other new helpers: - dt_set_cell - dt_for_each_child - dt_set_range - dt_cells_to_size - dt_next_cell - dt_get_range - dt_node_name_is_equal - dt_node_path_is_equal - dt_property_name_is_equal Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 109 +++++++++++++++++++++++++++-- xen/include/xen/device_tree.h | 151 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 252 insertions(+), 8 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 61134fe..7e451b1 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -182,23 +182,38 @@ void __init device_tree_get_reg(const u32 **cell, u32 address_cells, get_val(cell, size_cells, size); } -static void __init set_val(u32 **cell, u32 cells, u64 val) +void dt_get_range(const __be32 **cell, const struct dt_device_node *np, + u64 *address, u64 *size) { - u32 c = cells; + *address = dt_next_cell(dt_n_addr_cells(np), cell); + *size = dt_next_cell(dt_n_size_cells(np), cell); +} + +void dt_set_cell(__be32 **cellp, int size, u64 val) +{ + int cells = size; - while ( c-- ) + while ( size-- ) { - (*cell)[c] = cpu_to_fdt32(val); + (*cellp)[size] = cpu_to_fdt32(val); val >>= 32; } - (*cell) += cells; + + (*cellp) += cells; } void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size) { - set_val(cell, address_cells, start); - set_val(cell, size_cells, size); + dt_set_cell(cell, address_cells, start); + dt_set_cell(cell, size_cells, size); +} + +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size) +{ + dt_set_cell(cellp, dt_n_addr_cells(np), address); + dt_set_cell(cellp, dt_n_size_cells(np), size); } u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, @@ -583,6 +598,23 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, return 1; } +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string) +{ + const struct dt_property *pp = dt_find_property(np, propname, NULL); + + if ( !pp ) + return -EINVAL; + if ( !pp->value ) + return -ENODATA; + if ( strnlen(pp->value, pp->length) >= pp->length ) + return -EILSEQ; + + *out_string = pp->value; + + return 0; +} + bool_t dt_device_is_compatible(const struct dt_device_node *device, const char *compat) { @@ -655,6 +687,34 @@ struct dt_device_node *dt_find_node_by_alias(const char *alias) return NULL; } +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node) +{ + if ( !matches ) + return 0; + + while ( matches->path || matches->type || matches->compatible ) + { + bool_t match = 1; + + if ( matches->path ) + match &= dt_node_path_is_equal(node, matches->path); + + if ( matches->type ) + match &= dt_device_type_is_equal(node, matches->type); + + if ( matches->compatible ) + match &= dt_device_is_compatible(node, matches->compatible); + + if ( match ) + return match; + + matches++; + } + + return 0; +} + const struct dt_device_node *dt_get_parent(const struct dt_device_node *node) { if ( !node ) @@ -684,6 +744,23 @@ dt_find_compatible_node(struct dt_device_node *from, return np; } +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches) +{ + struct dt_device_node *np; + struct dt_device_node *dt; + + dt = from ? from->allnext : dt_host; + dt_for_each_device_node(dt, np) + { + if ( dt_match_node(matches, np) ) + return np; + } + + return NULL; +} + int dt_n_addr_cells(const struct dt_device_node *np) { const __be32 *ip; @@ -1372,6 +1449,24 @@ int dt_device_get_irq(const struct dt_device_node *device, int index, return dt_irq_translate(&raw, out_irq); } +bool_t dt_device_is_available(const struct dt_device_node *device) +{ + const char *status; + u32 statlen; + + status = dt_get_property(device, "status", &statlen); + if ( status == NULL ) + return 1; + + if ( statlen > 0 ) + { + if ( !strcmp(status, "okay") || !strcmp(status, "ok") ) + return 1; + } + + return 0; +} + /** * unflatten_dt_node - Alloc and populate a device_node from the flat tree * @fdt: The parent device tree blob diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index ca8371e..91caf1f 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -54,6 +54,19 @@ struct dt_early_info { struct dt_module_info modules; }; +/* + * Struct used for matching a device + */ +struct dt_device_match { + const char *path; + const char *type; + const char *compatible; +}; + +#define DT_MATCH_PATH(p) { .path = p } +#define DT_MATCH_TYPE(typ) { .type = typ } +#define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } + typedef u32 dt_phandle; /** @@ -229,6 +242,7 @@ extern const struct dt_device_node *dt_interrupt_controller; */ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); +#define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) #define dt_node_cmp(s1, s2) strcmp((s1), (s2)) #define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) @@ -242,6 +256,9 @@ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_for_each_device_node(dt, dn) \ for ( dn = dt; dn != NULL; dn = dn->allnext ) +#define dt_for_each_child_node(dt, dn) \ + for ( dn = dt->child; dn != NULL; dn = dn->sibling ) + /* Helper to read a big number; size is in cells (not bytes) */ static inline u64 dt_read_number(const __be32 *cell, int size) { @@ -252,6 +269,20 @@ static inline u64 dt_read_number(const __be32 *cell, int size) return r; } +/* Helper to convert a number of cells in bytes */ +static inline int dt_cells_to_size(int size) +{ + return (size * sizeof (u32)); +} + +static inline u64 dt_next_cell(int s, const __be32 **cellp) +{ + const __be32 *p = *cellp; + + *cellp = p + s; + return dt_read_number(p, s); +} + static inline const char *dt_node_full_name(const struct dt_device_node *np) { return (np && np->full_name) ? np->full_name : ""; @@ -262,6 +293,18 @@ static inline const char *dt_node_name(const struct dt_device_node *np) return (np && np->name) ? np->name : ""; } +static inline bool_t dt_node_name_is_equal(const struct dt_device_node *np, + const char *name) +{ + return !dt_node_cmp(np->name, name); +} + +static inline bool_t dt_node_path_is_equal(const struct dt_device_node *np, + const char *path) +{ + return !dt_node_cmp(np->full_name, path); +} + static inline bool_t dt_device_type_is_equal(const struct dt_device_node *device, const char *type) @@ -281,6 +324,12 @@ static inline domid_t dt_device_used_by(const struct dt_device_node *device) return device->used_by; } +static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, + const char *name) +{ + return !dt_prop_cmp(pp->name, name); +} + /** * dt_find_compatible_node - Find a node based on type and one of the * tokens in its "compatible" property @@ -315,6 +364,23 @@ const void *dt_get_property(const struct dt_device_node *np, */ bool_t dt_property_read_u32(const struct dt_device_node *np, const char *name, u32 *out_value); +/** + * dt_property_read_string - Find and read a string from a property + * @np: Device node from which the property value is to be read + * @propname: Name of the property to be searched + * @out_string: Pointer to null terminated return string, modified only + * if return value if 0. + * + * Search for a property in a device tree node and retrieve a null + * terminated string value (pointer to data, not a copy). Returns 0 on + * success, -EINVAL if the property does not exist, -ENODATA if property + * doest not have value, and -EILSEQ if the string is not + * null-terminated with the length of the property data. + * + * The out_string pointer is modified only if a valid string can be decoded. + */ +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string); /** * Checks if the given "compat" string matches one of the strings in @@ -450,4 +516,87 @@ int dt_n_size_cells(const struct dt_device_node *np); */ int dt_n_addr_cells(const struct dt_device_node *np); -#endif +/** + * dt_device_is_available - Check if a device is available for use + * + * @device: Node to check for availability + * + * Returns true if the status property is absent or set to "okay" or "ok", + * false otherwise. + */ +bool_t dt_device_is_available(const struct dt_device_node *device); + +/** + * dt_match_node - Tell if a device_node has a matching of dt_device_match + * @matches: array of dt_device_match structures to search in + * @node: the dt_device_node structure to match against + * + * Returns true if the device node match one of dt_device_match. + */ +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node); + +/** + * dt_find_matching_node - Find a node based on an dt_device_match match table + * @from: The node to start searching from or NULL, the node you pass + * will not be searched, only the next one will; typically, you pass + * what the returned call returned + * @matches: array of dt_device_match structures to search in + * + * Returns a node pointer. + */ +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches); + +/** + * dt_set_cell - Write a value into a series of cells + * + * @cellp: Pointer to cells + * @size: number of cells to write the value + * @value: number to write + * + * Write a value into a series of cells and update cellp to point to the + * cell just after. + */ +void dt_set_cell(__be32 **cellp, int size, u64 val); + +/** + * dt_set_range - Write range into a series of cells + * + * @cellp: Pointer to cells + * @np: Node which contains the encoding for the address and the size + * @address: Start of range + * @size: Size of the range + * + * Write a range into a series of cells and update cellp to point to the + * cell just after. + */ +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size); + +/** + * dt_get_range - Read a range (address/size) from a series of cells + * + * @cellp: Pointer to cells + * @np Node which contains the encoding for the addresss and the size + * @address: Address filled by this function + * @size: Size filled by this function + * + * WARNING: This function should not be used to decode an address + * This function reads a range (address/size) from a series of cells and + * update cellp to point to the cell just after. + */ +void dt_get_range(const __be32 **cellp, const struct dt_device_node *np, + u64 *address, u64 *size); + +#endif /* __XEN_DEVICE_TREE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEih-000501-MY; Sat, 21 Sep 2013 04:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEig-0004zb-4G for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:58 +0000 Received: from [193.109.254.147:27960] by server-9.bemta-14.messagelabs.com id D1/DA-30026-12F1D325; Sat, 21 Sep 2013 04:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1379737375!165256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27653 invoked from network); 21 Sep 2013 04:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEid-0000Pv-D1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEid-0000og-Bt for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:55 +0000 Date: Sat, 21 Sep 2013 04:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Use the right string comparison function in 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 6db389ab3fc4214c4ed3df07253879dee2254edc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:12 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:54 2013 +0100 xen: Use the right string comparison function in device tree When of_node_cmp and of_compat_cmp was introduced in commit fb97eb6 "xen/arm: Create a hierarchical device tree", they were copied from the wrong Linux header. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++--- xen/include/xen/device_tree.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 7e451b1..a73eee8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -144,7 +144,7 @@ bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; while ( len > 0 ) { - if ( !dt_compat_cmp(prop, match, mlen) ) + if ( !dt_compat_cmp(prop, match) ) return 1; l = strlen(prop) + 1; prop += l; @@ -564,7 +564,7 @@ dt_find_property(const struct dt_device_node *np, for ( pp = np->properties; pp; pp = pp->next ) { - if ( strcmp(pp->name, name) == 0 ) + if ( dt_prop_cmp(pp->name, name) == 0 ) { if ( lenp ) *lenp = pp->length; @@ -626,7 +626,7 @@ bool_t dt_device_is_compatible(const struct dt_device_node *device, return 0; while ( cplen > 0 ) { - if ( dt_compat_cmp(cp, compat, strlen(compat)) == 0 ) + if ( dt_compat_cmp(cp, compat) == 0 ) return 1; l = strlen(cp) + 1; cp += l; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 91caf1f..5a51ab6 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -243,8 +243,8 @@ extern const struct dt_device_node *dt_interrupt_controller; struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) -#define dt_node_cmp(s1, s2) strcmp((s1), (s2)) -#define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) +#define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) +#define dt_compat_cmp(s1, s2) strcasecmp((s1), (s2)) /* Default #address and #size cells */ #define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEih-000501-MY; Sat, 21 Sep 2013 04:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEig-0004zb-4G for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:58 +0000 Received: from [193.109.254.147:27960] by server-9.bemta-14.messagelabs.com id D1/DA-30026-12F1D325; Sat, 21 Sep 2013 04:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1379737375!165256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27653 invoked from network); 21 Sep 2013 04:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEid-0000Pv-D1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEid-0000og-Bt for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:22:55 +0000 Date: Sat, 21 Sep 2013 04:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Use the right string comparison function in 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 6db389ab3fc4214c4ed3df07253879dee2254edc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:12 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:54 2013 +0100 xen: Use the right string comparison function in device tree When of_node_cmp and of_compat_cmp was introduced in commit fb97eb6 "xen/arm: Create a hierarchical device tree", they were copied from the wrong Linux header. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++--- xen/include/xen/device_tree.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 7e451b1..a73eee8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -144,7 +144,7 @@ bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; while ( len > 0 ) { - if ( !dt_compat_cmp(prop, match, mlen) ) + if ( !dt_compat_cmp(prop, match) ) return 1; l = strlen(prop) + 1; prop += l; @@ -564,7 +564,7 @@ dt_find_property(const struct dt_device_node *np, for ( pp = np->properties; pp; pp = pp->next ) { - if ( strcmp(pp->name, name) == 0 ) + if ( dt_prop_cmp(pp->name, name) == 0 ) { if ( lenp ) *lenp = pp->length; @@ -626,7 +626,7 @@ bool_t dt_device_is_compatible(const struct dt_device_node *device, return 0; while ( cplen > 0 ) { - if ( dt_compat_cmp(cp, compat, strlen(compat)) == 0 ) + if ( dt_compat_cmp(cp, compat) == 0 ) return 1; l = strlen(cp) + 1; cp += l; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 91caf1f..5a51ab6 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -243,8 +243,8 @@ extern const struct dt_device_node *dt_interrupt_controller; struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); #define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) -#define dt_node_cmp(s1, s2) strcmp((s1), (s2)) -#define dt_compat_cmp(s1, s2, l) strnicmp((s1), (s2), l) +#define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) +#define dt_compat_cmp(s1, s2) strcasecmp((s1), (s2)) /* Default #address and #size cells */ #define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23: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 1VNEir-000527-Pj; Sat, 21 Sep 2013 04:23:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiq-00051m-G7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:08 +0000 Received: from [85.158.137.68:55782] by server-1.bemta-3.messagelabs.com id 2A/17-04901-B2F1D325; Sat, 21 Sep 2013 04:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1379737385!3830069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19338 invoked from network); 21 Sep 2013 04:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEin-0000QX-KZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEin-0000pK-IS for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:05 +0000 Date: Sat, 21 Sep 2013 04:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Remove device_get_reg call in process_cpu_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 57e835e51420bf1ff793524bbd815a85291c51e4 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:13 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:56 2013 +0100 xen/dts: Remove device_get_reg call in process_cpu_node The "reg" property is only composed of one uint32. device_get_reg can be replaced by dt_read_number. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index a73eee8..f867dfd 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -426,21 +426,26 @@ static void __init process_cpu_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - const u32 *cell; - paddr_t start, size; - + u32 cpuid; + int len; - prop = fdt_get_property(fdt, node, "reg", NULL); + prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) { early_printk("fdt: node `%s': missing `reg' property\n", name); return; } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( len < sizeof (cpuid) ) + { + dt_printk("fdt: node `%s': `reg` property length is too short\n", + name); + return; + } + + cpuid = dt_read_number((const __be32 *)prop->data, 1); - cpumask_set_cpu(start, &cpu_possible_map); + cpumask_set_cpu(cpuid, &cpu_possible_map); } static void __init process_multiboot_node(const void *fdt, int node, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23: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 1VNEir-000527-Pj; Sat, 21 Sep 2013 04:23:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiq-00051m-G7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:08 +0000 Received: from [85.158.137.68:55782] by server-1.bemta-3.messagelabs.com id 2A/17-04901-B2F1D325; Sat, 21 Sep 2013 04:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1379737385!3830069!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19338 invoked from network); 21 Sep 2013 04:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEin-0000QX-KZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEin-0000pK-IS for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:05 +0000 Date: Sat, 21 Sep 2013 04:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Remove device_get_reg call in process_cpu_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 57e835e51420bf1ff793524bbd815a85291c51e4 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:13 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:56 2013 +0100 xen/dts: Remove device_get_reg call in process_cpu_node The "reg" property is only composed of one uint32. device_get_reg can be replaced by dt_read_number. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index a73eee8..f867dfd 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -426,21 +426,26 @@ static void __init process_cpu_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - const u32 *cell; - paddr_t start, size; - + u32 cpuid; + int len; - prop = fdt_get_property(fdt, node, "reg", NULL); + prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) { early_printk("fdt: node `%s': missing `reg' property\n", name); return; } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + if ( len < sizeof (cpuid) ) + { + dt_printk("fdt: node `%s': `reg` property length is too short\n", + name); + return; + } + + cpuid = dt_read_number((const __be32 *)prop->data, 1); - cpumask_set_cpu(start, &cpu_possible_map); + cpumask_set_cpu(cpuid, &cpu_possible_map); } static void __init process_multiboot_node(const void *fdt, int node, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj1-000546-TE; Sat, 21 Sep 2013 04:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj0-00053l-FG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:18 +0000 Received: from [193.109.254.147:26153] by server-4.bemta-14.messagelabs.com id 8C/0C-05823-53F1D325; Sat, 21 Sep 2013 04:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737396!369895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13870 invoked from network); 21 Sep 2013 04:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiy-0000Qa-0C for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEix-0000qC-Ph for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:15 +0000 Date: Sat, 21 Sep 2013 04:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Check "reg" property length in process_multiboot_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fccdfce51ec3367515f73c59765611ed67e747b Author: Julien Grall AuthorDate: Fri Sep 13 13:49:14 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:59 2013 +0100 xen/dts: Check "reg" property length in process_multiboot_node The device tree compiler (dtc) will only warn if the "reg" property doesn't match #address-cells and #size-cells size. It won't update the different property. Therefore, Xen needs to check if the size match both properties, otherwise Xen can retrieve a wrong range. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f867dfd..9d300ec 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -467,10 +467,14 @@ static void __init process_multiboot_node(const void *fdt, int node, mod = &early_info.modules.module[nr]; - prop = fdt_get_property(fdt, node, "reg", NULL); + prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) early_panic("node %s missing `reg' property\n", name); + if ( len < dt_cells_to_size(address_cells + size_cells) ) + early_panic("fdt: node `%s': `reg` property length is too short\n", + name); + cell = (const u32 *)prop->data; device_tree_get_reg(&cell, address_cells, size_cells, &mod->start, &mod->size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj1-000546-TE; Sat, 21 Sep 2013 04:23:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj0-00053l-FG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:18 +0000 Received: from [193.109.254.147:26153] by server-4.bemta-14.messagelabs.com id 8C/0C-05823-53F1D325; Sat, 21 Sep 2013 04:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737396!369895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13870 invoked from network); 21 Sep 2013 04:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEiy-0000Qa-0C for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEix-0000qC-Ph for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:15 +0000 Date: Sat, 21 Sep 2013 04:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Check "reg" property length in process_multiboot_node X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fccdfce51ec3367515f73c59765611ed67e747b Author: Julien Grall AuthorDate: Fri Sep 13 13:49:14 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:27:59 2013 +0100 xen/dts: Check "reg" property length in process_multiboot_node The device tree compiler (dtc) will only warn if the "reg" property doesn't match #address-cells and #size-cells size. It won't update the different property. Therefore, Xen needs to check if the size match both properties, otherwise Xen can retrieve a wrong range. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f867dfd..9d300ec 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -467,10 +467,14 @@ static void __init process_multiboot_node(const void *fdt, int node, mod = &early_info.modules.module[nr]; - prop = fdt_get_property(fdt, node, "reg", NULL); + prop = fdt_get_property(fdt, node, "reg", &len); if ( !prop ) early_panic("node %s missing `reg' property\n", name); + if ( len < dt_cells_to_size(address_cells + size_cells) ) + early_panic("fdt: node `%s': `reg` property length is too short\n", + name); + cell = (const u32 *)prop->data; device_tree_get_reg(&cell, address_cells, size_cells, &mod->start, &mod->size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjC-000565-0R; Sat, 21 Sep 2013 04:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjA-00055n-MX for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:28 +0000 Received: from [193.109.254.147:16327] by server-11.bemta-14.messagelabs.com id 19/D0-23511-F3F1D325; Sat, 21 Sep 2013 04:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737406!369907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14721 invoked from network); 21 Sep 2013 04:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj8-0000Qj-6X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEj8-0000qy-4n for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:26 +0000 Date: Sat, 21 Sep 2013 04:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Check the CPU ID is not greater than NR_CPUS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a35c108b35b7e008e5a2bf521b24515c5f8a910 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:15 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:08 2013 +0100 xen/dts: Check the CPU ID is not greater than NR_CPUS On some board CPU IDs are not contiguous (for instance the Versatile Express with big.LITTLE supports). If the CPU ID is greater than NR_CPUS Xen will hang without any message. This is because console driver is not yet initialized and hypervisor data abort uses printk. For the moment check the CPU ID and print an warning if an error occured. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9d300ec..d2262ce 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -445,6 +445,13 @@ static void __init process_cpu_node(const void *fdt, int node, cpuid = dt_read_number((const __be32 *)prop->data, 1); + /* TODO: handle non-contiguous CPU ID */ + if ( cpuid >= NR_CPUS ) + { + dt_printk("fdt: node `%s': reg(0x%x) >= NR_CPUS(%d)\n", + name, cpuid, NR_CPUS); + return; + } cpumask_set_cpu(cpuid, &cpu_possible_map); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjC-000565-0R; Sat, 21 Sep 2013 04:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjA-00055n-MX for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:28 +0000 Received: from [193.109.254.147:16327] by server-11.bemta-14.messagelabs.com id 19/D0-23511-F3F1D325; Sat, 21 Sep 2013 04:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737406!369907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14721 invoked from network); 21 Sep 2013 04:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEj8-0000Qj-6X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEj8-0000qy-4n for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:26 +0000 Date: Sat, 21 Sep 2013 04:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Check the CPU ID is not greater than NR_CPUS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a35c108b35b7e008e5a2bf521b24515c5f8a910 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:15 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:08 2013 +0100 xen/dts: Check the CPU ID is not greater than NR_CPUS On some board CPU IDs are not contiguous (for instance the Versatile Express with big.LITTLE supports). If the CPU ID is greater than NR_CPUS Xen will hang without any message. This is because console driver is not yet initialized and hypervisor data abort uses printk. For the moment check the CPU ID and print an warning if an error occured. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9d300ec..d2262ce 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -445,6 +445,13 @@ static void __init process_cpu_node(const void *fdt, int node, cpuid = dt_read_number((const __be32 *)prop->data, 1); + /* TODO: handle non-contiguous CPU ID */ + if ( cpuid >= NR_CPUS ) + { + dt_printk("fdt: node `%s': reg(0x%x) >= NR_CPUS(%d)\n", + name, cpuid, NR_CPUS); + return; + } cpumask_set_cpu(cpuid, &cpu_possible_map); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjM-00057y-3e; Sat, 21 Sep 2013 04:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjK-00057f-Te for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:39 +0000 Received: from [85.158.143.35:47529] by server-3.bemta-4.messagelabs.com id B2/2E-08835-A4F1D325; Sat, 21 Sep 2013 04:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379737416!722172!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4658 invoked from network); 21 Sep 2013 04:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjI-0000Qr-CH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjI-0000rO-Aj for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:36 +0000 Date: Sat, 21 Sep 2013 04:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: hdlcd: Convert the driver to the new device tree API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2004c038ea3617a9cc0132f6636d953616ac77f8 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:16 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:11 2013 +0100 xen/video: hdlcd: Convert the driver to the new device tree API Avoid to use FDT API which will be removed soon Signed-off-by: Julien Grall Acked-by: Ian campbell --- xen/drivers/video/arm_hdlcd.c | 46 +++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 72979ea..ab464c6 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "font.h" #include "lfb.h" #include "modelines.h" @@ -96,47 +97,52 @@ static int __init get_color_masks(const char* bpp, struct color_masks **masks) static void __init set_pixclock(uint32_t pixclock) { - if ( device_tree_node_compatible(device_tree_flattened, 0, "arm,vexpress") ) + if ( dt_find_compatible_node(NULL, NULL, "arm,vexpress") ) vexpress_syscfg(1, V2M_SYS_CFG_OSC_FUNC, V2M_SYS_CFG_OSC5, &pixclock); } void __init video_init(void) { - int node, depth; - u32 address_cells, size_cells; struct lfb_prop lfbp; unsigned char *lfb; paddr_t hdlcd_start, hdlcd_size; paddr_t framebuffer_start, framebuffer_size; - const struct fdt_property *prop; - const u32 *cell; const char *mode_string; char _mode_string[16]; int bytes_per_pixel = 4; struct color_masks *c = NULL; struct modeline *videomode = NULL; int i; + const struct dt_device_node *dev; + const __be32 *cells; + u32 lenp; + int res; - if ( find_compatible_node("arm,hdlcd", &node, &depth, - &address_cells, &size_cells) <= 0 ) - return; + dev = dt_find_compatible_node(NULL, NULL, "arm,hdlcd"); - prop = fdt_get_property(device_tree_flattened, node, "reg", NULL); - if ( !prop ) + if ( !dev ) + { + early_printk("HDLCD: Cannot find node compatible with \"arm,hdcld\"\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &hdlcd_start, &hdlcd_size); + res = dt_device_get_address(dev, 0, &hdlcd_start, &hdlcd_size); + if ( !res ) + { + early_printk("HDLCD: Unable to retrieve MMIO base address\n"); + return; + } - prop = fdt_get_property(device_tree_flattened, node, "framebuffer", NULL); - if ( !prop ) + cells = dt_get_property(dev, "framebuffer", &lenp); + if ( !cells ) + { + early_printk("HDLCD: Unable to retrieve framebuffer property\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &framebuffer_start, &framebuffer_size); + framebuffer_start = dt_next_cell(dt_n_addr_cells(dev), &cells); + framebuffer_size = dt_next_cell(dt_n_size_cells(dev), &cells); if ( !hdlcd_start ) { @@ -150,8 +156,8 @@ void __init video_init(void) return; } - mode_string = fdt_getprop(device_tree_flattened, node, "mode", NULL); - if ( !mode_string ) + res = dt_property_read_string(dev, "mode", &mode_string); + if ( res ) { get_color_masks("32", &c); memcpy(_mode_string, "1280x1024@60", strlen("1280x1024@60") + 1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjM-00057y-3e; Sat, 21 Sep 2013 04:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjK-00057f-Te for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:39 +0000 Received: from [85.158.143.35:47529] by server-3.bemta-4.messagelabs.com id B2/2E-08835-A4F1D325; Sat, 21 Sep 2013 04:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1379737416!722172!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4658 invoked from network); 21 Sep 2013 04:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjI-0000Qr-CH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjI-0000rO-Aj for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:36 +0000 Date: Sat, 21 Sep 2013 04:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: hdlcd: Convert the driver to the new device tree API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2004c038ea3617a9cc0132f6636d953616ac77f8 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:16 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:11 2013 +0100 xen/video: hdlcd: Convert the driver to the new device tree API Avoid to use FDT API which will be removed soon Signed-off-by: Julien Grall Acked-by: Ian campbell --- xen/drivers/video/arm_hdlcd.c | 46 +++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 72979ea..ab464c6 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "font.h" #include "lfb.h" #include "modelines.h" @@ -96,47 +97,52 @@ static int __init get_color_masks(const char* bpp, struct color_masks **masks) static void __init set_pixclock(uint32_t pixclock) { - if ( device_tree_node_compatible(device_tree_flattened, 0, "arm,vexpress") ) + if ( dt_find_compatible_node(NULL, NULL, "arm,vexpress") ) vexpress_syscfg(1, V2M_SYS_CFG_OSC_FUNC, V2M_SYS_CFG_OSC5, &pixclock); } void __init video_init(void) { - int node, depth; - u32 address_cells, size_cells; struct lfb_prop lfbp; unsigned char *lfb; paddr_t hdlcd_start, hdlcd_size; paddr_t framebuffer_start, framebuffer_size; - const struct fdt_property *prop; - const u32 *cell; const char *mode_string; char _mode_string[16]; int bytes_per_pixel = 4; struct color_masks *c = NULL; struct modeline *videomode = NULL; int i; + const struct dt_device_node *dev; + const __be32 *cells; + u32 lenp; + int res; - if ( find_compatible_node("arm,hdlcd", &node, &depth, - &address_cells, &size_cells) <= 0 ) - return; + dev = dt_find_compatible_node(NULL, NULL, "arm,hdlcd"); - prop = fdt_get_property(device_tree_flattened, node, "reg", NULL); - if ( !prop ) + if ( !dev ) + { + early_printk("HDLCD: Cannot find node compatible with \"arm,hdcld\"\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &hdlcd_start, &hdlcd_size); + res = dt_device_get_address(dev, 0, &hdlcd_start, &hdlcd_size); + if ( !res ) + { + early_printk("HDLCD: Unable to retrieve MMIO base address\n"); + return; + } - prop = fdt_get_property(device_tree_flattened, node, "framebuffer", NULL); - if ( !prop ) + cells = dt_get_property(dev, "framebuffer", &lenp); + if ( !cells ) + { + early_printk("HDLCD: Unable to retrieve framebuffer property\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &framebuffer_start, &framebuffer_size); + framebuffer_start = dt_next_cell(dt_n_addr_cells(dev), &cells); + framebuffer_size = dt_next_cell(dt_n_size_cells(dev), &cells); if ( !hdlcd_start ) { @@ -150,8 +156,8 @@ void __init video_init(void) return; } - mode_string = fdt_getprop(device_tree_flattened, node, "mode", NULL); - if ( !mode_string ) + res = dt_property_read_string(dev, "mode", &mode_string); + if ( res ) { get_color_masks("32", &c); memcpy(_mode_string, "1280x1024@60", strlen("1280x1024@60") + 1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjX-0005AI-70; Sat, 21 Sep 2013 04:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjV-00059t-4n for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:49 +0000 Received: from [193.109.254.147:16722] by server-8.bemta-14.messagelabs.com id 59/1E-14324-45F1D325; Sat, 21 Sep 2013 04:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1379737426!3404753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1329 invoked from network); 21 Sep 2013 04:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjS-0000Qx-I1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjS-0000rk-Gy for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:46 +0000 Date: Sat, 21 Sep 2013 04:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: hdlcd: Use early_printk instead of printk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34743911e7a49f424fc2e92b5148e411aae8e71c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:17 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:13 2013 +0100 xen/video: hdlcd: Use early_printk instead of printk The video driver is initialized before the console is correctly set up. Therefore, printk will never output if there is no serial configured. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/video/arm_hdlcd.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index ab464c6..dffda9a 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -146,13 +146,13 @@ void __init video_init(void) if ( !hdlcd_start ) { - printk(KERN_ERR "HDLCD address missing from device tree, disabling driver\n"); + early_printk(KERN_ERR "HDLCD: address missing from device tree, disabling driver\n"); return; } if ( !hdlcd_start || !framebuffer_start ) { - printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); + early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); return; } @@ -166,27 +166,27 @@ void __init video_init(void) else if ( strlen(mode_string) < strlen("800x600@60") || strlen(mode_string) > sizeof(_mode_string) - 1 ) { - printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string); + early_printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string); return; } else { char *s = strchr(mode_string, '-'); if ( !s ) { - printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n", - mode_string); + early_printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n", + mode_string); get_color_masks("32", &c); memcpy(_mode_string, mode_string, strlen(mode_string) + 1); bytes_per_pixel = 4; } else { if ( strlen(s) < 6 ) { - printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string); + early_printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string); return; } s++; if ( get_color_masks(s, &c) < 0 ) { - printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s); + early_printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s); return; } bytes_per_pixel = simple_strtoll(s, NULL, 10) / 8; @@ -205,22 +205,23 @@ void __init video_init(void) } if ( !videomode ) { - printk(KERN_WARNING "HDLCD: unsupported videomode %s\n", _mode_string); + early_printk(KERN_WARNING "HDLCD: unsupported videomode %s\n", + _mode_string); return; } if ( framebuffer_size < bytes_per_pixel * videomode->xres * videomode->yres ) { - printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n"); + early_printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n"); return; } - printk(KERN_INFO "Initializing HDLCD driver\n"); + early_printk(KERN_INFO "Initializing HDLCD driver\n"); lfb = ioremap_wc(framebuffer_start, framebuffer_size); if ( !lfb ) { - printk(KERN_ERR "Couldn't map the framebuffer\n"); + early_printk(KERN_ERR "Couldn't map the framebuffer\n"); return; } memset(lfb, 0x00, bytes_per_pixel * videomode->xres * videomode->yres); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:23:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:23:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjX-0005AI-70; Sat, 21 Sep 2013 04:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjV-00059t-4n for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:49 +0000 Received: from [193.109.254.147:16722] by server-8.bemta-14.messagelabs.com id 59/1E-14324-45F1D325; Sat, 21 Sep 2013 04:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1379737426!3404753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1329 invoked from network); 21 Sep 2013 04:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjS-0000Qx-I1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjS-0000rk-Gy for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:46 +0000 Date: Sat, 21 Sep 2013 04:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: hdlcd: Use early_printk instead of printk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34743911e7a49f424fc2e92b5148e411aae8e71c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:17 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:13 2013 +0100 xen/video: hdlcd: Use early_printk instead of printk The video driver is initialized before the console is correctly set up. Therefore, printk will never output if there is no serial configured. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/drivers/video/arm_hdlcd.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index ab464c6..dffda9a 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -146,13 +146,13 @@ void __init video_init(void) if ( !hdlcd_start ) { - printk(KERN_ERR "HDLCD address missing from device tree, disabling driver\n"); + early_printk(KERN_ERR "HDLCD: address missing from device tree, disabling driver\n"); return; } if ( !hdlcd_start || !framebuffer_start ) { - printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); + early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); return; } @@ -166,27 +166,27 @@ void __init video_init(void) else if ( strlen(mode_string) < strlen("800x600@60") || strlen(mode_string) > sizeof(_mode_string) - 1 ) { - printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string); + early_printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string); return; } else { char *s = strchr(mode_string, '-'); if ( !s ) { - printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n", - mode_string); + early_printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n", + mode_string); get_color_masks("32", &c); memcpy(_mode_string, mode_string, strlen(mode_string) + 1); bytes_per_pixel = 4; } else { if ( strlen(s) < 6 ) { - printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string); + early_printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string); return; } s++; if ( get_color_masks(s, &c) < 0 ) { - printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s); + early_printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s); return; } bytes_per_pixel = simple_strtoll(s, NULL, 10) / 8; @@ -205,22 +205,23 @@ void __init video_init(void) } if ( !videomode ) { - printk(KERN_WARNING "HDLCD: unsupported videomode %s\n", _mode_string); + early_printk(KERN_WARNING "HDLCD: unsupported videomode %s\n", + _mode_string); return; } if ( framebuffer_size < bytes_per_pixel * videomode->xres * videomode->yres ) { - printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n"); + early_printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n"); return; } - printk(KERN_INFO "Initializing HDLCD driver\n"); + early_printk(KERN_INFO "Initializing HDLCD driver\n"); lfb = ioremap_wc(framebuffer_start, framebuffer_size); if ( !lfb ) { - printk(KERN_ERR "Couldn't map the framebuffer\n"); + early_printk(KERN_ERR "Couldn't map the framebuffer\n"); return; } memset(lfb, 0x00, bytes_per_pixel * videomode->xres * videomode->yres); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjj-0005CV-AY; Sat, 21 Sep 2013 04: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 1VNEjg-0005C6-Rb for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:01 +0000 Received: from [85.158.137.68:56950] by server-17.bemta-3.messagelabs.com id 65/F1-03449-06F1D325; Sat, 21 Sep 2013 04:24:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1379737436!3840776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5472 invoked from network); 21 Sep 2013 04:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjc-0000R6-Po for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjc-0000s6-OG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:56 +0000 Date: Sat, 21 Sep 2013 04:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Use dt_device_match to avoid multiple if conditions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b Author: Julien Grall AuthorDate: Fri Sep 13 13:49:18 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:18 2013 +0100 xen/arm: Use dt_device_match to avoid multiple if conditions There is some place in Xen ARM code where multiple if conditions is used check the presence of a node or find a node. These pieces of code can be replace by an array and using proper device tree helpers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 11 ++++++++--- xen/arch/arm/time.c | 9 ++++++--- xen/include/asm-arm/time.h | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index bde041e..8ebe1bc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -437,15 +437,20 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) static int handle_node(struct domain *d, const struct dt_device_node *np) { + static const struct dt_device_match skip_matches[] __initconst = + { + DT_MATCH_COMPATIBLE("xen,xen"), + DT_MATCH_TYPE("memory"), + DT_MATCH_PATH("/chosen"), + { /* sentinel */ }, + }; const struct dt_device_node *child; int res; DPRINT("handle %s\n", dt_node_full_name(np)); /* Skip theses nodes and the sub-nodes */ - if ( dt_device_is_compatible(np, "xen,xen") || - dt_device_type_is_equal(np, "memory") || - !strcmp("/chosen", dt_node_full_name(np)) ) + if ( dt_match_node(skip_matches, np ) ) return 0; if ( dt_device_used_by(np) != DOMID_XEN ) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 9c176cd..eb3ad5c 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -101,14 +101,17 @@ static uint32_t calibrate_timer(void) /* Set up the timer on the boot CPU */ int __init init_xen_time(void) { + static const struct dt_device_match timer_ids[] __initconst = + { + DT_MATCH_TIMER, + { /* sentinel */ }, + }; struct dt_device_node *dev; int res; unsigned int i; u32 rate; - dev = dt_find_compatible_node(NULL, NULL, "arm,armv7-timer"); - if ( !dev ) - dev = dt_find_compatible_node(NULL, NULL, "arm,armv8-timer"); + dev = dt_find_matching_node(NULL, timer_ids); if ( !dev ) panic("Unable to find a compatible timer in the device tree\n"); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index f7aa868..9d302d3 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -1,6 +1,10 @@ #ifndef __ARM_TIME_H__ #define __ARM_TIME_H__ +#define DT_MATCH_TIMER \ + DT_MATCH_COMPATIBLE("arm,armv7-timer"), \ + DT_MATCH_COMPATIBLE("arm,armv8-timer") + typedef unsigned long cycles_t; static inline cycles_t get_cycles (void) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjj-0005CV-AY; Sat, 21 Sep 2013 04: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 1VNEjg-0005C6-Rb for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:01 +0000 Received: from [85.158.137.68:56950] by server-17.bemta-3.messagelabs.com id 65/F1-03449-06F1D325; Sat, 21 Sep 2013 04:24:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1379737436!3840776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5472 invoked from network); 21 Sep 2013 04:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjc-0000R6-Po for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjc-0000s6-OG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:23:56 +0000 Date: Sat, 21 Sep 2013 04:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Use dt_device_match to avoid multiple if conditions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b Author: Julien Grall AuthorDate: Fri Sep 13 13:49:18 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:18 2013 +0100 xen/arm: Use dt_device_match to avoid multiple if conditions There is some place in Xen ARM code where multiple if conditions is used check the presence of a node or find a node. These pieces of code can be replace by an array and using proper device tree helpers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 11 ++++++++--- xen/arch/arm/time.c | 9 ++++++--- xen/include/asm-arm/time.h | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index bde041e..8ebe1bc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -437,15 +437,20 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) static int handle_node(struct domain *d, const struct dt_device_node *np) { + static const struct dt_device_match skip_matches[] __initconst = + { + DT_MATCH_COMPATIBLE("xen,xen"), + DT_MATCH_TYPE("memory"), + DT_MATCH_PATH("/chosen"), + { /* sentinel */ }, + }; const struct dt_device_node *child; int res; DPRINT("handle %s\n", dt_node_full_name(np)); /* Skip theses nodes and the sub-nodes */ - if ( dt_device_is_compatible(np, "xen,xen") || - dt_device_type_is_equal(np, "memory") || - !strcmp("/chosen", dt_node_full_name(np)) ) + if ( dt_match_node(skip_matches, np ) ) return 0; if ( dt_device_used_by(np) != DOMID_XEN ) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 9c176cd..eb3ad5c 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -101,14 +101,17 @@ static uint32_t calibrate_timer(void) /* Set up the timer on the boot CPU */ int __init init_xen_time(void) { + static const struct dt_device_match timer_ids[] __initconst = + { + DT_MATCH_TIMER, + { /* sentinel */ }, + }; struct dt_device_node *dev; int res; unsigned int i; u32 rate; - dev = dt_find_compatible_node(NULL, NULL, "arm,armv7-timer"); - if ( !dev ) - dev = dt_find_compatible_node(NULL, NULL, "arm,armv8-timer"); + dev = dt_find_matching_node(NULL, timer_ids); if ( !dev ) panic("Unable to find a compatible timer in the device tree\n"); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index f7aa868..9d302d3 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -1,6 +1,10 @@ #ifndef __ARM_TIME_H__ #define __ARM_TIME_H__ +#define DT_MATCH_TIMER \ + DT_MATCH_COMPATIBLE("arm,armv7-timer"), \ + DT_MATCH_COMPATIBLE("arm,armv8-timer") + typedef unsigned long cycles_t; static inline cycles_t get_cycles (void) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24: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 1VNEjq-0005E5-G5; Sat, 21 Sep 2013 04:24:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjq-0005Du-0X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:10 +0000 Received: from [85.158.137.68:6848] by server-5.bemta-3.messagelabs.com id 2B/A9-23058-96F1D325; Sat, 21 Sep 2013 04:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1379737447!3822060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7799 invoked from network); 21 Sep 2013 04:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjn-0000Rr-0h for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjm-0000sd-Uo for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:06 +0000 Date: Sat, 21 Sep 2013 04:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: dt_find_interrupt_controller: accept multiple compatible strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e60d11198f7d7fa7cdb4260546d424de14449401 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:23 2013 +0100 xen/dts: dt_find_interrupt_controller: accept multiple compatible strings Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 7 ++++++- xen/common/device_tree.c | 5 +++-- xen/include/asm-arm/gic.h | 2 ++ xen/include/xen/device_tree.h | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 7c24811..aff57b9 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -355,10 +355,15 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { + static const struct dt_device_match gic_ids[] __initconst = + { + DT_MATCH_GIC, + { /* sentinel */ }, + }; struct dt_device_node *node; int res; - node = dt_find_interrupt_controller("arm,cortex-a15-gic"); + node = dt_find_interrupt_controller(gic_ids); if ( !node ) panic("Unable to find compatible GIC in the device tree\n"); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index d2262ce..215592e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1834,11 +1834,12 @@ static void __init dt_alias_scan(void) } } -struct dt_device_node * __init dt_find_interrupt_controller(const char *compat) +struct dt_device_node * __init +dt_find_interrupt_controller(const struct dt_device_match *matches) { struct dt_device_node *np = NULL; - while ( (np = dt_find_compatible_node(np, NULL, compat)) ) + while ( (np = dt_find_matching_node(np, matches)) ) { if ( !dt_find_property(np, "interrupt-controller", NULL) ) continue; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 513c1fc..92a3349 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -135,6 +135,8 @@ #ifndef __ASSEMBLY__ #include +#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic") + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5a51ab6..fae9f97 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -240,7 +240,8 @@ extern const struct dt_device_node *dt_interrupt_controller; * * If found, return the interrupt controller device node. */ -struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); +struct dt_device_node * __init +dt_find_interrupt_controller(const struct dt_device_match *matches); #define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) #define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24: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 1VNEjq-0005E5-G5; Sat, 21 Sep 2013 04:24:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjq-0005Du-0X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:10 +0000 Received: from [85.158.137.68:6848] by server-5.bemta-3.messagelabs.com id 2B/A9-23058-96F1D325; Sat, 21 Sep 2013 04:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1379737447!3822060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7799 invoked from network); 21 Sep 2013 04:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjn-0000Rr-0h for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjm-0000sd-Uo for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:06 +0000 Date: Sat, 21 Sep 2013 04:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: dt_find_interrupt_controller: accept multiple compatible strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e60d11198f7d7fa7cdb4260546d424de14449401 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:23 2013 +0100 xen/dts: dt_find_interrupt_controller: accept multiple compatible strings Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 7 ++++++- xen/common/device_tree.c | 5 +++-- xen/include/asm-arm/gic.h | 2 ++ xen/include/xen/device_tree.h | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 7c24811..aff57b9 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -355,10 +355,15 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize, /* Set up the GIC */ void __init gic_init(void) { + static const struct dt_device_match gic_ids[] __initconst = + { + DT_MATCH_GIC, + { /* sentinel */ }, + }; struct dt_device_node *node; int res; - node = dt_find_interrupt_controller("arm,cortex-a15-gic"); + node = dt_find_interrupt_controller(gic_ids); if ( !node ) panic("Unable to find compatible GIC in the device tree\n"); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index d2262ce..215592e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1834,11 +1834,12 @@ static void __init dt_alias_scan(void) } } -struct dt_device_node * __init dt_find_interrupt_controller(const char *compat) +struct dt_device_node * __init +dt_find_interrupt_controller(const struct dt_device_match *matches) { struct dt_device_node *np = NULL; - while ( (np = dt_find_compatible_node(np, NULL, compat)) ) + while ( (np = dt_find_matching_node(np, matches)) ) { if ( !dt_find_property(np, "interrupt-controller", NULL) ) continue; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 513c1fc..92a3349 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -135,6 +135,8 @@ #ifndef __ASSEMBLY__ #include +#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic") + extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5a51ab6..fae9f97 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -240,7 +240,8 @@ extern const struct dt_device_node *dt_interrupt_controller; * * If found, return the interrupt controller device node. */ -struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); +struct dt_device_node * __init +dt_find_interrupt_controller(const struct dt_device_match *matches); #define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) #define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24: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 1VNEk2-0005H4-Np; Sat, 21 Sep 2013 04:24:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk1-0005GZ-Dr for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:21 +0000 Received: from [85.158.137.68:57685] by server-15.bemta-3.messagelabs.com id 13/10-21409-47F1D325; Sat, 21 Sep 2013 04:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737457!3830708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3249 invoked from network); 21 Sep 2013 04:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjx-0000Rx-9w for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjx-0000tX-4l for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:17 +0000 Date: Sat, 21 Sep 2013 04:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Build DOM0 FDT by browsing the device tree 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 b8f1c5e7039efbe1103ed3fe4caedf8c34affe13 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:20 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:28 2013 +0100 xen/arm: Build DOM0 FDT by browsing the device tree structure Remove the usage of the FDT in benefit of the device tree structure. The latter is easier to use and can embedded meta-data for Xen (ie: is the device is used by Xen...). Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 327 +++++++++++++++++++++---------------------- 1 files changed, 162 insertions(+), 165 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8ebe1bc..fb4f172 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -63,10 +63,10 @@ struct vcpu *__init alloc_dom0_vcpu0(void) } static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, - const void *fdt, const u32 *cell, int len, - int address_cells, int size_cells, u32 *new_cell) + const struct dt_property *pp, + const struct dt_device_node *np, __be32 *new_cell) { - int reg_size = (address_cells + size_cells) * sizeof(*cell); + int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); paddr_t start; paddr_t size; struct page_info *pg; @@ -90,7 +90,7 @@ static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, if ( res ) panic("Unable to add pages in DOM0: %d\n", res); - device_tree_set_reg(&new_cell, address_cells, size_cells, start, size); + dt_set_range(&new_cell, np, start, size); kinfo->mem.bank[0].start = start; kinfo->mem.bank[0].size = size; @@ -100,25 +100,30 @@ static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, } static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, - const void *fdt, const u32 *cell, int len, - int address_cells, int size_cells, u32 *new_cell) + const struct dt_property *pp, + const struct dt_device_node *np, __be32 *new_cell) { - int reg_size = (address_cells + size_cells) * sizeof(*cell); + int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); int l = 0; + unsigned int bank = 0; u64 start; u64 size; + int ret; if ( platform_has_quirk(PLATFORM_QUIRK_DOM0_MAPPING_11) ) - return set_memory_reg_11(d, kinfo, fdt, cell, len, address_cells, - size_cells, new_cell); + return set_memory_reg_11(d, kinfo, pp, np, new_cell); - while ( kinfo->unassigned_mem > 0 && l + reg_size <= len + while ( kinfo->unassigned_mem > 0 && l + reg_size <= pp->length && kinfo->mem.nr_banks < NR_MEM_BANKS ) { - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + ret = dt_device_get_address(np, bank, &start, &size); + if ( ret ) + panic("Unable to retrieve the bank %u for %s\n", + bank, dt_node_full_name(np)); + if ( size > kinfo->unassigned_mem ) size = kinfo->unassigned_mem; - device_tree_set_reg(&new_cell, address_cells, size_cells, start, size); + dt_set_range(&new_cell, np, start, size); printk("Populate P2M %#"PRIx64"->%#"PRIx64"\n", start, start + size); if ( p2m_populate_ram(d, start, start + size) < 0 ) @@ -135,31 +140,21 @@ static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, } static int write_properties(struct domain *d, struct kernel_info *kinfo, - const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells) + const struct dt_device_node *np) { const char *bootargs = NULL; - int prop; + const struct dt_property *pp; + int res = 0; if ( early_info.modules.nr_mods >= MOD_KERNEL && early_info.modules.module[MOD_KERNEL].cmdline[0] ) bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; - for ( prop = fdt_first_property_offset(fdt, node); - prop >= 0; - prop = fdt_next_property_offset(fdt, prop) ) + dt_for_each_property_node (np, pp) { - const struct fdt_property *p; - const char *prop_name; - const char *prop_data; - int prop_len; - char *new_data = NULL; - - p = fdt_get_property_by_offset(fdt, prop, NULL); - prop_name = fdt_string(fdt, fdt32_to_cpu(p->nameoff)); - prop_data = p->data; - prop_len = fdt32_to_cpu(p->len); + const void *prop_data = pp->value; + void *new_data = NULL; + u32 prop_len = pp->length; /* * In chosen node: @@ -168,105 +163,114 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs and xen,dom0-bootargs. */ - if ( device_tree_node_matches(fdt, node, "chosen") ) + if ( dt_node_path_is_equal(np, "/chosen") ) { - if ( strcmp(prop_name, "bootargs") == 0 ) + if ( dt_property_name_is_equal(pp, "bootargs") ) continue; - else if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) + else if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) { if ( !bootargs ) - bootargs = prop_data; + bootargs = pp->value; continue; } } /* * In a memory node: adjust reg property. + * TODO: handle properly memory node (ie: device_type = "memory") */ - else if ( device_tree_node_matches(fdt, node, "memory") ) + else if ( dt_node_name_is_equal(np, "memory") ) { - if ( strcmp(prop_name, "reg") == 0 ) + if ( dt_property_name_is_equal(pp, "reg") ) { - new_data = xzalloc_bytes(prop_len); + new_data = xzalloc_bytes(pp->length); if ( new_data == NULL ) return -FDT_ERR_XEN(ENOMEM); - prop_len = set_memory_reg(d, kinfo, fdt, - (u32 *)prop_data, prop_len, - address_cells, size_cells, - (u32 *)new_data); + prop_len = set_memory_reg(d, kinfo, pp, np, + (__be32 *)new_data); prop_data = new_data; } } - /* - * TODO: Should call map_mmio_regions() for all devices in the - * tree that have a "reg" parameter (except cpus). This - * requires looking into the parent node's "ranges" property - * to translate the bus address in the "reg" value into - * physical addresses. Regions also need to be rounded up to - * whole pages. - */ - - fdt_property(kinfo->fdt, prop_name, prop_data, prop_len); + res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); xfree(new_data); + + if ( res ) + return res; } - if ( device_tree_node_matches(fdt, node, "chosen") && bootargs ) - fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs) + 1); + if ( dt_node_path_is_equal(np, "/chosen") && bootargs ) + { + res = fdt_property(kinfo->fdt, "bootargs", bootargs, + strlen(bootargs) + 1); + if ( res ) + return res; + } /* * XXX should populate /chosen/linux,initrd-{start,end} here if we * have module[2] */ - if ( prop == -FDT_ERR_NOTFOUND ) - return 0; - return prop; + return 0; } -/* Returns the next node in fdt (starting from offset) which should be - * passed through to dom0. +/* + * Helper to write an interrupts with the GIC format + * This code is assuming the irq is an PPI. */ -static int fdt_next_dom0_node(const void *fdt, int node, - int *depth_out) + +typedef __be32 gic_interrupt_t[3]; + +static void set_interrupt_ppi(gic_interrupt_t interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) { - int depth = *depth_out; + __be32 *cells = interrupt; - while ( (node = fdt_next_node(fdt, node, &depth)) && - node >= 0 && depth >= 0 ) - { - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - break; + BUG_ON(irq < 16 && irq >= 32); - /* 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; - } + /* See linux Documentation/devictree/bindings/arm/gic.txt */ + dt_set_cell(&cells, 1, 1); /* is a PPI */ + dt_set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + dt_set_cell(&cells, 1, (cpumask << 8) | level); +} - /* Skip multiboot subnodes */ - if ( fdt_node_check_compatible(fdt, node, - "xen,multiboot-module" ) == 0 ) - continue; +/* + * Helper to set interrupts for a node in the flat device tree. + * It needs 2 property: + * "interrupts": contains the list of interrupts + * "interrupt-parent": link to the GIC + */ +static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, + unsigned num_irq) +{ + int res; - /* We've arrived at a node which dom0 is interested in. */ - break; - } + res = fdt_property(fdt, "interrupts", intr, sizeof (intr[0]) * num_irq); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "interrupt-parent", + dt_interrupt_controller->phandle); - *depth_out = depth; - return node; + return res; } -static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) + +static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) { const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" "xen,xen"; - u32 reg[4]; - u32 intr[3]; - u32 *cell; + __be32 reg[4]; + gic_interrupt_t intr; + __be32 *cells; + int res; + int addrcells = dt_n_addr_cells(parent); + int sizecells = dt_n_size_cells(parent); + + DPRINT("Create hypervisor node\n"); /* * Sanity-check address sizes, since addresses and sizes which do @@ -277,82 +281,42 @@ static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) panic("Cannot cope with this size"); /* See linux Documentation/devicetree/bindings/arm/xen.txt */ - fdt_begin_node(fdt, "hypervisor"); + res = fdt_begin_node(fdt, "hypervisor"); + if ( res ) + return res; /* Cannot use fdt_property_string due to embedded nulls */ - fdt_property(fdt, "compatible", compat, sizeof(compat)); + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + DPRINT(" Grant table range: 0xb0000000-0x20000\n"); /* 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)); + cells = ®[0]; + dt_set_range(&cells, parent, 0xb0000000, 0x20000); + res = fdt_property(fdt, "reg", reg, + dt_cells_to_size(addrcells + sizecells)); + if ( res ) + return res; /* - * interrupts is evtchn upcall <1 15 0xf08> - * See linux Documentation/devicetree/bindings/arm/gic.txt + * interrupts is evtchn upcall: + * - Active-low level-sensitive + * - All cpus + * + * TODO: Handle correctly the cpumask */ - 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); + DPRINT(" Event channel interrupt to %u\n", VGIC_IRQ_EVTCHN_CALLBACK); + set_interrupt_ppi(intr, VGIC_IRQ_EVTCHN_CALLBACK, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); - fdt_end_node(fdt); -} - -static int write_nodes(struct domain *d, struct kernel_info *kinfo, - const void *fdt) -{ - int node; - int depth = 0, last_depth = -1; - u32 address_cells[DEVICE_TREE_MAX_DEPTH]; - u32 size_cells[DEVICE_TREE_MAX_DEPTH]; - int ret; - - for ( node = 0, depth = 0; - node >= 0 && depth >= 0; - node = fdt_next_dom0_node(fdt, node, &depth) ) - { - const char *name; - - name = fdt_get_name(fdt, node, NULL); - - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - { - printk("warning: node `%s' is nested too deep (%d)\n", - name, depth); - 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", - 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); - - ret = write_properties(d, kinfo, fdt, node, name, depth, - address_cells[depth-1], size_cells[depth-1]); - if ( ret < 0 ) - return ret; - - last_depth = depth; - } - - while ( last_depth-- >= 1 ) - fdt_end_node(kinfo->fdt); + res = fdt_property_interrupts(fdt, &intr, 1); + if ( res ) + return res; - make_hypervisor_node(kinfo->fdt, address_cells[0], size_cells[0]); + res = fdt_end_node(fdt); - fdt_end_node(kinfo->fdt); - return 0; + return res; } /* Map the device in the domain */ @@ -435,25 +399,39 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) return 0; } -static int handle_node(struct domain *d, const struct dt_device_node *np) +static int handle_node(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *np) { static const struct dt_device_match skip_matches[] __initconst = { DT_MATCH_COMPATIBLE("xen,xen"), - DT_MATCH_TYPE("memory"), - DT_MATCH_PATH("/chosen"), + DT_MATCH_COMPATIBLE("xen,multiboot-module"), { /* sentinel */ }, }; const struct dt_device_node *child; int res; + const char *name; + const char *path; + + path = dt_node_full_name(np); - DPRINT("handle %s\n", dt_node_full_name(np)); + DPRINT("handle %s\n", path); /* Skip theses nodes and the sub-nodes */ if ( dt_match_node(skip_matches, np ) ) + { + DPRINT(" Skip it!\n"); return 0; + } - if ( dt_device_used_by(np) != DOMID_XEN ) + /* + * Some device doesn't need to be mapped in Xen: + * - Device used by Xen: Obviously dom0 can't use them + * - Memory: the guest will see a different view of memory. It will + * be allocated later. + */ + if ( dt_device_used_by(np) != DOMID_XEN && + !dt_device_type_is_equal(np, "memory") ) { res = map_device(d, np); @@ -461,21 +439,39 @@ static int handle_node(struct domain *d, const struct dt_device_node *np) return res; } + /* + * The property "name" is used to have a different name on older FDT + * version. We want to keep the name retrieved during the tree + * structure creation, that is store in the node path. + */ + name = strrchr(path, '/'); + name = name ? name + 1 : path; + + res = fdt_begin_node(kinfo->fdt, name); + if ( res ) + return res; + + res = write_properties(d, kinfo, np); + if ( res ) + return res; + for ( child = np->child; child != NULL; child = child->sibling ) { - res = handle_node(d, child); + res = handle_node(d, kinfo, child); if ( res ) return res; } - return 0; -} + if ( np == dt_host ) + { + res = make_hypervisor_node(kinfo->fdt, np); + if ( res ) + return res; + } -static int map_devices_from_device_tree(struct domain *d) -{ - ASSERT(dt_host && (dt_host->sibling == NULL)); + res = fdt_end_node(kinfo->fdt); - return handle_node(d, dt_host); + return res; } static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) @@ -485,6 +481,8 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) int ret; paddr_t end; + ASSERT(dt_host && (dt_host->sibling == NULL)); + kinfo->unassigned_mem = dom0_mem; fdt = device_tree_flattened; @@ -500,8 +498,8 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) fdt_finish_reservemap(kinfo->fdt); - ret = write_nodes(d, kinfo, fdt); - if ( ret < 0 ) + ret = handle_node(d, kinfo, dt_host); + if ( ret ) goto err; ret = fdt_finish(kinfo->fdt); @@ -576,7 +574,6 @@ int construct_dom0(struct domain *d) if ( rc < 0 ) return rc; - map_devices_from_device_tree(d); rc = platform_specific_mapping(d); if ( rc < 0 ) return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24: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 1VNEk2-0005H4-Np; Sat, 21 Sep 2013 04:24:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk1-0005GZ-Dr for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:21 +0000 Received: from [85.158.137.68:57685] by server-15.bemta-3.messagelabs.com id 13/10-21409-47F1D325; Sat, 21 Sep 2013 04:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737457!3830708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3249 invoked from network); 21 Sep 2013 04:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEjx-0000Rx-9w for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEjx-0000tX-4l for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:17 +0000 Date: Sat, 21 Sep 2013 04:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Build DOM0 FDT by browsing the device tree 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 b8f1c5e7039efbe1103ed3fe4caedf8c34affe13 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:20 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:28 2013 +0100 xen/arm: Build DOM0 FDT by browsing the device tree structure Remove the usage of the FDT in benefit of the device tree structure. The latter is easier to use and can embedded meta-data for Xen (ie: is the device is used by Xen...). Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 327 +++++++++++++++++++++---------------------- 1 files changed, 162 insertions(+), 165 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8ebe1bc..fb4f172 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -63,10 +63,10 @@ struct vcpu *__init alloc_dom0_vcpu0(void) } static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, - const void *fdt, const u32 *cell, int len, - int address_cells, int size_cells, u32 *new_cell) + const struct dt_property *pp, + const struct dt_device_node *np, __be32 *new_cell) { - int reg_size = (address_cells + size_cells) * sizeof(*cell); + int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); paddr_t start; paddr_t size; struct page_info *pg; @@ -90,7 +90,7 @@ static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, if ( res ) panic("Unable to add pages in DOM0: %d\n", res); - device_tree_set_reg(&new_cell, address_cells, size_cells, start, size); + dt_set_range(&new_cell, np, start, size); kinfo->mem.bank[0].start = start; kinfo->mem.bank[0].size = size; @@ -100,25 +100,30 @@ static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, } static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, - const void *fdt, const u32 *cell, int len, - int address_cells, int size_cells, u32 *new_cell) + const struct dt_property *pp, + const struct dt_device_node *np, __be32 *new_cell) { - int reg_size = (address_cells + size_cells) * sizeof(*cell); + int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); int l = 0; + unsigned int bank = 0; u64 start; u64 size; + int ret; if ( platform_has_quirk(PLATFORM_QUIRK_DOM0_MAPPING_11) ) - return set_memory_reg_11(d, kinfo, fdt, cell, len, address_cells, - size_cells, new_cell); + return set_memory_reg_11(d, kinfo, pp, np, new_cell); - while ( kinfo->unassigned_mem > 0 && l + reg_size <= len + while ( kinfo->unassigned_mem > 0 && l + reg_size <= pp->length && kinfo->mem.nr_banks < NR_MEM_BANKS ) { - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + ret = dt_device_get_address(np, bank, &start, &size); + if ( ret ) + panic("Unable to retrieve the bank %u for %s\n", + bank, dt_node_full_name(np)); + if ( size > kinfo->unassigned_mem ) size = kinfo->unassigned_mem; - device_tree_set_reg(&new_cell, address_cells, size_cells, start, size); + dt_set_range(&new_cell, np, start, size); printk("Populate P2M %#"PRIx64"->%#"PRIx64"\n", start, start + size); if ( p2m_populate_ram(d, start, start + size) < 0 ) @@ -135,31 +140,21 @@ static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, } static int write_properties(struct domain *d, struct kernel_info *kinfo, - const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells) + const struct dt_device_node *np) { const char *bootargs = NULL; - int prop; + const struct dt_property *pp; + int res = 0; if ( early_info.modules.nr_mods >= MOD_KERNEL && early_info.modules.module[MOD_KERNEL].cmdline[0] ) bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; - for ( prop = fdt_first_property_offset(fdt, node); - prop >= 0; - prop = fdt_next_property_offset(fdt, prop) ) + dt_for_each_property_node (np, pp) { - const struct fdt_property *p; - const char *prop_name; - const char *prop_data; - int prop_len; - char *new_data = NULL; - - p = fdt_get_property_by_offset(fdt, prop, NULL); - prop_name = fdt_string(fdt, fdt32_to_cpu(p->nameoff)); - prop_data = p->data; - prop_len = fdt32_to_cpu(p->len); + const void *prop_data = pp->value; + void *new_data = NULL; + u32 prop_len = pp->length; /* * In chosen node: @@ -168,105 +163,114 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs and xen,dom0-bootargs. */ - if ( device_tree_node_matches(fdt, node, "chosen") ) + if ( dt_node_path_is_equal(np, "/chosen") ) { - if ( strcmp(prop_name, "bootargs") == 0 ) + if ( dt_property_name_is_equal(pp, "bootargs") ) continue; - else if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) + else if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) { if ( !bootargs ) - bootargs = prop_data; + bootargs = pp->value; continue; } } /* * In a memory node: adjust reg property. + * TODO: handle properly memory node (ie: device_type = "memory") */ - else if ( device_tree_node_matches(fdt, node, "memory") ) + else if ( dt_node_name_is_equal(np, "memory") ) { - if ( strcmp(prop_name, "reg") == 0 ) + if ( dt_property_name_is_equal(pp, "reg") ) { - new_data = xzalloc_bytes(prop_len); + new_data = xzalloc_bytes(pp->length); if ( new_data == NULL ) return -FDT_ERR_XEN(ENOMEM); - prop_len = set_memory_reg(d, kinfo, fdt, - (u32 *)prop_data, prop_len, - address_cells, size_cells, - (u32 *)new_data); + prop_len = set_memory_reg(d, kinfo, pp, np, + (__be32 *)new_data); prop_data = new_data; } } - /* - * TODO: Should call map_mmio_regions() for all devices in the - * tree that have a "reg" parameter (except cpus). This - * requires looking into the parent node's "ranges" property - * to translate the bus address in the "reg" value into - * physical addresses. Regions also need to be rounded up to - * whole pages. - */ - - fdt_property(kinfo->fdt, prop_name, prop_data, prop_len); + res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); xfree(new_data); + + if ( res ) + return res; } - if ( device_tree_node_matches(fdt, node, "chosen") && bootargs ) - fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs) + 1); + if ( dt_node_path_is_equal(np, "/chosen") && bootargs ) + { + res = fdt_property(kinfo->fdt, "bootargs", bootargs, + strlen(bootargs) + 1); + if ( res ) + return res; + } /* * XXX should populate /chosen/linux,initrd-{start,end} here if we * have module[2] */ - if ( prop == -FDT_ERR_NOTFOUND ) - return 0; - return prop; + return 0; } -/* Returns the next node in fdt (starting from offset) which should be - * passed through to dom0. +/* + * Helper to write an interrupts with the GIC format + * This code is assuming the irq is an PPI. */ -static int fdt_next_dom0_node(const void *fdt, int node, - int *depth_out) + +typedef __be32 gic_interrupt_t[3]; + +static void set_interrupt_ppi(gic_interrupt_t interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) { - int depth = *depth_out; + __be32 *cells = interrupt; - while ( (node = fdt_next_node(fdt, node, &depth)) && - node >= 0 && depth >= 0 ) - { - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - break; + BUG_ON(irq < 16 && irq >= 32); - /* 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; - } + /* See linux Documentation/devictree/bindings/arm/gic.txt */ + dt_set_cell(&cells, 1, 1); /* is a PPI */ + dt_set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + dt_set_cell(&cells, 1, (cpumask << 8) | level); +} - /* Skip multiboot subnodes */ - if ( fdt_node_check_compatible(fdt, node, - "xen,multiboot-module" ) == 0 ) - continue; +/* + * Helper to set interrupts for a node in the flat device tree. + * It needs 2 property: + * "interrupts": contains the list of interrupts + * "interrupt-parent": link to the GIC + */ +static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, + unsigned num_irq) +{ + int res; - /* We've arrived at a node which dom0 is interested in. */ - break; - } + res = fdt_property(fdt, "interrupts", intr, sizeof (intr[0]) * num_irq); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "interrupt-parent", + dt_interrupt_controller->phandle); - *depth_out = depth; - return node; + return res; } -static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) + +static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) { const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" "xen,xen"; - u32 reg[4]; - u32 intr[3]; - u32 *cell; + __be32 reg[4]; + gic_interrupt_t intr; + __be32 *cells; + int res; + int addrcells = dt_n_addr_cells(parent); + int sizecells = dt_n_size_cells(parent); + + DPRINT("Create hypervisor node\n"); /* * Sanity-check address sizes, since addresses and sizes which do @@ -277,82 +281,42 @@ static void make_hypervisor_node(void *fdt, int addrcells, int sizecells) panic("Cannot cope with this size"); /* See linux Documentation/devicetree/bindings/arm/xen.txt */ - fdt_begin_node(fdt, "hypervisor"); + res = fdt_begin_node(fdt, "hypervisor"); + if ( res ) + return res; /* Cannot use fdt_property_string due to embedded nulls */ - fdt_property(fdt, "compatible", compat, sizeof(compat)); + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + DPRINT(" Grant table range: 0xb0000000-0x20000\n"); /* 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)); + cells = ®[0]; + dt_set_range(&cells, parent, 0xb0000000, 0x20000); + res = fdt_property(fdt, "reg", reg, + dt_cells_to_size(addrcells + sizecells)); + if ( res ) + return res; /* - * interrupts is evtchn upcall <1 15 0xf08> - * See linux Documentation/devicetree/bindings/arm/gic.txt + * interrupts is evtchn upcall: + * - Active-low level-sensitive + * - All cpus + * + * TODO: Handle correctly the cpumask */ - 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); + DPRINT(" Event channel interrupt to %u\n", VGIC_IRQ_EVTCHN_CALLBACK); + set_interrupt_ppi(intr, VGIC_IRQ_EVTCHN_CALLBACK, 0xf, + DT_IRQ_TYPE_LEVEL_LOW); - fdt_end_node(fdt); -} - -static int write_nodes(struct domain *d, struct kernel_info *kinfo, - const void *fdt) -{ - int node; - int depth = 0, last_depth = -1; - u32 address_cells[DEVICE_TREE_MAX_DEPTH]; - u32 size_cells[DEVICE_TREE_MAX_DEPTH]; - int ret; - - for ( node = 0, depth = 0; - node >= 0 && depth >= 0; - node = fdt_next_dom0_node(fdt, node, &depth) ) - { - const char *name; - - name = fdt_get_name(fdt, node, NULL); - - if ( depth >= DEVICE_TREE_MAX_DEPTH ) - { - printk("warning: node `%s' is nested too deep (%d)\n", - name, depth); - 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", - 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); - - ret = write_properties(d, kinfo, fdt, node, name, depth, - address_cells[depth-1], size_cells[depth-1]); - if ( ret < 0 ) - return ret; - - last_depth = depth; - } - - while ( last_depth-- >= 1 ) - fdt_end_node(kinfo->fdt); + res = fdt_property_interrupts(fdt, &intr, 1); + if ( res ) + return res; - make_hypervisor_node(kinfo->fdt, address_cells[0], size_cells[0]); + res = fdt_end_node(fdt); - fdt_end_node(kinfo->fdt); - return 0; + return res; } /* Map the device in the domain */ @@ -435,25 +399,39 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) return 0; } -static int handle_node(struct domain *d, const struct dt_device_node *np) +static int handle_node(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *np) { static const struct dt_device_match skip_matches[] __initconst = { DT_MATCH_COMPATIBLE("xen,xen"), - DT_MATCH_TYPE("memory"), - DT_MATCH_PATH("/chosen"), + DT_MATCH_COMPATIBLE("xen,multiboot-module"), { /* sentinel */ }, }; const struct dt_device_node *child; int res; + const char *name; + const char *path; + + path = dt_node_full_name(np); - DPRINT("handle %s\n", dt_node_full_name(np)); + DPRINT("handle %s\n", path); /* Skip theses nodes and the sub-nodes */ if ( dt_match_node(skip_matches, np ) ) + { + DPRINT(" Skip it!\n"); return 0; + } - if ( dt_device_used_by(np) != DOMID_XEN ) + /* + * Some device doesn't need to be mapped in Xen: + * - Device used by Xen: Obviously dom0 can't use them + * - Memory: the guest will see a different view of memory. It will + * be allocated later. + */ + if ( dt_device_used_by(np) != DOMID_XEN && + !dt_device_type_is_equal(np, "memory") ) { res = map_device(d, np); @@ -461,21 +439,39 @@ static int handle_node(struct domain *d, const struct dt_device_node *np) return res; } + /* + * The property "name" is used to have a different name on older FDT + * version. We want to keep the name retrieved during the tree + * structure creation, that is store in the node path. + */ + name = strrchr(path, '/'); + name = name ? name + 1 : path; + + res = fdt_begin_node(kinfo->fdt, name); + if ( res ) + return res; + + res = write_properties(d, kinfo, np); + if ( res ) + return res; + for ( child = np->child; child != NULL; child = child->sibling ) { - res = handle_node(d, child); + res = handle_node(d, kinfo, child); if ( res ) return res; } - return 0; -} + if ( np == dt_host ) + { + res = make_hypervisor_node(kinfo->fdt, np); + if ( res ) + return res; + } -static int map_devices_from_device_tree(struct domain *d) -{ - ASSERT(dt_host && (dt_host->sibling == NULL)); + res = fdt_end_node(kinfo->fdt); - return handle_node(d, dt_host); + return res; } static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) @@ -485,6 +481,8 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) int ret; paddr_t end; + ASSERT(dt_host && (dt_host->sibling == NULL)); + kinfo->unassigned_mem = dom0_mem; fdt = device_tree_flattened; @@ -500,8 +498,8 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) fdt_finish_reservemap(kinfo->fdt); - ret = write_nodes(d, kinfo, fdt); - if ( ret < 0 ) + ret = handle_node(d, kinfo, dt_host); + if ( ret ) goto err; ret = fdt_finish(kinfo->fdt); @@ -576,7 +574,6 @@ int construct_dom0(struct domain *d) if ( rc < 0 ) return rc; - map_devices_from_device_tree(d); rc = platform_specific_mapping(d); if ( rc < 0 ) return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkA-0005Ia-QZ; Sat, 21 Sep 2013 04:24:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk9-0005IK-Ve for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:30 +0000 Received: from [85.158.143.35:15736] by server-2.bemta-4.messagelabs.com id 06/F0-26052-D7F1D325; Sat, 21 Sep 2013 04:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379737467!1309308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23276 invoked from network); 21 Sep 2013 04:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk7-0000S5-HK for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEk7-0000tt-F7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:27 +0000 Date: Sat, 21 Sep 2013 04:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't map disabled device in DOM0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab26c1db4467337afbcfb025ff6eb15c8d3fce95 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:21 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:33 2013 +0100 xen/arm: Don't map disabled device in DOM0 Linux should cope with 'status = "disabled"' in the Device Tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index fb4f172..70f48b6 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -429,9 +429,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, * - Device used by Xen: Obviously dom0 can't use them * - Memory: the guest will see a different view of memory. It will * be allocated later. + * - Disabled device: Linux is able to cope with status="disabled" + * property. Therefore these device doesn't need to be mapped. This + * solution can be use later for pass through. */ if ( dt_device_used_by(np) != DOMID_XEN && - !dt_device_type_is_equal(np, "memory") ) + !dt_device_type_is_equal(np, "memory") && + dt_device_is_available(np) ) { res = map_device(d, np); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkA-0005Ia-QZ; Sat, 21 Sep 2013 04:24:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk9-0005IK-Ve for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:30 +0000 Received: from [85.158.143.35:15736] by server-2.bemta-4.messagelabs.com id 06/F0-26052-D7F1D325; Sat, 21 Sep 2013 04:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379737467!1309308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23276 invoked from network); 21 Sep 2013 04:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEk7-0000S5-HK for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEk7-0000tt-F7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:27 +0000 Date: Sat, 21 Sep 2013 04:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't map disabled device in DOM0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab26c1db4467337afbcfb025ff6eb15c8d3fce95 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:21 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:33 2013 +0100 xen/arm: Don't map disabled device in DOM0 Linux should cope with 'status = "disabled"' in the Device Tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index fb4f172..70f48b6 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -429,9 +429,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, * - Device used by Xen: Obviously dom0 can't use them * - Memory: the guest will see a different view of memory. It will * be allocated later. + * - Disabled device: Linux is able to cope with status="disabled" + * property. Therefore these device doesn't need to be mapped. This + * solution can be use later for pass through. */ if ( dt_device_used_by(np) != DOMID_XEN && - !dt_device_type_is_equal(np, "memory") ) + !dt_device_type_is_equal(np, "memory") && + dt_device_is_available(np) ) { res = map_device(d, np); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkL-0005Ko-U5; Sat, 21 Sep 2013 04:24:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkK-0005KZ-Ji for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:40 +0000 Received: from [85.158.137.68:57945] by server-1.bemta-3.messagelabs.com id DA/77-04901-78F1D325; Sat, 21 Sep 2013 04:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737477!3830728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4391 invoked from network); 21 Sep 2013 04:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkH-0000SE-ME for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkH-0000uJ-L7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:37 +0000 Date: Sat, 21 Sep 2013 04:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake PSCI node in 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 de6ba7028ab4ead8187441943aee872a3a22061c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:22 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:37 2013 +0100 xen/arm: Create a fake PSCI node in dom0 device tree Xen uses PSCI to bring up secondary cpus for the guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 70f48b6..e1333a4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -319,6 +320,38 @@ static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) return res; } +static int make_psci_node(void *fdt, const struct dt_device_node *parent) +{ + int res; + + DPRINT("Create PSCI node\n"); + + /* See linux Documentation/devicetree/bindings/arm/psci.txt */ + res = fdt_begin_node(fdt, "psci"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "compatible", "arm,psci"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "method", "hvc"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "cpu_off", __PSCI_cpu_off); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "cpu_on", __PSCI_cpu_on); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -406,6 +439,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, { DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), + DT_MATCH_COMPATIBLE("arm,psci"), { /* sentinel */ }, }; const struct dt_device_node *child; @@ -471,6 +505,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_hypervisor_node(kinfo->fdt, np); if ( res ) return res; + + res = make_psci_node(kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkL-0005Ko-U5; Sat, 21 Sep 2013 04:24:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkK-0005KZ-Ji for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:40 +0000 Received: from [85.158.137.68:57945] by server-1.bemta-3.messagelabs.com id DA/77-04901-78F1D325; Sat, 21 Sep 2013 04:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737477!3830728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4391 invoked from network); 21 Sep 2013 04:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkH-0000SE-ME for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkH-0000uJ-L7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:37 +0000 Date: Sat, 21 Sep 2013 04:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake PSCI node in 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 de6ba7028ab4ead8187441943aee872a3a22061c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:22 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:37 2013 +0100 xen/arm: Create a fake PSCI node in dom0 device tree Xen uses PSCI to bring up secondary cpus for the guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 70f48b6..e1333a4 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -319,6 +320,38 @@ static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) return res; } +static int make_psci_node(void *fdt, const struct dt_device_node *parent) +{ + int res; + + DPRINT("Create PSCI node\n"); + + /* See linux Documentation/devicetree/bindings/arm/psci.txt */ + res = fdt_begin_node(fdt, "psci"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "compatible", "arm,psci"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "method", "hvc"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "cpu_off", __PSCI_cpu_off); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "cpu_on", __PSCI_cpu_on); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -406,6 +439,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, { DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), + DT_MATCH_COMPATIBLE("arm,psci"), { /* sentinel */ }, }; const struct dt_device_node *child; @@ -471,6 +505,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_hypervisor_node(kinfo->fdt, np); if ( res ) return res; + + res = make_psci_node(kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkW-0005Mo-3N; Sat, 21 Sep 2013 04:24:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkU-0005MT-H4 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:50 +0000 Received: from [85.158.137.68:61974] by server-9.bemta-3.messagelabs.com id A4/24-15303-19F1D325; Sat, 21 Sep 2013 04:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737488!1492525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8675 invoked from network); 21 Sep 2013 04:24:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkR-0000SK-TD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkR-0000ug-RD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:47 +0000 Date: Sat, 21 Sep 2013 04:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake cpus node in 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 fafd682c3ef9d9535a60daaa69f8fb1e39665d7d Author: Julien Grall AuthorDate: Fri Sep 13 13:49:23 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:41 2013 +0100 xen/arm: Create a fake cpus node in dom0 device tree The number of cpus in dom0 can be different compare to the real number of physical cpus. For the moment, Xen assumes that the cpus are identical. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e1333a4..036155e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -352,6 +352,93 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) return res; } +static int make_cpus_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + int res; + const struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + const struct dt_device_node *npcpu; + unsigned int cpu; + const void *compatible = NULL; + u32 len; + /* Placeholder for cpu@ + a 32-bit number + \0 */ + char buf[15]; + + DPRINT("Create cpus node\n"); + + if ( !cpus ) + { + dprintk(XENLOG_ERR, "Missing /cpus node in the device tree?\n"); + return -ENOENT; + } + + /* + * Get the compatible property of CPUs from the device tree. + * We are assuming that all CPUs are the same so we are just look + * for the first one. + * TODO: Handle compatible per VCPU + */ + dt_for_each_child_node(cpus, npcpu) + { + if ( dt_device_type_is_equal(npcpu, "cpu") ) + { + compatible = dt_get_property(npcpu, "compatible", &len); + break; + } + } + + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find cpu in the device tree?\n"); + return -ENOENT; + } + + /* See Linux Documentation/devicetree/booting-without-of.txt + * section III.5.b + */ + res = fdt_begin_node(fdt, "cpus"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", 1); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", 0); + if ( res ) + return res; + + for ( cpu = 0; cpu < d->max_vcpus; cpu++ ) + { + DPRINT("Create cpu@%u node\n", cpu); + + snprintf(buf, sizeof(buf), "cpu@%u", cpu); + res = fdt_begin_node(fdt, buf); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_string(fdt, "device_type", "cpu"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "reg", cpu); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -440,6 +527,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("arm,psci"), + DT_MATCH_PATH("/cpus"), { /* sentinel */ }, }; const struct dt_device_node *child; @@ -509,6 +597,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_psci_node(kinfo->fdt, np); if ( res ) return res; + + res = make_cpus_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:24:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkW-0005Mo-3N; Sat, 21 Sep 2013 04:24:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkU-0005MT-H4 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:50 +0000 Received: from [85.158.137.68:61974] by server-9.bemta-3.messagelabs.com id A4/24-15303-19F1D325; Sat, 21 Sep 2013 04:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737488!1492525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8675 invoked from network); 21 Sep 2013 04:24:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkR-0000SK-TD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkR-0000ug-RD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:47 +0000 Date: Sat, 21 Sep 2013 04:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake cpus node in 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 fafd682c3ef9d9535a60daaa69f8fb1e39665d7d Author: Julien Grall AuthorDate: Fri Sep 13 13:49:23 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:41 2013 +0100 xen/arm: Create a fake cpus node in dom0 device tree The number of cpus in dom0 can be different compare to the real number of physical cpus. For the moment, Xen assumes that the cpus are identical. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e1333a4..036155e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -352,6 +352,93 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) return res; } +static int make_cpus_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + int res; + const struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + const struct dt_device_node *npcpu; + unsigned int cpu; + const void *compatible = NULL; + u32 len; + /* Placeholder for cpu@ + a 32-bit number + \0 */ + char buf[15]; + + DPRINT("Create cpus node\n"); + + if ( !cpus ) + { + dprintk(XENLOG_ERR, "Missing /cpus node in the device tree?\n"); + return -ENOENT; + } + + /* + * Get the compatible property of CPUs from the device tree. + * We are assuming that all CPUs are the same so we are just look + * for the first one. + * TODO: Handle compatible per VCPU + */ + dt_for_each_child_node(cpus, npcpu) + { + if ( dt_device_type_is_equal(npcpu, "cpu") ) + { + compatible = dt_get_property(npcpu, "compatible", &len); + break; + } + } + + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find cpu in the device tree?\n"); + return -ENOENT; + } + + /* See Linux Documentation/devicetree/booting-without-of.txt + * section III.5.b + */ + res = fdt_begin_node(fdt, "cpus"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", 1); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", 0); + if ( res ) + return res; + + for ( cpu = 0; cpu < d->max_vcpus; cpu++ ) + { + DPRINT("Create cpu@%u node\n", cpu); + + snprintf(buf, sizeof(buf), "cpu@%u", cpu); + res = fdt_begin_node(fdt, buf); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_string(fdt, "device_type", "cpu"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "reg", cpu); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -440,6 +527,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("arm,psci"), + DT_MATCH_PATH("/cpus"), { /* sentinel */ }, }; const struct dt_device_node *child; @@ -509,6 +597,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_psci_node(kinfo->fdt, np); if ( res ) return res; + + res = make_cpus_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkg-0005P2-80; Sat, 21 Sep 2013 04:25:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEke-0005OY-QR for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:01 +0000 Received: from [193.109.254.147:33865] by server-9.bemta-14.messagelabs.com id C2/6B-30026-C9F1D325; Sat, 21 Sep 2013 04:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737498!360995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5153 invoked from network); 21 Sep 2013 04:24:59 -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; 21 Sep 2013 04:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkc-0000ST-2X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkc-0000v2-0a for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:58 +0000 Date: Sat, 21 Sep 2013 04:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake GIC node in 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 42d85eed433e34c531715bbbe1d2bbdc8ab8861a Author: Julien Grall AuthorDate: Fri Sep 13 13:49:24 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:45 2013 +0100 xen/arm: Create a fake GIC node in dom0 device tree Recreate the GIC node and remove hypervisor specific ranges (vgic and hypervisor controls). Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 036155e..87382d5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -439,6 +439,79 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } +static int make_gic_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + __be32 *new_cells, *tmp; + int res = 0; + + DPRINT("Create gic node\n"); + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len *= 2; + new_cells = xzalloc_bytes(dt_cells_to_size(len)); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); + dt_set_range(&tmp, parent, d->arch.vgic.dbase, PAGE_SIZE); + + DPRINT(" Set Cpu Base 0x%"PRIpaddr" size = 0x%"PRIpaddr"\n", + d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); + dt_set_range(&tmp, parent, d->arch.vgic.cbase, PAGE_SIZE * 2); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + if ( res ) + return res; + + /* + * The value of the property "phandle" in the property "interrupts" + * to know on which interrupt controller the interrupt is wired. + */ + if ( gic->phandle ) + { + DPRINT(" Set phandle = 0x%x\n", gic->phandle); + res = fdt_property_cell(fdt, "phandle", gic->phandle); + if ( res ) + return res; + } + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -528,6 +601,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), + DT_MATCH_GIC, { /* sentinel */ }, }; const struct dt_device_node *child; @@ -601,6 +675,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_cpus_node(d, kinfo->fdt, np); if ( res ) return res; + + res = make_gic_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkg-0005P2-80; Sat, 21 Sep 2013 04:25:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEke-0005OY-QR for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:01 +0000 Received: from [193.109.254.147:33865] by server-9.bemta-14.messagelabs.com id C2/6B-30026-C9F1D325; Sat, 21 Sep 2013 04:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737498!360995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5153 invoked from network); 21 Sep 2013 04:24:59 -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; 21 Sep 2013 04:24:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkc-0000ST-2X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkc-0000v2-0a for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:24:58 +0000 Date: Sat, 21 Sep 2013 04:24:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake GIC node in 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 42d85eed433e34c531715bbbe1d2bbdc8ab8861a Author: Julien Grall AuthorDate: Fri Sep 13 13:49:24 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:45 2013 +0100 xen/arm: Create a fake GIC node in dom0 device tree Recreate the GIC node and remove hypervisor specific ranges (vgic and hypervisor controls). Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 036155e..87382d5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -439,6 +439,79 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } +static int make_gic_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + __be32 *new_cells, *tmp; + int res = 0; + + DPRINT("Create gic node\n"); + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len *= 2; + new_cells = xzalloc_bytes(dt_cells_to_size(len)); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); + dt_set_range(&tmp, parent, d->arch.vgic.dbase, PAGE_SIZE); + + DPRINT(" Set Cpu Base 0x%"PRIpaddr" size = 0x%"PRIpaddr"\n", + d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); + dt_set_range(&tmp, parent, d->arch.vgic.cbase, PAGE_SIZE * 2); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + if ( res ) + return res; + + /* + * The value of the property "phandle" in the property "interrupts" + * to know on which interrupt controller the interrupt is wired. + */ + if ( gic->phandle ) + { + DPRINT(" Set phandle = 0x%x\n", gic->phandle); + res = fdt_property_cell(fdt, "phandle", gic->phandle); + if ( res ) + return res; + } + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -528,6 +601,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), + DT_MATCH_GIC, { /* sentinel */ }, }; const struct dt_device_node *child; @@ -601,6 +675,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_cpus_node(d, kinfo->fdt, np); if ( res ) return res; + + res = make_gic_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25: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 1VNEkr-0005Qv-BE; Sat, 21 Sep 2013 04:25:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkp-0005Qd-Oj for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:11 +0000 Received: from [85.158.137.68:11944] by server-9.bemta-3.messagelabs.com id 98/34-15303-7AF1D325; Sat, 21 Sep 2013 04:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737508!3830763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6221 invoked from network); 21 Sep 2013 04:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkm-0000T2-B0 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkm-0000vb-8x for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:08 +0000 Date: Sat, 21 Sep 2013 04:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake timer node in 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 5b73b82d2fddc450c73a268e1e70f5b25b6232c0 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:25 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:51 2013 +0100 xen/arm: Create a fake timer node in dom0 device tree Recreate the timer node and remove hypervisor specific interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 87382d5..cda1e13 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -512,6 +512,67 @@ static int make_gic_node(const struct domain *d, void *fdt, return res; } +static int make_timer_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + static const struct dt_device_match timer_ids[] __initconst = + { + DT_MATCH_COMPATIBLE("arm,armv7-timer"), + DT_MATCH_COMPATIBLE("arm,armv8-timer"), + { /* sentinel */ }, + }; + struct dt_device_node *dev; + u32 len; + const void *compatible; + int res; + const struct dt_irq *irq; + gic_interrupt_t intrs[3]; + + DPRINT("Create timer node\n"); + + dev = dt_find_matching_node(NULL, timer_ids); + if ( !dev ) + { + dprintk(XENLOG_ERR, "Missing timer node in the device tree?\n"); + return -FDT_ERR_XEN(ENOENT); + } + + compatible = dt_get_property(dev, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for timer node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "timer"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + irq = timer_dt_irq(TIMER_PHYS_SECURE_PPI); + DPRINT(" Secure interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[0], irq->irq, 0xf, irq->type); + + irq = timer_dt_irq(TIMER_PHYS_NONSECURE_PPI); + DPRINT(" Non secure interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[1], irq->irq, 0xf, irq->type); + + irq = timer_dt_irq(TIMER_VIRT_PPI); + DPRINT(" Virt interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[2], irq->irq, 0xf, irq->type); + + res = fdt_property_interrupts(fdt, intrs, 3); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -602,6 +663,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_GIC, + DT_MATCH_TIMER, { /* sentinel */ }, }; const struct dt_device_node *child; @@ -679,6 +741,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_gic_node(d, kinfo->fdt, np); if ( res ) return res; + + res = make_timer_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25: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 1VNEkr-0005Qv-BE; Sat, 21 Sep 2013 04:25:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkp-0005Qd-Oj for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:11 +0000 Received: from [85.158.137.68:11944] by server-9.bemta-3.messagelabs.com id 98/34-15303-7AF1D325; Sat, 21 Sep 2013 04:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1379737508!3830763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6221 invoked from network); 21 Sep 2013 04:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkm-0000T2-B0 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkm-0000vb-8x for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:08 +0000 Date: Sat, 21 Sep 2013 04:25:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Create a fake timer node in 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 5b73b82d2fddc450c73a268e1e70f5b25b6232c0 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:25 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:51 2013 +0100 xen/arm: Create a fake timer node in dom0 device tree Recreate the timer node and remove hypervisor specific interrupt. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 87382d5..cda1e13 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -512,6 +512,67 @@ static int make_gic_node(const struct domain *d, void *fdt, return res; } +static int make_timer_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + static const struct dt_device_match timer_ids[] __initconst = + { + DT_MATCH_COMPATIBLE("arm,armv7-timer"), + DT_MATCH_COMPATIBLE("arm,armv8-timer"), + { /* sentinel */ }, + }; + struct dt_device_node *dev; + u32 len; + const void *compatible; + int res; + const struct dt_irq *irq; + gic_interrupt_t intrs[3]; + + DPRINT("Create timer node\n"); + + dev = dt_find_matching_node(NULL, timer_ids); + if ( !dev ) + { + dprintk(XENLOG_ERR, "Missing timer node in the device tree?\n"); + return -FDT_ERR_XEN(ENOENT); + } + + compatible = dt_get_property(dev, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for timer node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "timer"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + irq = timer_dt_irq(TIMER_PHYS_SECURE_PPI); + DPRINT(" Secure interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[0], irq->irq, 0xf, irq->type); + + irq = timer_dt_irq(TIMER_PHYS_NONSECURE_PPI); + DPRINT(" Non secure interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[1], irq->irq, 0xf, irq->type); + + irq = timer_dt_irq(TIMER_VIRT_PPI); + DPRINT(" Virt interrupt %u\n", irq->irq); + set_interrupt_ppi(intrs[2], irq->irq, 0xf, irq->type); + + res = fdt_property_interrupts(fdt, intrs, 3); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + /* Map the device in the domain */ static int map_device(struct domain *d, const struct dt_device_node *dev) { @@ -602,6 +663,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_GIC, + DT_MATCH_TIMER, { /* sentinel */ }, }; const struct dt_device_node *child; @@ -679,6 +741,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, res = make_gic_node(d, kinfo->fdt, np); if ( res ) return res; + + res = make_timer_node(d, kinfo->fdt, np); + if ( res ) + return res; } res = fdt_end_node(kinfo->fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl1-0005T0-Ea; Sat, 21 Sep 2013 04:25:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkz-0005Sb-Ky for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:21 +0000 Received: from [85.158.139.211:55398] by server-17.bemta-5.messagelabs.com id 99/7B-19396-0BF1D325; Sat, 21 Sep 2013 04:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379737518!3747157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12178 invoked from network); 21 Sep 2013 04:25:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkw-0000T8-Ih for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkw-0000wi-GA for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:18 +0000 Date: Sat, 21 Sep 2013 04:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add new platform specific callback device_is_blacklist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7cb187fa95931f3b704cd9f5820924eec1c7870c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:26 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:55 2013 +0100 xen/arm: Add new platform specific callback device_is_blacklist Each platform code will list the device that must not pass-through to a guest. Theses devices are used for: power management, timer,... When theses devices are given to DOM0, it can controls the hardware and then break the whole platform. This callback is enough until we will start to care about power performance. For this purpose, we may need to extend this interface to implement per-device MMIO filtering to allow dom0 to continue to control devices which it owns which happen to share e.g. a clock controller with Xen. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/platform.c | 10 ++++++++++ xen/include/asm-arm/platform.h | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index cda1e13..300a64d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -676,7 +676,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DPRINT("handle %s\n", path); /* Skip theses nodes and the sub-nodes */ - if ( dt_match_node(skip_matches, np ) ) + if ( dt_match_node(skip_matches, np ) || + platform_device_is_blacklisted(np) ) { DPRINT(" Skip it!\n"); return 0; diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index afda302..db79368 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -127,6 +127,16 @@ bool_t platform_has_quirk(uint32_t quirk) return !!(quirks & quirk); } +bool_t platform_device_is_blacklisted(const struct dt_device_node *node) +{ + const struct dt_device_match *blacklist = NULL; + + if ( platform && platform->blacklist_dev ) + blacklist = platform->blacklist_dev; + + return dt_match_node(blacklist, node); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index f460e9c..a19dbf7 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -4,6 +4,7 @@ #include #include #include +#include /* Describe specific operation for a board */ struct platform_desc { @@ -26,6 +27,11 @@ struct platform_desc { * board with different quirk on each */ uint32_t (*quirks)(void); + /* + * Platform blacklist devices + * List of devices which must not pass-through to a guest + */ + const struct dt_device_match *blacklist_dev; }; /* @@ -40,6 +46,7 @@ int __init platform_specific_mapping(struct domain *d); void platform_reset(void); void platform_poweroff(void); bool_t platform_has_quirk(uint32_t quirk); +bool_t platform_device_is_blacklisted(const struct dt_device_node *node); #define PLATFORM_START(_name, _namestr) \ static const struct platform_desc __plat_desc_##_name __used \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl1-0005T0-Ea; Sat, 21 Sep 2013 04:25:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkz-0005Sb-Ky for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:21 +0000 Received: from [85.158.139.211:55398] by server-17.bemta-5.messagelabs.com id 99/7B-19396-0BF1D325; Sat, 21 Sep 2013 04:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1379737518!3747157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12178 invoked from network); 21 Sep 2013 04:25:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEkw-0000T8-Ih for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEkw-0000wi-GA for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:18 +0000 Date: Sat, 21 Sep 2013 04:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add new platform specific callback device_is_blacklist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7cb187fa95931f3b704cd9f5820924eec1c7870c Author: Julien Grall AuthorDate: Fri Sep 13 13:49:26 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:55 2013 +0100 xen/arm: Add new platform specific callback device_is_blacklist Each platform code will list the device that must not pass-through to a guest. Theses devices are used for: power management, timer,... When theses devices are given to DOM0, it can controls the hardware and then break the whole platform. This callback is enough until we will start to care about power performance. For this purpose, we may need to extend this interface to implement per-device MMIO filtering to allow dom0 to continue to control devices which it owns which happen to share e.g. a clock controller with Xen. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/platform.c | 10 ++++++++++ xen/include/asm-arm/platform.h | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index cda1e13..300a64d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -676,7 +676,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DPRINT("handle %s\n", path); /* Skip theses nodes and the sub-nodes */ - if ( dt_match_node(skip_matches, np ) ) + if ( dt_match_node(skip_matches, np ) || + platform_device_is_blacklisted(np) ) { DPRINT(" Skip it!\n"); return 0; diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index afda302..db79368 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -127,6 +127,16 @@ bool_t platform_has_quirk(uint32_t quirk) return !!(quirks & quirk); } +bool_t platform_device_is_blacklisted(const struct dt_device_node *node) +{ + const struct dt_device_match *blacklist = NULL; + + if ( platform && platform->blacklist_dev ) + blacklist = platform->blacklist_dev; + + return dt_match_node(blacklist, node); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index f460e9c..a19dbf7 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -4,6 +4,7 @@ #include #include #include +#include /* Describe specific operation for a board */ struct platform_desc { @@ -26,6 +27,11 @@ struct platform_desc { * board with different quirk on each */ uint32_t (*quirks)(void); + /* + * Platform blacklist devices + * List of devices which must not pass-through to a guest + */ + const struct dt_device_match *blacklist_dev; }; /* @@ -40,6 +46,7 @@ int __init platform_specific_mapping(struct domain *d); void platform_reset(void); void platform_poweroff(void); bool_t platform_has_quirk(uint32_t quirk); +bool_t platform_device_is_blacklisted(const struct dt_device_node *node); #define PLATFORM_START(_name, _namestr) \ static const struct platform_desc __plat_desc_##_name __used \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25: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 1VNElB-0005Uf-IM; Sat, 21 Sep 2013 04:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl9-0005UI-Oz for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:31 +0000 Received: from [85.158.139.211:55631] by server-6.bemta-5.messagelabs.com id ED/75-05559-ABF1D325; Sat, 21 Sep 2013 04:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379737529!3741486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20448 invoked from network); 21 Sep 2013 04:25:30 -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; 21 Sep 2013 04:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl6-0000TG-SD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEl6-0000x4-Mx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:28 +0000 Date: Sat, 21 Sep 2013 04:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove devices used by Xen 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 cb869df938b2a1480a079a2ea534af03da3ee3dc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:27 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:57 2013 +0100 xen/arm: Remove devices used by Xen from dom0 device tree Devices used by Xen should not be pass-through to dom0. If the device is really usefull for dom0 (for instance the timer and the GIC), it will recreate the node. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 300a64d..82003c1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -677,7 +677,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Skip theses nodes and the sub-nodes */ if ( dt_match_node(skip_matches, np ) || - platform_device_is_blacklisted(np) ) + platform_device_is_blacklisted(np) || + dt_device_used_by(np) == DOMID_XEN ) { DPRINT(" Skip it!\n"); return 0; @@ -685,15 +686,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* * Some device doesn't need to be mapped in Xen: - * - Device used by Xen: Obviously dom0 can't use them * - Memory: the guest will see a different view of memory. It will * be allocated later. * - Disabled device: Linux is able to cope with status="disabled" * property. Therefore these device doesn't need to be mapped. This * solution can be use later for pass through. */ - if ( dt_device_used_by(np) != DOMID_XEN && - !dt_device_type_is_equal(np, "memory") && + if ( !dt_device_type_is_equal(np, "memory") && dt_device_is_available(np) ) { res = map_device(d, np); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25: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 1VNElB-0005Uf-IM; Sat, 21 Sep 2013 04:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl9-0005UI-Oz for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:31 +0000 Received: from [85.158.139.211:55631] by server-6.bemta-5.messagelabs.com id ED/75-05559-ABF1D325; Sat, 21 Sep 2013 04:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379737529!3741486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20448 invoked from network); 21 Sep 2013 04:25:30 -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; 21 Sep 2013 04:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEl6-0000TG-SD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEl6-0000x4-Mx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:28 +0000 Date: Sat, 21 Sep 2013 04:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Remove devices used by Xen 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 cb869df938b2a1480a079a2ea534af03da3ee3dc Author: Julien Grall AuthorDate: Fri Sep 13 13:49:27 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:28:57 2013 +0100 xen/arm: Remove devices used by Xen from dom0 device tree Devices used by Xen should not be pass-through to dom0. If the device is really usefull for dom0 (for instance the timer and the GIC), it will recreate the node. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 300a64d..82003c1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -677,7 +677,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Skip theses nodes and the sub-nodes */ if ( dt_match_node(skip_matches, np ) || - platform_device_is_blacklisted(np) ) + platform_device_is_blacklisted(np) || + dt_device_used_by(np) == DOMID_XEN ) { DPRINT(" Skip it!\n"); return 0; @@ -685,15 +686,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* * Some device doesn't need to be mapped in Xen: - * - Device used by Xen: Obviously dom0 can't use them * - Memory: the guest will see a different view of memory. It will * be allocated later. * - Disabled device: Linux is able to cope with status="disabled" * property. Therefore these device doesn't need to be mapped. This * solution can be use later for pass through. */ - if ( dt_device_used_by(np) != DOMID_XEN && - !dt_device_type_is_equal(np, "memory") && + if ( !dt_device_type_is_equal(np, "memory") && dt_device_is_available(np) ) { res = map_device(d, np); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElK-0005WP-LE; Sat, 21 Sep 2013 04:25:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElJ-0005WA-CB for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:41 +0000 Received: from [85.158.143.35:21360] by server-3.bemta-4.messagelabs.com id 3E/6E-08835-4CF1D325; Sat, 21 Sep 2013 04:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379737539!726666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11133 invoked from network); 21 Sep 2013 04:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElH-0000TM-2K for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElH-0000xU-1J for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:39 +0000 Date: Sat, 21 Sep 2013 04:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vexpress: Blacklist a list of board specific devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c04b69e769ce1a5deed07ad41314c4aa25ee2596 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:28 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:03 2013 +0100 xen/arm: vexpress: Blacklist a list of board specific devices On Versatile there are a bunch of devices which must not be pass-through to any guest (power management and cache coherency devices). This commit also blacklists the HDLCD device because Xen is unable to correctly map the framebuffer into dom0. Therefore, when Linux will try to access to the framebuffer, Xen will receive a non-handled data access. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/vexpress.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 6f7dc2c..298c141 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -125,9 +125,26 @@ static const char * const vexpress_dt_compat[] __initdata = NULL }; +static const struct dt_device_match vexpress_blacklist_dev[] __initconst = +{ + /* Cache Coherent Interconnect */ + DT_MATCH_COMPATIBLE("arm,cci-400"), + DT_MATCH_COMPATIBLE("arm,cci-400-pmu"), + /* Video device + * TODO: remove it once memreserve is handled properly by Xen + */ + DT_MATCH_COMPATIBLE("arm,hdlcd"), + /* Hardware power management */ + DT_MATCH_COMPATIBLE("arm,vexpress-reset"), + DT_MATCH_COMPATIBLE("arm,vexpress-reboot"), + DT_MATCH_COMPATIBLE("arm,vexpress-shutdown"), + { /* sentinel */ }, +}; + PLATFORM_START(vexpress, "VERSATILE EXPRESS") .compatible = vexpress_dt_compat, .reset = vexpress_reset, + .blacklist_dev = vexpress_blacklist_dev, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElK-0005WP-LE; Sat, 21 Sep 2013 04:25:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElJ-0005WA-CB for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:41 +0000 Received: from [85.158.143.35:21360] by server-3.bemta-4.messagelabs.com id 3E/6E-08835-4CF1D325; Sat, 21 Sep 2013 04:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379737539!726666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11133 invoked from network); 21 Sep 2013 04:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElH-0000TM-2K for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElH-0000xU-1J for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:39 +0000 Date: Sat, 21 Sep 2013 04:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vexpress: Blacklist a list of board specific devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c04b69e769ce1a5deed07ad41314c4aa25ee2596 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:28 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:03 2013 +0100 xen/arm: vexpress: Blacklist a list of board specific devices On Versatile there are a bunch of devices which must not be pass-through to any guest (power management and cache coherency devices). This commit also blacklists the HDLCD device because Xen is unable to correctly map the framebuffer into dom0. Therefore, when Linux will try to access to the framebuffer, Xen will receive a non-handled data access. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/vexpress.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 6f7dc2c..298c141 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -125,9 +125,26 @@ static const char * const vexpress_dt_compat[] __initdata = NULL }; +static const struct dt_device_match vexpress_blacklist_dev[] __initconst = +{ + /* Cache Coherent Interconnect */ + DT_MATCH_COMPATIBLE("arm,cci-400"), + DT_MATCH_COMPATIBLE("arm,cci-400-pmu"), + /* Video device + * TODO: remove it once memreserve is handled properly by Xen + */ + DT_MATCH_COMPATIBLE("arm,hdlcd"), + /* Hardware power management */ + DT_MATCH_COMPATIBLE("arm,vexpress-reset"), + DT_MATCH_COMPATIBLE("arm,vexpress-reboot"), + DT_MATCH_COMPATIBLE("arm,vexpress-shutdown"), + { /* sentinel */ }, +}; + PLATFORM_START(vexpress, "VERSATILE EXPRESS") .compatible = vexpress_dt_compat, .reset = vexpress_reset, + .blacklist_dev = vexpress_blacklist_dev, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElV-0005Yo-Qg; Sat, 21 Sep 2013 04:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElT-0005YX-QL for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:52 +0000 Received: from [193.109.254.147:34701] by server-16.bemta-14.messagelabs.com id FA/5B-06264-FCF1D325; Sat, 21 Sep 2013 04:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1379737549!593226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2083 invoked from network); 21 Sep 2013 04:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElR-0000TS-7P for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElR-0000xq-6T for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:49 +0000 Date: Sat, 21 Sep 2013 04:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: exynos5: Blacklist MCT device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64e2efcad8789bdb09abc4c07f4cc259d8b42676 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:29 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:08 2013 +0100 xen/arm: exynos5: Blacklist MCT device The Multi Core Timer (MCT) is a Samsung specific device. This device tries to route IRQ in non-boot CPU which is not yet handled by Xen. The user will see randomly dom0 hang, but I'm not sure that is the real reason. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/exynos5.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 262ded8..d9eedc8 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -92,12 +92,23 @@ static const char * const exynos5_dt_compat[] __initdata = NULL }; +static const struct dt_device_match exynos5_blacklist_dev[] __initconst = +{ + /* Multi core Timer + * TODO: this device set up IRQ to CPU 1 which is not yet handled by Xen. + * This is result to random freeze. + */ + DT_MATCH_COMPATIBLE("samsung,exynos4210-mct"), + { /* sentinel */ }, +}; + PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, .specific_mapping = exynos5_specific_mapping, .reset = exynos5_reset, .quirks = exynos5_quirks, + .blacklist_dev = exynos5_blacklist_dev, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:25:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElV-0005Yo-Qg; Sat, 21 Sep 2013 04:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElT-0005YX-QL for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:52 +0000 Received: from [193.109.254.147:34701] by server-16.bemta-14.messagelabs.com id FA/5B-06264-FCF1D325; Sat, 21 Sep 2013 04:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1379737549!593226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2083 invoked from network); 21 Sep 2013 04:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElR-0000TS-7P for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElR-0000xq-6T for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:49 +0000 Date: Sat, 21 Sep 2013 04:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: exynos5: Blacklist MCT device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64e2efcad8789bdb09abc4c07f4cc259d8b42676 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:29 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:08 2013 +0100 xen/arm: exynos5: Blacklist MCT device The Multi Core Timer (MCT) is a Samsung specific device. This device tries to route IRQ in non-boot CPU which is not yet handled by Xen. The user will see randomly dom0 hang, but I'm not sure that is the real reason. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/platforms/exynos5.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 262ded8..d9eedc8 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -92,12 +92,23 @@ static const char * const exynos5_dt_compat[] __initdata = NULL }; +static const struct dt_device_match exynos5_blacklist_dev[] __initconst = +{ + /* Multi core Timer + * TODO: this device set up IRQ to CPU 1 which is not yet handled by Xen. + * This is result to random freeze. + */ + DT_MATCH_COMPATIBLE("samsung,exynos4210-mct"), + { /* sentinel */ }, +}; + PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, .specific_mapping = exynos5_specific_mapping, .reset = exynos5_reset, .quirks = exynos5_quirks, + .blacklist_dev = exynos5_blacklist_dev, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNElg-0005ae-Tv; Sat, 21 Sep 2013 04:26:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEle-0005aB-KZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:02 +0000 Received: from [85.158.137.68:12892] by server-12.bemta-3.messagelabs.com id D4/2C-11891-9DF1D325; Sat, 21 Sep 2013 04:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1379737559!3839078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18477 invoked from network); 21 Sep 2013 04:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElb-0000Te-Dh for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElb-0000yF-C6 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:59 +0000 Date: Sat, 21 Sep 2013 04:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Clean up the exported API for device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc3cac5c78a02f39f1867dd60976b5481c4b74b6 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:30 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:10 2013 +0100 xen/dts: Clean up the exported API for device tree All Xen code has been converted to the new device tree API that uses a tree structure to describe the DTS. The Flat Device tree is still used by Xen during early boot stage, but only in internal. Remove entirely unneeded functions or move to a static function. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 92 ++++++---------------------------------- xen/include/xen/device_tree.h | 15 ------- 2 files changed, 14 insertions(+), 93 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 215592e..8e6d8c1 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -103,8 +103,8 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_matches(const void *fdt, int node, + const char *match) { const char *name; size_t match_len; @@ -118,7 +118,7 @@ bool_t __init device_tree_node_matches(const void *fdt, int node, && (name[match_len] == '@' || name[match_len] == '\0'); } -bool_t __init device_tree_type_matches(const void *fdt, int node, +static bool_t __init device_tree_type_matches(const void *fdt, int node, const char *match) { const void *prop; @@ -130,8 +130,8 @@ bool_t __init device_tree_type_matches(const void *fdt, int node, return !dt_node_cmp(prop, match); } -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_compatible(const void *fdt, int node, + const char *match) { int len, l; int mlen; @@ -154,13 +154,6 @@ bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static __init int device_tree_nr_reg_ranges(const struct fdt_property *prop, - u32 address_cells, u32 size_cells) -{ - u32 reg_cells = address_cells + size_cells; - return fdt32_to_cpu(prop->len) / (reg_cells * sizeof(u32)); -} - static void __init get_val(const u32 **cell, u32 cells, u64 *val) { *val = 0; @@ -175,8 +168,8 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) } } -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, u64 *start, u64 *size) +static void __init device_tree_get_reg(const u32 **cell, u32 address_cells, + u32 size_cells, u64 *start, u64 *size) { get_val(cell, address_cells, start); get_val(cell, size_cells, size); @@ -202,13 +195,6 @@ void dt_set_cell(__be32 **cellp, int size, u64 val) (*cellp) += cells; } -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size) -{ - dt_set_cell(cell, address_cells, start); - dt_set_cell(cell, size_cells, size); -} - void dt_set_range(__be32 **cellp, const struct dt_device_node *np, u64 address, u64 size) { @@ -216,8 +202,8 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, - u32 dflt) +static u32 __init device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt) { const struct fdt_property *prop; @@ -239,8 +225,9 @@ u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, * Returns 0 if all nodes were iterated over successfully. If @func * returns a value different from 0, that value is returned immediately. */ -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data) +static int __init device_tree_for_each_node(const void *fdt, + device_tree_node_func func, + void *data) { int node; int depth; @@ -275,58 +262,6 @@ int __init device_tree_for_each_node(const void *fdt, return 0; } -struct find_compat { - const char *compatible; - int found; - int node; - int depth; - u32 address_cells; - u32 size_cells; -}; - -static int _find_compatible_node(const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells, - void *data) -{ - struct find_compat *c = (struct find_compat *) data; - - if ( c->found ) - return 1; - - if ( device_tree_node_compatible(fdt, node, c->compatible) ) - { - c->found = 1; - c->node = node; - c->depth = depth; - c->address_cells = address_cells; - c->size_cells = size_cells; - return 1; - } - return 0; -} - -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells) -{ - int ret; - struct find_compat c; - c.compatible = compatible; - c.found = 0; - - ret = device_tree_for_each_node(device_tree_flattened, _find_compatible_node, &c); - if ( !c.found ) - return ret; - else - { - *node = c.node; - *depth = c.depth; - *address_cells = c.address_cells; - *size_cells = c.size_cells; - return 1; - } -} - /** * device_tree_bootargs - return the bootargs (the Xen command line) * @fdt flat device tree. @@ -394,6 +329,7 @@ static void __init process_memory_node(const void *fdt, int node, int banks; const u32 *cell; paddr_t start, size; + u32 reg_cells = address_cells + size_cells; if ( address_cells < 1 || size_cells < 1 ) { @@ -410,7 +346,7 @@ static void __init process_memory_node(const void *fdt, int node, } cell = (const u32 *)prop->data; - banks = device_tree_nr_reg_ranges(prop, address_cells, size_cells); + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index fae9f97..7810f53 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -181,21 +181,6 @@ extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt); -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, - u64 *start, u64 *size); -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size); -u32 __init device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt); -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match); -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match); -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells); -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data); const char __init *device_tree_bootargs(const void *fdt); void __init device_tree_dump(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNElg-0005ae-Tv; Sat, 21 Sep 2013 04:26:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEle-0005aB-KZ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:02 +0000 Received: from [85.158.137.68:12892] by server-12.bemta-3.messagelabs.com id D4/2C-11891-9DF1D325; Sat, 21 Sep 2013 04:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1379737559!3839078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18477 invoked from network); 21 Sep 2013 04:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElb-0000Te-Dh for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElb-0000yF-C6 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:25:59 +0000 Date: Sat, 21 Sep 2013 04:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: Clean up the exported API for device tree X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc3cac5c78a02f39f1867dd60976b5481c4b74b6 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:30 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:10 2013 +0100 xen/dts: Clean up the exported API for device tree All Xen code has been converted to the new device tree API that uses a tree structure to describe the DTS. The Flat Device tree is still used by Xen during early boot stage, but only in internal. Remove entirely unneeded functions or move to a static function. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 92 ++++++---------------------------------- xen/include/xen/device_tree.h | 15 ------- 2 files changed, 14 insertions(+), 93 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 215592e..8e6d8c1 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -103,8 +103,8 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_matches(const void *fdt, int node, + const char *match) { const char *name; size_t match_len; @@ -118,7 +118,7 @@ bool_t __init device_tree_node_matches(const void *fdt, int node, && (name[match_len] == '@' || name[match_len] == '\0'); } -bool_t __init device_tree_type_matches(const void *fdt, int node, +static bool_t __init device_tree_type_matches(const void *fdt, int node, const char *match) { const void *prop; @@ -130,8 +130,8 @@ bool_t __init device_tree_type_matches(const void *fdt, int node, return !dt_node_cmp(prop, match); } -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_compatible(const void *fdt, int node, + const char *match) { int len, l; int mlen; @@ -154,13 +154,6 @@ bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static __init int device_tree_nr_reg_ranges(const struct fdt_property *prop, - u32 address_cells, u32 size_cells) -{ - u32 reg_cells = address_cells + size_cells; - return fdt32_to_cpu(prop->len) / (reg_cells * sizeof(u32)); -} - static void __init get_val(const u32 **cell, u32 cells, u64 *val) { *val = 0; @@ -175,8 +168,8 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) } } -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, u64 *start, u64 *size) +static void __init device_tree_get_reg(const u32 **cell, u32 address_cells, + u32 size_cells, u64 *start, u64 *size) { get_val(cell, address_cells, start); get_val(cell, size_cells, size); @@ -202,13 +195,6 @@ void dt_set_cell(__be32 **cellp, int size, u64 val) (*cellp) += cells; } -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size) -{ - dt_set_cell(cell, address_cells, start); - dt_set_cell(cell, size_cells, size); -} - void dt_set_range(__be32 **cellp, const struct dt_device_node *np, u64 address, u64 size) { @@ -216,8 +202,8 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, - u32 dflt) +static u32 __init device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt) { const struct fdt_property *prop; @@ -239,8 +225,9 @@ u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, * Returns 0 if all nodes were iterated over successfully. If @func * returns a value different from 0, that value is returned immediately. */ -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data) +static int __init device_tree_for_each_node(const void *fdt, + device_tree_node_func func, + void *data) { int node; int depth; @@ -275,58 +262,6 @@ int __init device_tree_for_each_node(const void *fdt, return 0; } -struct find_compat { - const char *compatible; - int found; - int node; - int depth; - u32 address_cells; - u32 size_cells; -}; - -static int _find_compatible_node(const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells, - void *data) -{ - struct find_compat *c = (struct find_compat *) data; - - if ( c->found ) - return 1; - - if ( device_tree_node_compatible(fdt, node, c->compatible) ) - { - c->found = 1; - c->node = node; - c->depth = depth; - c->address_cells = address_cells; - c->size_cells = size_cells; - return 1; - } - return 0; -} - -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells) -{ - int ret; - struct find_compat c; - c.compatible = compatible; - c.found = 0; - - ret = device_tree_for_each_node(device_tree_flattened, _find_compatible_node, &c); - if ( !c.found ) - return ret; - else - { - *node = c.node; - *depth = c.depth; - *address_cells = c.address_cells; - *size_cells = c.size_cells; - return 1; - } -} - /** * device_tree_bootargs - return the bootargs (the Xen command line) * @fdt flat device tree. @@ -394,6 +329,7 @@ static void __init process_memory_node(const void *fdt, int node, int banks; const u32 *cell; paddr_t start, size; + u32 reg_cells = address_cells + size_cells; if ( address_cells < 1 || size_cells < 1 ) { @@ -410,7 +346,7 @@ static void __init process_memory_node(const void *fdt, int node, } cell = (const u32 *)prop->data; - banks = device_tree_nr_reg_ranges(prop, address_cells, size_cells); + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index fae9f97..7810f53 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -181,21 +181,6 @@ extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt); -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, - u64 *start, u64 *size); -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size); -u32 __init device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt); -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match); -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match); -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells); -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data); const char __init *device_tree_bootargs(const void *fdt); void __init device_tree_dump(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElp-0005by-0d; Sat, 21 Sep 2013 04:26:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElo-0005bm-CJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:12 +0000 Received: from [85.158.139.211:37620] by server-9.bemta-5.messagelabs.com id 99/7C-24493-3EF1D325; Sat, 21 Sep 2013 04:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1379737569!3747369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8276 invoked from network); 21 Sep 2013 04:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEll-0000UD-Jv for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEll-0000yn-Hx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:09 +0000 Date: Sat, 21 Sep 2013 04:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: device_get_reg: cells are 32-bit big endian value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76acef3632a8a78ac13d65693e32a4e7ea3361a Author: Julien Grall AuthorDate: Fri Sep 13 13:49:31 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:12 2013 +0100 xen/dts: device_get_reg: cells are 32-bit big endian value Device tree cells are 32-bit big endian value. Use __be32 to avoid confusion later. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 8e6d8c1..eac507d 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -154,7 +154,7 @@ static bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static void __init get_val(const u32 **cell, u32 cells, u64 *val) +static void __init get_val(const __be32 **cell, u32 cells, u64 *val) { *val = 0; @@ -168,7 +168,7 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) } } -static void __init device_tree_get_reg(const u32 **cell, u32 address_cells, +static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size) { get_val(cell, address_cells, start); @@ -327,7 +327,7 @@ static void __init process_memory_node(const void *fdt, int node, const struct fdt_property *prop; int i; int banks; - const u32 *cell; + const __be32 *cell; paddr_t start, size; u32 reg_cells = address_cells + size_cells; @@ -345,7 +345,7 @@ static void __init process_memory_node(const void *fdt, int node, return; } - cell = (const u32 *)prop->data; + cell = (const __be32 *)prop->data; banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) @@ -396,7 +396,7 @@ static void __init process_multiboot_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - const u32 *cell; + const __be32 *cell; int nr; struct dt_mb_module *mod; int len; @@ -418,7 +418,7 @@ static void __init process_multiboot_node(const void *fdt, int node, early_panic("fdt: node `%s': `reg` property length is too short\n", name); - cell = (const u32 *)prop->data; + cell = (const __be32 *)prop->data; device_tree_get_reg(&cell, address_cells, size_cells, &mod->start, &mod->size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElp-0005by-0d; Sat, 21 Sep 2013 04:26:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElo-0005bm-CJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:12 +0000 Received: from [85.158.139.211:37620] by server-9.bemta-5.messagelabs.com id 99/7C-24493-3EF1D325; Sat, 21 Sep 2013 04:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1379737569!3747369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8276 invoked from network); 21 Sep 2013 04:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEll-0000UD-Jv for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEll-0000yn-Hx for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:09 +0000 Date: Sat, 21 Sep 2013 04:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: device_get_reg: cells are 32-bit big endian value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e76acef3632a8a78ac13d65693e32a4e7ea3361a Author: Julien Grall AuthorDate: Fri Sep 13 13:49:31 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:12 2013 +0100 xen/dts: device_get_reg: cells are 32-bit big endian value Device tree cells are 32-bit big endian value. Use __be32 to avoid confusion later. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 8e6d8c1..eac507d 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -154,7 +154,7 @@ static bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static void __init get_val(const u32 **cell, u32 cells, u64 *val) +static void __init get_val(const __be32 **cell, u32 cells, u64 *val) { *val = 0; @@ -168,7 +168,7 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) } } -static void __init device_tree_get_reg(const u32 **cell, u32 address_cells, +static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size) { get_val(cell, address_cells, start); @@ -327,7 +327,7 @@ static void __init process_memory_node(const void *fdt, int node, const struct fdt_property *prop; int i; int banks; - const u32 *cell; + const __be32 *cell; paddr_t start, size; u32 reg_cells = address_cells + size_cells; @@ -345,7 +345,7 @@ static void __init process_memory_node(const void *fdt, int node, return; } - cell = (const u32 *)prop->data; + cell = (const __be32 *)prop->data; banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) @@ -396,7 +396,7 @@ static void __init process_multiboot_node(const void *fdt, int node, u32 address_cells, u32 size_cells) { const struct fdt_property *prop; - const u32 *cell; + const __be32 *cell; int nr; struct dt_mb_module *mod; int len; @@ -418,7 +418,7 @@ static void __init process_multiboot_node(const void *fdt, int node, early_panic("fdt: node `%s': `reg` property length is too short\n", name); - cell = (const u32 *)prop->data; + cell = (const __be32 *)prop->data; device_tree_get_reg(&cell, address_cells, size_cells, &mod->start, &mod->size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNElz-0005ds-3b; Sat, 21 Sep 2013 04:26:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEly-0005dh-D2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:22 +0000 Received: from [85.158.139.211:43724] by server-9.bemta-5.messagelabs.com id 65/8C-24493-DEF1D325; Sat, 21 Sep 2013 04:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1379737579!1832808!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4545 invoked from network); 21 Sep 2013 04:26:21 -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; 21 Sep 2013 04:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElv-0000UJ-Pi for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElv-0000zf-ND for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:19 +0000 Date: Sat, 21 Sep 2013 04:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: replace get_val by dt_next_cell X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3cc9e6c4b5dfb6741b8751b608b5c872d829604 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:32 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:13 2013 +0100 xen/dts: replace get_val by dt_next_cell Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index eac507d..ee58c52 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -154,25 +154,11 @@ static bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static void __init get_val(const __be32 **cell, u32 cells, u64 *val) -{ - *val = 0; - - if ( cells > 2 ) - early_panic("dtb value contains > 2 cells\n"); - - while ( cells-- ) - { - *val <<= 32; - *val |= fdt32_to_cpu(*(*cell)++); - } -} - static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size) { - get_val(cell, address_cells, start); - get_val(cell, size_cells, size); + *start = dt_next_cell(address_cells, cell); + *size = dt_next_cell(size_cells, cell); } void dt_get_range(const __be32 **cell, const struct dt_device_node *np, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNElz-0005ds-3b; Sat, 21 Sep 2013 04:26:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEly-0005dh-D2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:22 +0000 Received: from [85.158.139.211:43724] by server-9.bemta-5.messagelabs.com id 65/8C-24493-DEF1D325; Sat, 21 Sep 2013 04:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1379737579!1832808!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4545 invoked from network); 21 Sep 2013 04:26:21 -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; 21 Sep 2013 04:26:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNElv-0000UJ-Pi for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNElv-0000zf-ND for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:19 +0000 Date: Sat, 21 Sep 2013 04:26:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dts: replace get_val by dt_next_cell X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3cc9e6c4b5dfb6741b8751b608b5c872d829604 Author: Julien Grall AuthorDate: Fri Sep 13 13:49:32 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:13 2013 +0100 xen/dts: replace get_val by dt_next_cell Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index eac507d..ee58c52 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -154,25 +154,11 @@ static bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static void __init get_val(const __be32 **cell, u32 cells, u64 *val) -{ - *val = 0; - - if ( cells > 2 ) - early_panic("dtb value contains > 2 cells\n"); - - while ( cells-- ) - { - *val <<= 32; - *val |= fdt32_to_cpu(*(*cell)++); - } -} - static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 size_cells, u64 *start, u64 *size) { - get_val(cell, address_cells, start); - get_val(cell, size_cells, size); + *start = dt_next_cell(address_cells, cell); + *size = dt_next_cell(size_cells, cell); } void dt_get_range(const __be32 **cell, const struct dt_device_node *np, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNEmA-0005g3-7Y; Sat, 21 Sep 2013 04:26:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEm8-0005fm-TG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:33 +0000 Received: from [85.158.137.68:64338] by server-5.bemta-3.messagelabs.com id EF/2A-23058-7FF1D325; Sat, 21 Sep 2013 04:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379737590!3829986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 791 invoked from network); 21 Sep 2013 04:26:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEm5-0000UR-W9 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEm5-000101-UE for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:29 +0000 Date: Sat, 21 Sep 2013 04:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Check if the device is available before using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 735d865183306c85c8ef8a16f8a82c48359e9bee Author: Julien Grall AuthorDate: Fri Sep 13 13:49:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:16 2013 +0100 xen/arm: Check if the device is available before using it It's possible to have a device description in the DTS but the device is not wired. device_init must check if the device is available before doing anything with it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index dc751a9..f86b2e3 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -47,6 +47,9 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, ASSERT(dev != NULL); + if ( !dt_device_is_available(dev) ) + return -ENODEV; + for ( desc = _sdevice; desc != _edevice; desc++ ) { if ( desc->type != type ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNEmA-0005g3-7Y; Sat, 21 Sep 2013 04:26:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEm8-0005fm-TG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:33 +0000 Received: from [85.158.137.68:64338] by server-5.bemta-3.messagelabs.com id EF/2A-23058-7FF1D325; Sat, 21 Sep 2013 04:26:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379737590!3829986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 791 invoked from network); 21 Sep 2013 04:26:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:26:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEm5-0000UR-W9 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEm5-000101-UE for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:29 +0000 Date: Sat, 21 Sep 2013 04:26:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Check if the device is available before using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 735d865183306c85c8ef8a16f8a82c48359e9bee Author: Julien Grall AuthorDate: Fri Sep 13 13:49:33 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:16 2013 +0100 xen/arm: Check if the device is available before using it It's possible to have a device description in the DTS but the device is not wired. device_init must check if the device is available before doing anything with it. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index dc751a9..f86b2e3 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -47,6 +47,9 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, ASSERT(dev != NULL); + if ( !dt_device_is_available(dev) ) + return -ENODEV; + for ( desc = _sdevice; desc != _edevice; desc++ ) { if ( desc->type != type ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNEmK-0005hu-CA; Sat, 21 Sep 2013 04:26:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmJ-0005he-6y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:43 +0000 Received: from [85.158.139.211:44116] by server-6.bemta-5.messagelabs.com id 2A/C5-05559-2002D325; Sat, 21 Sep 2013 04:26:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1379737600!3747623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11276 invoked from network); 21 Sep 2013 04:26:41 -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; 21 Sep 2013 04:26:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmG-0000UX-5R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmG-00010T-3m for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:40 +0000 Date: Sat, 21 Sep 2013 04:26:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARM: parse separate DT properties for different commandlines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8992d62362e0755d3a1929b059769bc3343135d Author: Andre Przywara AuthorDate: Fri Sep 13 13:49:34 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:18 2013 +0100 ARM: parse separate DT properties for different commandlines Currently we use the chosen/bootargs property as the Xen commandline and rely on xen,dom0-bootargs for Dom0. However this brings issues with bootloaders, which usually build bootargs by bootscripts for a Linux kernel - and not for the entirely different Xen hypervisor. Introduce a new possible device tree property "xen,xen-bootargs" explicitly for the Xen hypervisor and make the selection of which to use more fine grained: - If xen,xen-bootargs is present, it will be used for Xen. - If xen,dom0-bootargs is present, it will be used for Dom0. - If xen,xen-bootargs is _not_ present, but xen,dom0-bootargs is, bootargs will be used for Xen. Like the current situation. - If no Xen specific properties are present, bootargs is for Dom0. - If xen,xen-bootargs is present, but xen,dom0-bootargs is missing, bootargs will be used for Dom0. The aim is to allow common bootscripts to boot both Xen and native Linux with the same device tree blob. If needed, one could hard-code the Xen commandline into the DTB, leaving bootargs for Dom0 to be set by the (non Xen-aware) bootloader. I will send out a appropriate u-boot patch, which writes the content of the "xen_bootargs" environment variable into the xen,xen-bootargs dtb property. Signed-off-by: Andre Przywara Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/misc/arm/device-tree/booting.txt | 28 +++++++++++++++++++++++++++- xen/arch/arm/domain_build.c | 15 +++++++++++---- xen/common/device_tree.c | 7 ++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 94cd3f1..08ed775 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -1,3 +1,6 @@ +Dom0 kernel and ramdisk modules +================================ + Xen is passed the dom0 kernel and initrd via a reference in the /chosen node of the device tree. @@ -22,4 +25,27 @@ properties: - bootargs (optional) - Command line associated with this module + Command line associated with this module. This is deprecated and should + be replaced by the bootargs variations described below. + + +Command lines +============= + +Xen also checks for properties directly under /chosen to find suitable command +lines for Xen and Dom0. The logic is the following: + + - If xen,xen-bootargs is present, it will be used for Xen. + - If xen,dom0-bootargs is present, it will be used for Dom0. + - If xen,xen-bootargs is _not_ present, but xen,dom0-bootargs is, + bootargs will be used for Xen. + - If no Xen specific properties are present, bootargs is for Dom0. + - If xen,xen-bootargs is present, but xen,dom0-bootargs is missing, + bootargs will be used for Dom0. + +Most of these cases is to make booting with Xen-unaware bootloaders easier. +For those you would hardcode the Xen commandline in the DTB under +/chosen/xen,xen-bootargs and would let the bootloader set the Dom0 command +line by writing bootargs (as for native Linux). +A Xen-aware bootloader would set xen,xen-bootargs for Xen, xen,dom0-bootargs +for Dom0 and bootargs for native Linux. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 82003c1..40af876 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -146,6 +146,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, const char *bootargs = NULL; const struct dt_property *pp; int res = 0; + int had_dom0_bootargs = 0; if ( early_info.modules.nr_mods >= MOD_KERNEL && early_info.modules.module[MOD_KERNEL].cmdline[0] ) @@ -162,15 +163,21 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * * * remember xen,dom0-bootargs if we don't already have * bootargs (from module #1, above). - * * remove bootargs and xen,dom0-bootargs. + * * remove bootargs, xen,dom0-bootargs and xen,xen-bootargs. */ if ( dt_node_path_is_equal(np, "/chosen") ) { - if ( dt_property_name_is_equal(pp, "bootargs") ) + if ( dt_property_name_is_equal(pp, "xen,xen-bootargs") ) + continue; + if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + { + had_dom0_bootargs = 1; + bootargs = pp->value; continue; - else if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + } + if ( dt_property_name_is_equal(pp, "bootargs") ) { - if ( !bootargs ) + if ( !bootargs && !had_dom0_bootargs ) bootargs = pp->value; continue; } diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index ee58c52..0ece249 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -261,7 +261,12 @@ const char *device_tree_bootargs(const void *fdt) if ( node < 0 ) return NULL; - prop = fdt_get_property(fdt, node, "bootargs", NULL); + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); + if ( prop == NULL ) + { + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL)) + prop = fdt_get_property(fdt, node, "bootargs", NULL); + } if ( prop == NULL ) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26: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 1VNEmK-0005hu-CA; Sat, 21 Sep 2013 04:26:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmJ-0005he-6y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:43 +0000 Received: from [85.158.139.211:44116] by server-6.bemta-5.messagelabs.com id 2A/C5-05559-2002D325; Sat, 21 Sep 2013 04:26:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1379737600!3747623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11276 invoked from network); 21 Sep 2013 04:26:41 -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; 21 Sep 2013 04:26:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmG-0000UX-5R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmG-00010T-3m for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:40 +0000 Date: Sat, 21 Sep 2013 04:26:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARM: parse separate DT properties for different commandlines X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8992d62362e0755d3a1929b059769bc3343135d Author: Andre Przywara AuthorDate: Fri Sep 13 13:49:34 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 15:29:18 2013 +0100 ARM: parse separate DT properties for different commandlines Currently we use the chosen/bootargs property as the Xen commandline and rely on xen,dom0-bootargs for Dom0. However this brings issues with bootloaders, which usually build bootargs by bootscripts for a Linux kernel - and not for the entirely different Xen hypervisor. Introduce a new possible device tree property "xen,xen-bootargs" explicitly for the Xen hypervisor and make the selection of which to use more fine grained: - If xen,xen-bootargs is present, it will be used for Xen. - If xen,dom0-bootargs is present, it will be used for Dom0. - If xen,xen-bootargs is _not_ present, but xen,dom0-bootargs is, bootargs will be used for Xen. Like the current situation. - If no Xen specific properties are present, bootargs is for Dom0. - If xen,xen-bootargs is present, but xen,dom0-bootargs is missing, bootargs will be used for Dom0. The aim is to allow common bootscripts to boot both Xen and native Linux with the same device tree blob. If needed, one could hard-code the Xen commandline into the DTB, leaving bootargs for Dom0 to be set by the (non Xen-aware) bootloader. I will send out a appropriate u-boot patch, which writes the content of the "xen_bootargs" environment variable into the xen,xen-bootargs dtb property. Signed-off-by: Andre Przywara Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/misc/arm/device-tree/booting.txt | 28 +++++++++++++++++++++++++++- xen/arch/arm/domain_build.c | 15 +++++++++++---- xen/common/device_tree.c | 7 ++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 94cd3f1..08ed775 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -1,3 +1,6 @@ +Dom0 kernel and ramdisk modules +================================ + Xen is passed the dom0 kernel and initrd via a reference in the /chosen node of the device tree. @@ -22,4 +25,27 @@ properties: - bootargs (optional) - Command line associated with this module + Command line associated with this module. This is deprecated and should + be replaced by the bootargs variations described below. + + +Command lines +============= + +Xen also checks for properties directly under /chosen to find suitable command +lines for Xen and Dom0. The logic is the following: + + - If xen,xen-bootargs is present, it will be used for Xen. + - If xen,dom0-bootargs is present, it will be used for Dom0. + - If xen,xen-bootargs is _not_ present, but xen,dom0-bootargs is, + bootargs will be used for Xen. + - If no Xen specific properties are present, bootargs is for Dom0. + - If xen,xen-bootargs is present, but xen,dom0-bootargs is missing, + bootargs will be used for Dom0. + +Most of these cases is to make booting with Xen-unaware bootloaders easier. +For those you would hardcode the Xen commandline in the DTB under +/chosen/xen,xen-bootargs and would let the bootloader set the Dom0 command +line by writing bootargs (as for native Linux). +A Xen-aware bootloader would set xen,xen-bootargs for Xen, xen,dom0-bootargs +for Dom0 and bootargs for native Linux. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 82003c1..40af876 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -146,6 +146,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, const char *bootargs = NULL; const struct dt_property *pp; int res = 0; + int had_dom0_bootargs = 0; if ( early_info.modules.nr_mods >= MOD_KERNEL && early_info.modules.module[MOD_KERNEL].cmdline[0] ) @@ -162,15 +163,21 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * * * remember xen,dom0-bootargs if we don't already have * bootargs (from module #1, above). - * * remove bootargs and xen,dom0-bootargs. + * * remove bootargs, xen,dom0-bootargs and xen,xen-bootargs. */ if ( dt_node_path_is_equal(np, "/chosen") ) { - if ( dt_property_name_is_equal(pp, "bootargs") ) + if ( dt_property_name_is_equal(pp, "xen,xen-bootargs") ) + continue; + if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + { + had_dom0_bootargs = 1; + bootargs = pp->value; continue; - else if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + } + if ( dt_property_name_is_equal(pp, "bootargs") ) { - if ( !bootargs ) + if ( !bootargs && !had_dom0_bootargs ) bootargs = pp->value; continue; } diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index ee58c52..0ece249 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -261,7 +261,12 @@ const char *device_tree_bootargs(const void *fdt) if ( node < 0 ) return NULL; - prop = fdt_get_property(fdt, node, "bootargs", NULL); + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); + if ( prop == NULL ) + { + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL)) + prop = fdt_get_property(fdt, node, "bootargs", NULL); + } if ( prop == NULL ) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmT-0005jp-HN; Sat, 21 Sep 2013 04:26:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmS-0005jb-Ou for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:52 +0000 Received: from [193.109.254.147:31943] by server-12.bemta-14.messagelabs.com id B9/52-27329-C002D325; Sat, 21 Sep 2013 04:26:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737610!361117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9651 invoked from network); 21 Sep 2013 04:26:51 -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; 21 Sep 2013 04:26:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmQ-0000Uf-Bb for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmQ-00010p-9O for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:50 +0000 Date: Sat, 21 Sep 2013 04:26:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Drop unnecessary lock lookup. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 554ded9d9f50c01ae05415b575a6b172c4023279 Author: Tim Deegan AuthorDate: Thu Sep 12 11:45:13 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:08 2013 +0100 passthrough/amd: Drop unnecessary lock lookup. The lock's not used for anything, and AFAICT no locking is needed since the IVRS tables are static after boot. Coverity CID 1087199 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_intr.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index 831f92a..213f4d7 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -443,7 +443,6 @@ static int update_intremap_entry_from_msi_msg( * devices. */ - lock = get_intremap_lock(iommu->seg, alias_id); if ( ( req_id != alias_id ) && get_ivrs_mappings(iommu->seg)[alias_id].intremap_table != NULL ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:26:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:26:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmT-0005jp-HN; Sat, 21 Sep 2013 04:26:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmS-0005jb-Ou for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:52 +0000 Received: from [193.109.254.147:31943] by server-12.bemta-14.messagelabs.com id B9/52-27329-C002D325; Sat, 21 Sep 2013 04:26:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737610!361117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9651 invoked from network); 21 Sep 2013 04:26:51 -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; 21 Sep 2013 04:26:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmQ-0000Uf-Bb for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmQ-00010p-9O for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:26:50 +0000 Date: Sat, 21 Sep 2013 04:26:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Drop unnecessary lock lookup. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 554ded9d9f50c01ae05415b575a6b172c4023279 Author: Tim Deegan AuthorDate: Thu Sep 12 11:45:13 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:08 2013 +0100 passthrough/amd: Drop unnecessary lock lookup. The lock's not used for anything, and AFAICT no locking is needed since the IVRS tables are static after boot. Coverity CID 1087199 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_intr.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index 831f92a..213f4d7 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -443,7 +443,6 @@ static int update_intremap_entry_from_msi_msg( * devices. */ - lock = get_intremap_lock(iommu->seg, alias_id); if ( ( req_id != alias_id ) && get_ivrs_mappings(iommu->seg)[alias_id].intremap_table != NULL ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEme-0005lh-KJ; Sat, 21 Sep 2013 04:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmd-0005lL-5Y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:03 +0000 Received: from [85.158.137.68:64946] by server-15.bemta-3.messagelabs.com id 49/A0-21409-6102D325; Sat, 21 Sep 2013 04:27:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737620!1492670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12731 invoked from network); 21 Sep 2013 04:27:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEma-0000Uq-Hl for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEma-00011G-Fs for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:00 +0000 Date: Sat, 21 Sep 2013 04:27:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Missing 'break' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72fa4fdf647ba99ecaf39589a93cde8dd36eed3c Author: Tim Deegan AuthorDate: Thu Sep 12 11:57:01 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:25 2013 +0100 passthrough/amd: Missing 'break' Coverity CID 1055502 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_guest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 85f2361..952600a 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -728,6 +728,7 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, break; case IOMMU_EVENT_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->event_log.reg_base, val); + break; case IOMMU_PPR_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->ppr_log.reg_base, val); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEme-0005lh-KJ; Sat, 21 Sep 2013 04:27:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmd-0005lL-5Y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:03 +0000 Received: from [85.158.137.68:64946] by server-15.bemta-3.messagelabs.com id 49/A0-21409-6102D325; Sat, 21 Sep 2013 04:27:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737620!1492670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12731 invoked from network); 21 Sep 2013 04:27:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEma-0000Uq-Hl for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEma-00011G-Fs for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:00 +0000 Date: Sat, 21 Sep 2013 04:27:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Missing 'break' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72fa4fdf647ba99ecaf39589a93cde8dd36eed3c Author: Tim Deegan AuthorDate: Thu Sep 12 11:57:01 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:25 2013 +0100 passthrough/amd: Missing 'break' Coverity CID 1055502 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_guest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 85f2361..952600a 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -728,6 +728,7 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, break; case IOMMU_EVENT_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->event_log.reg_base, val); + break; case IOMMU_PPR_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->ppr_log.reg_base, val); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmo-0005nn-NT; Sat, 21 Sep 2013 04:27:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmn-0005nS-9h for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:13 +0000 Received: from [193.109.254.147:36283] by server-7.bemta-14.messagelabs.com id C5/2A-04456-0202D325; Sat, 21 Sep 2013 04:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737630!361144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10604 invoked from network); 21 Sep 2013 04:27:11 -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; 21 Sep 2013 04:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmk-0000VP-Pr for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmk-00011n-Nc for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:10 +0000 Date: Sat, 21 Sep 2013 04:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Shuffle declaration. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 730127d4a1f5fa60082c86e03e3b872b8e934819 Author: Tim Deegan AuthorDate: Thu Sep 12 12:05:18 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:40 2013 +0100 passthrough/amd: Shuffle declaration. Coverity's parser chokes on seeing __section() before the type. Coverity CID 1087190 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index bd66c65..c3b9631 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -633,7 +633,7 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } -static __initdata DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); +static DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)) __initdata; static void __init parse_ivrs_ioapic(char *str) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmo-0005nn-NT; Sat, 21 Sep 2013 04:27:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmn-0005nS-9h for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:13 +0000 Received: from [193.109.254.147:36283] by server-7.bemta-14.messagelabs.com id C5/2A-04456-0202D325; Sat, 21 Sep 2013 04:27:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1379737630!361144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10604 invoked from network); 21 Sep 2013 04:27:11 -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; 21 Sep 2013 04:27:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmk-0000VP-Pr for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmk-00011n-Nc for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:10 +0000 Date: Sat, 21 Sep 2013 04:27:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough/amd: Shuffle declaration. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 730127d4a1f5fa60082c86e03e3b872b8e934819 Author: Tim Deegan AuthorDate: Thu Sep 12 12:05:18 2013 +0100 Commit: Tim Deegan CommitDate: Tue Sep 17 16:36:40 2013 +0100 passthrough/amd: Shuffle declaration. Coverity's parser chokes on seeing __section() before the type. Coverity CID 1087190 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index bd66c65..c3b9631 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -633,7 +633,7 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } -static __initdata DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)); +static DECLARE_BITMAP(ioapic_cmdline, ARRAY_SIZE(ioapic_sbdf)) __initdata; static void __init parse_ivrs_ioapic(char *str) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEmz-0005pd-Qj; Sat, 21 Sep 2013 04:27:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmx-0005pQ-WD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:24 +0000 Received: from [85.158.137.68:3573] by server-3.bemta-3.messagelabs.com id 3F/85-11625-B202D325; Sat, 21 Sep 2013 04:27:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1379737641!3828463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28585 invoked from network); 21 Sep 2013 04:27:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmv-0000VV-5R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmu-00012s-V8 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:20 +0000 Date: Sat, 21 Sep 2013 04:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix documentation index for hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3900dea28f9ab8207c35365b5fee2058b68fe91 Author: Ian Campbell AuthorDate: Wed Sep 11 10:48:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 17:03:54 2013 +0100 docs: fix documentation index for hypercalls This was broken by 118104e5eaf2 "docs: Build docs for ARM as well as x86_64". Move docs to hypercall/ARCH instead of hypercall-ARCH. Support mulitple levels of subdirectories in gen-html-index tool. This removes the need for a symlink hypercall->hypercall-x86_64 since there is now a proper index at hypercall/index.html. Update INDEX to human readable names for the architecture specific hypercalls. Signed-off-by: Ian Campbell --- docs/INDEX | 5 ++++- docs/Makefile | 12 ++++-------- docs/gen-html-index | 33 ++++++++++++++++++++++++--------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/docs/INDEX b/docs/INDEX index f5ccae2..fdf0ad8 100644 --- a/docs/INDEX +++ b/docs/INDEX @@ -1,4 +1,7 @@ -hypercall/index Hypercall Interfaces +hypercall Hypercall Interfaces +hypercall/arm/index ARM +hypercall/x86_32/index x86_32 +hypercall/x86_64/index x86_64 man Man Pages diff --git a/docs/Makefile b/docs/Makefile index f480171..8d5d48e 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,8 +15,7 @@ DOC_HTML := $(patsubst %.markdown,html/%.html,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,html/man/%.1.html,$(DOC_MAN1SRC)) \ $(patsubst man/%.pod.5,html/man/%.5.html,$(DOC_MAN5SRC)) \ $(patsubst %.txt,html/%.txt,$(wildcard misc/*.txt)) \ - html/hypercall/index.html \ - $(patsubst %,html/hypercall-%/index.html,$(DOC_ARCHES)) + $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(wildcard misc/*.txt)) \ $(patsubst %.markdown,txt/%.txt,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,txt/man/%.1.txt,$(DOC_MAN1SRC)) \ @@ -125,9 +124,9 @@ else endif # For non-x86 arches exclude the subarch whole x86 arch. -$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall-$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 +$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall/$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 -html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile +html/hypercall/%/index.html: $(CURDIR)/xen-headers Makefile rm -rf $(@D) $(INSTALL_DIR) $(@D) $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \ @@ -137,10 +136,7 @@ html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile $(EXTRA_EXCLUDE) \ $(XEN_ROOT)/xen include/public include/xen/errno.h -html/hypercall/index.html: html/hypercall-x86_64/index.html - ln -nfs hypercall-x86_64 html/hypercall - --include $(wildcard html/hypercall-*/.deps) +-include $(wildcard html/hypercall/*/.deps) txt/%.txt: %.txt $(INSTALL_DIR) $(@D) diff --git a/docs/gen-html-index b/docs/gen-html-index index 7b36a19..e9792bf 100644 --- a/docs/gen-html-index +++ b/docs/gen-html-index @@ -71,16 +71,16 @@ sub make_link ($$) { my ($ref,$base) = @_; my $txt = make_linktext($ref); - $ref = basename($ref) if $base; + $ref =~ s,^$base/,, if $base; #/ return "
  • $txt
    • \n"; } -sub make_links ($$@) { - my ($dir,$base,@docs) = @_; +sub make_links ($@) { + my ($dir,@docs) = @_; my $idx = ''; foreach my $of (sort { make_linktext($a) cmp make_linktext($b) } @docs) { - $idx .= make_link($of,$base); + $idx .= make_link($of,$dir); } return $idx; } @@ -103,22 +103,37 @@ sub uniq (@) { foreach (@_) { $h{$_} = 1; } return keys %h; } - + for (@docs) { s,^\Q$outdir\E/,, } @docs = grep { -e "$outdir/$_" && (make_linktext($_) ne "NO-INDEX") } @docs; my $top = ''; -foreach my $od (sort { $a cmp $b } uniq map { dirname($_) } @docs) { +# Return a list of all directories leading to $path +sub dirs($) +{ + my ($path) = @_; + my @dirs; + while ( $path =~ m,/, ) + { + $path =~ m,/([^/]+)$,; + push @dirs, $`;#` + $path = $`;#` + } + return @dirs; +} + +foreach my $od (sort { $a cmp $b } uniq map { dirs($_) } @docs) { my @d = (grep /^\Q$od\E/, @docs); if ( @d == 1 and $d[0] eq "$od/index.html" ) { + next if $d[0] =~ m,/,;#/ linked to from the subdirectory entry. $top .= make_link("$od/index.html", 0); } else { - my $links = make_links($od,0,@d); + my $links = make_links(undef,@d); my $secttitle = make_linktext($od); $top .= <$secttitle @@ -127,8 +142,8 @@ $links END - $links = make_links($od,1,@d); - my $idx = ''; + $links = make_links($od,@d); + my $idx = ''; $idx .= <$secttitle
      -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEmz-0005pd-Qj; Sat, 21 Sep 2013 04:27:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmx-0005pQ-WD for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:24 +0000 Received: from [85.158.137.68:3573] by server-3.bemta-3.messagelabs.com id 3F/85-11625-B202D325; Sat, 21 Sep 2013 04:27:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1379737641!3828463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28585 invoked from network); 21 Sep 2013 04:27:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEmv-0000VV-5R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEmu-00012s-V8 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:20 +0000 Date: Sat, 21 Sep 2013 04:27:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix documentation index for hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3900dea28f9ab8207c35365b5fee2058b68fe91 Author: Ian Campbell AuthorDate: Wed Sep 11 10:48:19 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 17:03:54 2013 +0100 docs: fix documentation index for hypercalls This was broken by 118104e5eaf2 "docs: Build docs for ARM as well as x86_64". Move docs to hypercall/ARCH instead of hypercall-ARCH. Support mulitple levels of subdirectories in gen-html-index tool. This removes the need for a symlink hypercall->hypercall-x86_64 since there is now a proper index at hypercall/index.html. Update INDEX to human readable names for the architecture specific hypercalls. Signed-off-by: Ian Campbell --- docs/INDEX | 5 ++++- docs/Makefile | 12 ++++-------- docs/gen-html-index | 33 ++++++++++++++++++++++++--------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/docs/INDEX b/docs/INDEX index f5ccae2..fdf0ad8 100644 --- a/docs/INDEX +++ b/docs/INDEX @@ -1,4 +1,7 @@ -hypercall/index Hypercall Interfaces +hypercall Hypercall Interfaces +hypercall/arm/index ARM +hypercall/x86_32/index x86_32 +hypercall/x86_64/index x86_64 man Man Pages diff --git a/docs/Makefile b/docs/Makefile index f480171..8d5d48e 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,8 +15,7 @@ DOC_HTML := $(patsubst %.markdown,html/%.html,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,html/man/%.1.html,$(DOC_MAN1SRC)) \ $(patsubst man/%.pod.5,html/man/%.5.html,$(DOC_MAN5SRC)) \ $(patsubst %.txt,html/%.txt,$(wildcard misc/*.txt)) \ - html/hypercall/index.html \ - $(patsubst %,html/hypercall-%/index.html,$(DOC_ARCHES)) + $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(wildcard misc/*.txt)) \ $(patsubst %.markdown,txt/%.txt,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,txt/man/%.1.txt,$(DOC_MAN1SRC)) \ @@ -125,9 +124,9 @@ else endif # For non-x86 arches exclude the subarch whole x86 arch. -$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall-$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 +$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall/$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 -html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile +html/hypercall/%/index.html: $(CURDIR)/xen-headers Makefile rm -rf $(@D) $(INSTALL_DIR) $(@D) $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \ @@ -137,10 +136,7 @@ html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile $(EXTRA_EXCLUDE) \ $(XEN_ROOT)/xen include/public include/xen/errno.h -html/hypercall/index.html: html/hypercall-x86_64/index.html - ln -nfs hypercall-x86_64 html/hypercall - --include $(wildcard html/hypercall-*/.deps) +-include $(wildcard html/hypercall/*/.deps) txt/%.txt: %.txt $(INSTALL_DIR) $(@D) diff --git a/docs/gen-html-index b/docs/gen-html-index index 7b36a19..e9792bf 100644 --- a/docs/gen-html-index +++ b/docs/gen-html-index @@ -71,16 +71,16 @@ sub make_link ($$) { my ($ref,$base) = @_; my $txt = make_linktext($ref); - $ref = basename($ref) if $base; + $ref =~ s,^$base/,, if $base; #/ return "
    • $txt
      • \n"; } -sub make_links ($$@) { - my ($dir,$base,@docs) = @_; +sub make_links ($@) { + my ($dir,@docs) = @_; my $idx = ''; foreach my $of (sort { make_linktext($a) cmp make_linktext($b) } @docs) { - $idx .= make_link($of,$base); + $idx .= make_link($of,$dir); } return $idx; } @@ -103,22 +103,37 @@ sub uniq (@) { foreach (@_) { $h{$_} = 1; } return keys %h; } - + for (@docs) { s,^\Q$outdir\E/,, } @docs = grep { -e "$outdir/$_" && (make_linktext($_) ne "NO-INDEX") } @docs; my $top = ''; -foreach my $od (sort { $a cmp $b } uniq map { dirname($_) } @docs) { +# Return a list of all directories leading to $path +sub dirs($) +{ + my ($path) = @_; + my @dirs; + while ( $path =~ m,/, ) + { + $path =~ m,/([^/]+)$,; + push @dirs, $`;#` + $path = $`;#` + } + return @dirs; +} + +foreach my $od (sort { $a cmp $b } uniq map { dirs($_) } @docs) { my @d = (grep /^\Q$od\E/, @docs); if ( @d == 1 and $d[0] eq "$od/index.html" ) { + next if $d[0] =~ m,/,;#/ linked to from the subdirectory entry. $top .= make_link("$od/index.html", 0); } else { - my $links = make_links($od,0,@d); + my $links = make_links(undef,@d); my $secttitle = make_linktext($od); $top .= <$secttitle @@ -127,8 +142,8 @@ $links
    END - $links = make_links($od,1,@d); - my $idx = ''; + $links = make_links($od,@d); + my $idx = ''; $idx .= <$secttitle
      -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEn9-0005rb-Ty; Sat, 21 Sep 2013 04:27:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEn8-0005rI-B7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:34 +0000 Received: from [193.109.254.147:32711] by server-9.bemta-14.messagelabs.com id F7/FB-30026-5302D325; Sat, 21 Sep 2013 04:27:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1379737651!3406800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28221 invoked from network); 21 Sep 2013 04:27:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEn5-0000Vd-F1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEn5-00013V-B2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:31 +0000 Date: Sat, 21 Sep 2013 04:27:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: disable xend build 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 cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0 Author: Ian Campbell AuthorDate: Thu Sep 12 11:34:12 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 17:39:53 2013 +0100 tools: disable xend build by default Add big warnings to configure, xend initscript and xm. The big xm warning is displayed once (per boot, or per tmpreaper clean), afterwards a single line warning is displayed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/configure | 27 +++++++++++++++++++++++++-- tools/configure.ac | 15 ++++++++++++++- tools/hotplug/Linux/init.d/xend | 4 ++++ tools/python/xen/xm/xm | 15 ++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index 0dee92a..1da8652 100755 --- a/tools/configure +++ b/tools/configure @@ -1424,7 +1424,7 @@ Optional Features: --disable-rombios Disable ROM BIOS (default is ENABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) - --disable-xend Disable xend toolstack (default is ENABLED) + --enable-xend Enable xend toolstack (default is DISABLED) --enable-blktap1 Disable blktap1 tools (default is DISABLED) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on @@ -3671,7 +3671,7 @@ elif test "x$enable_xend" = "xyes"; then : elif test -z $ax_cv_xend; then : - ax_cv_xend="y" + ax_cv_xend="n" fi xend=$ax_cv_xend @@ -9235,3 +9235,26 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +if test "x$xend" = "xy" ; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +" >&5 +$as_echo "$as_me: WARNING: You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +" >&2;} + +fi diff --git a/tools/configure.ac b/tools/configure.ac index 2e57bfc..4f3c33a 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -57,7 +57,7 @@ AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) -AX_ARG_DEFAULT_ENABLE([xend], [Disable xend toolstack]) +AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack]) AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools]) AC_ARG_ENABLE([qemu-traditional], @@ -220,3 +220,16 @@ AC_SUBST(libiconv) AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h]) AC_OUTPUT() + +AS_IF([test "x$xend" = "xy" ], [ + AC_MSG_WARN( +[You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +]) +]) diff --git a/tools/hotplug/Linux/init.d/xend b/tools/hotplug/Linux/init.d/xend index 5f92cdc..8921383 100755 --- a/tools/hotplug/Linux/init.d/xend +++ b/tools/hotplug/Linux/init.d/xend @@ -38,6 +38,10 @@ function await_daemons_up case "$1" in start) + echo "WARNING: Enabling the xend toolstack." + echo "xend is deprecated and scheduled for removal. Please migrate" + echo "to another toolstack ASAP." + if [ -z "`ps -C xenconsoled -o pid=`" ]; then echo "xencommons should be started first." exit 1 diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm index f4fd200..458f219 100755 --- a/tools/python/xen/xm/xm +++ b/tools/python/xen/xm/xm @@ -1,7 +1,20 @@ #!/usr/bin/env python # -*- mode: python; -*- -import sys +import sys, os.path from xen.xm import main +print("WARNING: xend/xm is deprecated.") + +if not os.path.exists("/tmp/xm-deprecation-long-warning"): + print(""" +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +""") + open("/tmp/xm-deprecation-long-warning", "w").close() + main.main(sys.argv) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEn9-0005rb-Ty; Sat, 21 Sep 2013 04:27:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEn8-0005rI-B7 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:34 +0000 Received: from [193.109.254.147:32711] by server-9.bemta-14.messagelabs.com id F7/FB-30026-5302D325; Sat, 21 Sep 2013 04:27:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1379737651!3406800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28221 invoked from network); 21 Sep 2013 04:27:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEn5-0000Vd-F1 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEn5-00013V-B2 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:31 +0000 Date: Sat, 21 Sep 2013 04:27:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: disable xend build 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 cf59b4cd9f85631d4c38d6df05e7e432fca5a8f0 Author: Ian Campbell AuthorDate: Thu Sep 12 11:34:12 2013 +0100 Commit: Ian Campbell CommitDate: Tue Sep 17 17:39:53 2013 +0100 tools: disable xend build by default Add big warnings to configure, xend initscript and xm. The big xm warning is displayed once (per boot, or per tmpreaper clean), afterwards a single line warning is displayed. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/configure | 27 +++++++++++++++++++++++++-- tools/configure.ac | 15 ++++++++++++++- tools/hotplug/Linux/init.d/xend | 4 ++++ tools/python/xen/xm/xm | 15 ++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tools/configure b/tools/configure index 0dee92a..1da8652 100755 --- a/tools/configure +++ b/tools/configure @@ -1424,7 +1424,7 @@ Optional Features: --disable-rombios Disable ROM BIOS (default is ENABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) - --disable-xend Disable xend toolstack (default is ENABLED) + --enable-xend Enable xend toolstack (default is DISABLED) --enable-blktap1 Disable blktap1 tools (default is DISABLED) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on @@ -3671,7 +3671,7 @@ elif test "x$enable_xend" = "xyes"; then : elif test -z $ax_cv_xend; then : - ax_cv_xend="y" + ax_cv_xend="n" fi xend=$ax_cv_xend @@ -9235,3 +9235,26 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +if test "x$xend" = "xy" ; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +" >&5 +$as_echo "$as_me: WARNING: You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +" >&2;} + +fi diff --git a/tools/configure.ac b/tools/configure.ac index 2e57bfc..4f3c33a 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -57,7 +57,7 @@ AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) -AX_ARG_DEFAULT_ENABLE([xend], [Disable xend toolstack]) +AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack]) AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools]) AC_ARG_ENABLE([qemu-traditional], @@ -220,3 +220,16 @@ AC_SUBST(libiconv) AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h]) AC_OUTPUT() + +AS_IF([test "x$xend" = "xy" ], [ + AC_MSG_WARN( +[You have enabled the xend toolstack. + +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +]) +]) diff --git a/tools/hotplug/Linux/init.d/xend b/tools/hotplug/Linux/init.d/xend index 5f92cdc..8921383 100755 --- a/tools/hotplug/Linux/init.d/xend +++ b/tools/hotplug/Linux/init.d/xend @@ -38,6 +38,10 @@ function await_daemons_up case "$1" in start) + echo "WARNING: Enabling the xend toolstack." + echo "xend is deprecated and scheduled for removal. Please migrate" + echo "to another toolstack ASAP." + if [ -z "`ps -C xenconsoled -o pid=`" ]; then echo "xencommons should be started first." exit 1 diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm index f4fd200..458f219 100755 --- a/tools/python/xen/xm/xm +++ b/tools/python/xen/xm/xm @@ -1,7 +1,20 @@ #!/usr/bin/env python # -*- mode: python; -*- -import sys +import sys, os.path from xen.xm import main +print("WARNING: xend/xm is deprecated.") + +if not os.path.exists("/tmp/xm-deprecation-long-warning"): + print(""" +xend is deprecated and scheduled for removal. Please migrate to another +toolstack ASAP. + +See http://wiki.xen.org/wiki/Choice_of_Toolstacks for information on +other alternatives, including xl which is designed to be a drop in +replacement for xm (http://wiki.xen.org/wiki/XL). +""") + open("/tmp/xm-deprecation-long-warning", "w").close() + main.main(sys.argv) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnK-0005tE-0W; Sat, 21 Sep 2013 04:27:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnI-0005sv-CC for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:44 +0000 Received: from [85.158.137.68:8342] by server-9.bemta-3.messagelabs.com id 53/C4-15303-F302D325; Sat, 21 Sep 2013 04:27:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1379737661!3818048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18228 invoked from network); 21 Sep 2013 04:27:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnF-0000Vj-MQ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnF-000140-Jk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:41 +0000 Date: Sat, 21 Sep 2013 04:27:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: fix failure path in hvm_vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e Author: George Dunlap AuthorDate: Wed Sep 18 14:45:24 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 18 14:45:24 2013 +0200 x86/HVM: fix failure path in hvm_vcpu_initialise It looks like one of the failure cases in hvm_vcpu_initialise jumps to the wrong label; this could lead to slow leaks if something isn't cleaned up properly. I will probably change these labels in a future patch, but I figured it was better to have this fix separately. This is also a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8fd218e..7203184 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1118,7 +1118,7 @@ int hvm_vcpu_initialise(struct vcpu *v) /* Create bufioreq event channel. */ rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); if ( rc < 0 ) - goto fail2; + goto fail4; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnK-0005tE-0W; Sat, 21 Sep 2013 04:27:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnI-0005sv-CC for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:44 +0000 Received: from [85.158.137.68:8342] by server-9.bemta-3.messagelabs.com id 53/C4-15303-F302D325; Sat, 21 Sep 2013 04:27:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1379737661!3818048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18228 invoked from network); 21 Sep 2013 04:27:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnF-0000Vj-MQ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnF-000140-Jk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:41 +0000 Date: Sat, 21 Sep 2013 04:27:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: fix failure path in hvm_vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e Author: George Dunlap AuthorDate: Wed Sep 18 14:45:24 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 18 14:45:24 2013 +0200 x86/HVM: fix failure path in hvm_vcpu_initialise It looks like one of the failure cases in hvm_vcpu_initialise jumps to the wrong label; this could lead to slow leaks if something isn't cleaned up properly. I will probably change these labels in a future patch, but I figured it was better to have this fix separately. This is also a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8fd218e..7203184 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1118,7 +1118,7 @@ int hvm_vcpu_initialise(struct vcpu *v) /* Create bufioreq event channel. */ rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); if ( rc < 0 ) - goto fail2; + goto fail4; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEnV-0005vA-3S; Sat, 21 Sep 2013 04:27:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnT-0005uk-EJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:55 +0000 Received: from [85.158.137.68:15172] by server-9.bemta-3.messagelabs.com id BD/C4-15303-A402D325; Sat, 21 Sep 2013 04:27:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379737672!3831904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13379 invoked from network); 21 Sep 2013 04:27:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnP-0000Vp-Sd for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnP-00014M-QJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:51 +0000 Date: Sat, 21 Sep 2013 04:27:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix failure path in construct_vmcs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dad7e45bf44c0569546a3ed7d0fa4182a4a73f0a Author: George Dunlap AuthorDate: Wed Sep 18 14:45:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 18 14:45:42 2013 +0200 VMX: fix failure path in construct_vmcs If the allocation fails, make sure to call vmx_vmcs_exit(). This is a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/vmx/vmcs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 58d38b1..0be5616 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -894,7 +894,10 @@ static int construct_vmcs(struct vcpu *v) unsigned long *msr_bitmap = alloc_xenheap_page(); if ( msr_bitmap == NULL ) + { + vmx_vmcs_exit(v); return -ENOMEM; + } memset(msr_bitmap, ~0, PAGE_SIZE); v->arch.hvm_vmx.msr_bitmap = msr_bitmap; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:27:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:27: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 1VNEnV-0005vA-3S; Sat, 21 Sep 2013 04:27:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnT-0005uk-EJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:55 +0000 Received: from [85.158.137.68:15172] by server-9.bemta-3.messagelabs.com id BD/C4-15303-A402D325; Sat, 21 Sep 2013 04:27:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379737672!3831904!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13379 invoked from network); 21 Sep 2013 04:27:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:27:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnP-0000Vp-Sd for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnP-00014M-QJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:27:51 +0000 Date: Sat, 21 Sep 2013 04:27:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix failure path in construct_vmcs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dad7e45bf44c0569546a3ed7d0fa4182a4a73f0a Author: George Dunlap AuthorDate: Wed Sep 18 14:45:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 18 14:45:42 2013 +0200 VMX: fix failure path in construct_vmcs If the allocation fails, make sure to call vmx_vmcs_exit(). This is a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor --- xen/arch/x86/hvm/vmx/vmcs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 58d38b1..0be5616 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -894,7 +894,10 @@ static int construct_vmcs(struct vcpu *v) unsigned long *msr_bitmap = alloc_xenheap_page(); if ( msr_bitmap == NULL ) + { + vmx_vmcs_exit(v); return -ENOMEM; + } memset(msr_bitmap, ~0, PAGE_SIZE); v->arch.hvm_vmx.msr_bitmap = msr_bitmap; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEne-0005xH-8t; Sat, 21 Sep 2013 04:28:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnc-0005wn-Nv for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:04 +0000 Received: from [85.158.139.211:45567] by server-12.bemta-5.messagelabs.com id 2B/CC-18373-4502D325; Sat, 21 Sep 2013 04:28:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379737682!3741641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27585 invoked from network); 21 Sep 2013 04:28:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEna-0000WR-3H for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEna-00014s-1X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:02 +0000 Date: Sat, 21 Sep 2013 04:28:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: mark BUG()s and assertion failures as terminal. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2fd6f2b01ed0e1dad93ee1970233e7b54507b26 Author: Tim Deegan AuthorDate: Thu Sep 19 15:38:09 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 19 16:17:57 2013 +0100 x86: mark BUG()s and assertion failures as terminal. This helps avoid static analysis false-positives, and might lead to better code density as the compiler knows it doesn't have to restore spilled state &c. Signed-off-by: Tim Deegan Acked-by: Keir Fraser --- xen/include/asm-x86/bug.h | 11 ++++++++--- xen/include/xen/compiler.h | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index e5dd559..956bfd2 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -46,12 +46,17 @@ struct bug_frame { #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) -#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL) +#define BUG() do { \ + BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL); \ + unreachable(); \ +} while (0) #define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL) -#define assert_failed(msg) \ - BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg) +#define assert_failed(msg) do { \ + BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg); \ + unreachable(); \ +} while (0) extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_0[], diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 7009a09..7d6805c 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -14,6 +14,12 @@ #define always_inline __inline__ __attribute__ ((always_inline)) #define noinline __attribute__((noinline)) +#if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) +#define unreachable() do {} while (1) +#else +#define unreachable() __builtin_unreachable() +#endif + #ifdef __clang__ /* Clang can replace some vars with new automatic ones that go in .data; * mark all explicit-segment vars 'used' to prevent that. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEne-0005xH-8t; Sat, 21 Sep 2013 04:28:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnc-0005wn-Nv for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:04 +0000 Received: from [85.158.139.211:45567] by server-12.bemta-5.messagelabs.com id 2B/CC-18373-4502D325; Sat, 21 Sep 2013 04:28:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379737682!3741641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27585 invoked from network); 21 Sep 2013 04:28:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEna-0000WR-3H for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEna-00014s-1X for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:02 +0000 Date: Sat, 21 Sep 2013 04:28:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: mark BUG()s and assertion failures as terminal. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2fd6f2b01ed0e1dad93ee1970233e7b54507b26 Author: Tim Deegan AuthorDate: Thu Sep 19 15:38:09 2013 +0100 Commit: Tim Deegan CommitDate: Thu Sep 19 16:17:57 2013 +0100 x86: mark BUG()s and assertion failures as terminal. This helps avoid static analysis false-positives, and might lead to better code density as the compiler knows it doesn't have to restore spilled state &c. Signed-off-by: Tim Deegan Acked-by: Keir Fraser --- xen/include/asm-x86/bug.h | 11 ++++++++--- xen/include/xen/compiler.h | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/bug.h b/xen/include/asm-x86/bug.h index e5dd559..956bfd2 100644 --- a/xen/include/asm-x86/bug.h +++ b/xen/include/asm-x86/bug.h @@ -46,12 +46,17 @@ struct bug_frame { #define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) -#define BUG() BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL) +#define BUG() do { \ + BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL); \ + unreachable(); \ +} while (0) #define run_in_exception_handler(fn) BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL) -#define assert_failed(msg) \ - BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg) +#define assert_failed(msg) do { \ + BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg); \ + unreachable(); \ +} while (0) extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_0[], diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 7009a09..7d6805c 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -14,6 +14,12 @@ #define always_inline __inline__ __attribute__ ((always_inline)) #define noinline __attribute__((noinline)) +#if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) +#define unreachable() do {} while (1) +#else +#define unreachable() __builtin_unreachable() +#endif + #ifdef __clang__ /* Clang can replace some vars with new automatic ones that go in .data; * mark all explicit-segment vars 'used' to prevent that. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEno-00061i-C3; Sat, 21 Sep 2013 04:28:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnm-00061L-RC for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:14 +0000 Received: from [193.109.254.147:42853] by server-6.bemta-14.messagelabs.com id 9B/23-20235-E502D325; Sat, 21 Sep 2013 04:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1379737692!535548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8410 invoked from network); 21 Sep 2013 04:28:13 -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; 21 Sep 2013 04:28:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnk-0000WX-AV for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnk-00015I-7p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:12 +0000 Date: Sat, 21 Sep 2013 04:28:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: print xm deprecation warning to stderr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c00a6637315bdd146707dd1f1ad738471bb5caf5 Author: Ian Campbell AuthorDate: Wed Sep 18 21:27:19 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 19 16:25:54 2013 +0100 tools: print xm deprecation warning to stderr To avoid confusing anything which is parsing the output. Signed-off-by: Ian Campbell --- tools/python/xen/xm/xm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm index 458f219..6a3f545 100755 --- a/tools/python/xen/xm/xm +++ b/tools/python/xen/xm/xm @@ -4,10 +4,10 @@ import sys, os.path from xen.xm import main -print("WARNING: xend/xm is deprecated.") +print >>sys.stderr, ("WARNING: xend/xm is deprecated.") if not os.path.exists("/tmp/xm-deprecation-long-warning"): - print(""" + print >>sys.stderr, (""" xend is deprecated and scheduled for removal. Please migrate to another toolstack ASAP. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEno-00061i-C3; Sat, 21 Sep 2013 04:28:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnm-00061L-RC for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:14 +0000 Received: from [193.109.254.147:42853] by server-6.bemta-14.messagelabs.com id 9B/23-20235-E502D325; Sat, 21 Sep 2013 04:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1379737692!535548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8410 invoked from network); 21 Sep 2013 04:28:13 -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; 21 Sep 2013 04:28:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnk-0000WX-AV for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnk-00015I-7p for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:12 +0000 Date: Sat, 21 Sep 2013 04:28:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: print xm deprecation warning to stderr X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c00a6637315bdd146707dd1f1ad738471bb5caf5 Author: Ian Campbell AuthorDate: Wed Sep 18 21:27:19 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 19 16:25:54 2013 +0100 tools: print xm deprecation warning to stderr To avoid confusing anything which is parsing the output. Signed-off-by: Ian Campbell --- tools/python/xen/xm/xm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/xm b/tools/python/xen/xm/xm index 458f219..6a3f545 100755 --- a/tools/python/xen/xm/xm +++ b/tools/python/xen/xm/xm @@ -4,10 +4,10 @@ import sys, os.path from xen.xm import main -print("WARNING: xend/xm is deprecated.") +print >>sys.stderr, ("WARNING: xend/xm is deprecated.") if not os.path.exists("/tmp/xm-deprecation-long-warning"): - print(""" + print >>sys.stderr, (""" xend is deprecated and scheduled for removal. Please migrate to another toolstack ASAP. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEny-00063l-F2; Sat, 21 Sep 2013 04:28:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnx-00063Y-Ld for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:25 +0000 Received: from [85.158.137.68:15772] by server-13.bemta-3.messagelabs.com id 03/53-25971-8602D325; Sat, 21 Sep 2013 04:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737702!1492753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14101 invoked from network); 21 Sep 2013 04:28:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnu-0000Wd-GH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnu-00016A-E8 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:22 +0000 Date: Sat, 21 Sep 2013 04:28:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: properly handle MMIO reads and writes wider than a machine word X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b89f08a498ddac09d4002d9849e329018ceb107 Author: Jan Beulich AuthorDate: Fri Sep 20 11:01:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:01:08 2013 +0200 x86/HVM: properly handle MMIO reads and writes wider than a machine word Just like real hardware we ought to split such accesses transparently to the caller. With little extra effort we can at once even handle page crossing accesses correctly. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/emulate.c | 115 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 95 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9bfba48..4ce4e0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -438,6 +438,7 @@ static int __hvmemul_read( { struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -447,16 +448,38 @@ static int __hvmemul_read( seg, offset, bytes, &reps, access_type, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* + * We only need to handle sizes actual instruction operands can have. All + * such sizes are either powers of 2 or the sum of two powers of 2. Thus + * picking as initial chunk size the largest power of 2 not greater than + * the total size will always result in only power-of-2 size requests + * issued to hvmemul_do_mmio() (hvmemul_do_io() rejects non-powers-of-2). + */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_READ, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -473,14 +496,32 @@ static int __hvmemul_read( return X86EMUL_EXCEPTION; case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; - case HVMCOPY_bad_gfn_to_mfn: + case HVMCOPY_bad_gfn_to_mfn: if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -537,6 +578,7 @@ static int hvmemul_write( container_of(ctxt, struct hvm_emulate_ctxt, ctxt); struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present | PFEC_write_access; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -546,14 +588,30 @@ static int hvmemul_write( seg, offset, bytes, &reps, hvm_access_write, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* See the respective comment in __hvmemul_read(). */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -569,12 +627,29 @@ static int hvmemul_write( case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; case HVMCOPY_bad_gfn_to_mfn: - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEny-00063l-F2; Sat, 21 Sep 2013 04:28:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnx-00063Y-Ld for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:25 +0000 Received: from [85.158.137.68:15772] by server-13.bemta-3.messagelabs.com id 03/53-25971-8602D325; Sat, 21 Sep 2013 04:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1379737702!1492753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14101 invoked from network); 21 Sep 2013 04:28:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEnu-0000Wd-GH for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEnu-00016A-E8 for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:22 +0000 Date: Sat, 21 Sep 2013 04:28:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: properly handle MMIO reads and writes wider than a machine word X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b89f08a498ddac09d4002d9849e329018ceb107 Author: Jan Beulich AuthorDate: Fri Sep 20 11:01:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:01:08 2013 +0200 x86/HVM: properly handle MMIO reads and writes wider than a machine word Just like real hardware we ought to split such accesses transparently to the caller. With little extra effort we can at once even handle page crossing accesses correctly. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/emulate.c | 115 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 95 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9bfba48..4ce4e0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -438,6 +438,7 @@ static int __hvmemul_read( { struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -447,16 +448,38 @@ static int __hvmemul_read( seg, offset, bytes, &reps, access_type, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* + * We only need to handle sizes actual instruction operands can have. All + * such sizes are either powers of 2 or the sum of two powers of 2. Thus + * picking as initial chunk size the largest power of 2 not greater than + * the total size will always result in only power-of-2 size requests + * issued to hvmemul_do_mmio() (hvmemul_do_io() rejects non-powers-of-2). + */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_READ, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -473,14 +496,32 @@ static int __hvmemul_read( return X86EMUL_EXCEPTION; case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; - case HVMCOPY_bad_gfn_to_mfn: + case HVMCOPY_bad_gfn_to_mfn: if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -537,6 +578,7 @@ static int hvmemul_write( container_of(ctxt, struct hvm_emulate_ctxt, ctxt); struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present | PFEC_write_access; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -546,14 +588,30 @@ static int hvmemul_write( seg, offset, bytes, &reps, hvm_access_write, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* See the respective comment in __hvmemul_read(). */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -569,12 +627,29 @@ static int hvmemul_write( case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; case HVMCOPY_bad_gfn_to_mfn: - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEo8-0006FW-IY; Sat, 21 Sep 2013 04:28:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEo7-0006BY-8y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:35 +0000 Received: from [193.109.254.147:33614] by server-3.bemta-14.messagelabs.com id 60/C0-11293-2702D325; Sat, 21 Sep 2013 04:28:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1379737712!165674!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8757 invoked from network); 21 Sep 2013 04:28:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEo4-0000Wl-Pk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEo4-00016b-Mq for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:32 +0000 Date: Sat, 21 Sep 2013 04:28:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix dependencies of emulator test X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbad67c5d291a3428bed341909e22953ea0d80df Author: Jan Beulich AuthorDate: Fri Sep 20 11:02:47 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:02:47 2013 +0200 x86: fix dependencies of emulator test Rather than mentioning the (linked) directory, mention the files thus making sure things get rebuild as needed when the core emulator files change. Also enable debug info generation unconditionally, as this is testing stuff only anyway. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/Makefile | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 5d9de9b..73517b7 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -37,14 +37,13 @@ clean: .PHONY: install install: -.PHONY: x86_emulate -x86_emulate: +x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate . HOSTCFLAGS += $(CFLAGS_xeninclude) -x86_emulate.o: x86_emulate.c x86_emulate - $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< +x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h + $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< -test_x86_emulator.o: test_x86_emulator.c blowfish.h x86_emulate - $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< +test_x86_emulator.o: test_x86_emulator.c blowfish.h x86_emulate/x86_emulate.h + $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEo8-0006FW-IY; Sat, 21 Sep 2013 04:28:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEo7-0006BY-8y for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:35 +0000 Received: from [193.109.254.147:33614] by server-3.bemta-14.messagelabs.com id 60/C0-11293-2702D325; Sat, 21 Sep 2013 04:28:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1379737712!165674!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8757 invoked from network); 21 Sep 2013 04:28:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEo4-0000Wl-Pk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEo4-00016b-Mq for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:32 +0000 Date: Sat, 21 Sep 2013 04:28:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix dependencies of emulator test X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbad67c5d291a3428bed341909e22953ea0d80df Author: Jan Beulich AuthorDate: Fri Sep 20 11:02:47 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:02:47 2013 +0200 x86: fix dependencies of emulator test Rather than mentioning the (linked) directory, mention the files thus making sure things get rebuild as needed when the core emulator files change. Also enable debug info generation unconditionally, as this is testing stuff only anyway. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/Makefile | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 5d9de9b..73517b7 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -37,14 +37,13 @@ clean: .PHONY: install install: -.PHONY: x86_emulate -x86_emulate: +x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h: [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate . HOSTCFLAGS += $(CFLAGS_xeninclude) -x86_emulate.o: x86_emulate.c x86_emulate - $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< +x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h + $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< -test_x86_emulator.o: test_x86_emulator.c blowfish.h x86_emulate - $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< +test_x86_emulator.o: test_x86_emulator.c blowfish.h x86_emulate/x86_emulate.h + $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoJ-0006Pk-LV; Sat, 21 Sep 2013 04:28:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoI-0006PV-4s for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:46 +0000 Received: from [85.158.137.68:9714] by server-8.bemta-3.messagelabs.com id B3/93-28652-D702D325; Sat, 21 Sep 2013 04:28:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1379737723!3822632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31432 invoked from network); 21 Sep 2013 04:28:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoE-0000Wr-VJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoE-000170-TY for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:42 +0000 Date: Sat, 21 Sep 2013 04:28:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: MOVSXD must read source operand just once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc6c4576616ef9cf62667a5fb315cd984499d51c Author: Jan Beulich AuthorDate: Fri Sep 20 11:03:12 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:03:12 2013 +0200 x86_emulate: MOVSXD must read source operand just once ... for the case of accessing MMIO. Also streamline the ARPL emulation a little, and add tests for both instructions (the MOVSXD one requires a few other adjustments, as we now need to run in a mode where the emulator's mode_64bit() returns true). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/test_x86_emulator.c | 66 ++++++++++++++++++++++++-- xen/arch/x86/x86_emulate/x86_emulate.c | 31 ++++++++---- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..7404ee3 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -21,6 +21,8 @@ #define EFLG_PF (1<<2) #define EFLG_CF (1<<0) +static unsigned int bytes_read; + static int read( unsigned int seg, unsigned long offset, @@ -28,6 +30,18 @@ static int read( unsigned int bytes, struct x86_emulate_ctxt *ctxt) { + bytes_read += bytes; + memcpy(p_data, (void *)offset, bytes); + return X86EMUL_OKAY; +} + +static int fetch( + unsigned int seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; } @@ -140,7 +154,7 @@ int get_fpu( static struct x86_emulate_ops emulops = { .read = read, - .insn_fetch = read, + .insn_fetch = fetch, .write = write, .cmpxchg = cmpxchg, .cpuid = cpuid, @@ -162,8 +176,8 @@ int main(int argc, char **argv) ctxt.regs = ®s; ctxt.force_writeback = 0; - ctxt.addr_size = 32; - ctxt.sp_size = 32; + ctxt.addr_size = 8 * sizeof(void *); + ctxt.sp_size = 8 * sizeof(void *); res = mmap((void *)0x100000, MMAP_SZ, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); @@ -428,6 +442,44 @@ int main(int argc, char **argv) goto fail; printf("okay\n"); +#ifndef __x86_64__ + printf("%-40s", "Testing arpl %cx,(%%eax)..."); + instr[0] = 0x63; instr[1] = 0x08; + regs.eflags = 0x200; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0x22222222; + regs.eax = (unsigned long)res; + *res = 0x33331111; + bytes_read = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (*res != 0x33331112) || + (regs.ecx != 0x22222222) || + !(regs.eflags & EFLG_ZF) || + (regs.eip != (unsigned long)&instr[2]) ) + goto fail; +#else + printf("%-40s", "Testing movsxd (%%rax),%%rcx..."); + instr[0] = 0x48; instr[1] = 0x63; instr[2] = 0x08; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0x123456789abcdef; + regs.eax = (unsigned long)res; + *res = 0xfedcba98; + bytes_read = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (*res != 0xfedcba98) || + (regs.ecx != 0xfffffffffedcba98) || + (regs.eip != (unsigned long)&instr[3]) ) + goto fail; + if ( bytes_read != 4 ) + { + printf("%u bytes read - ", bytes_read); + goto fail; + } +#endif + printf("okay\n"); + printf("%-40s", "Testing xadd %%ax,(%%ecx)..."); instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0xc1; instr[3] = 0x01; regs.eflags = 0x200; @@ -445,7 +497,11 @@ int main(int argc, char **argv) printf("okay\n"); printf("%-40s", "Testing dec %%ax..."); +#ifndef __x86_64__ instr[0] = 0x66; instr[1] = 0x48; +#else + instr[0] = 0x66; instr[1] = 0xff; instr[2] = 0xc8; +#endif regs.eflags = 0x200; regs.eip = (unsigned long)&instr[0]; regs.eax = 0x00000000; @@ -453,7 +509,7 @@ int main(int argc, char **argv) if ( (rc != X86EMUL_OKAY) || (regs.eax != 0x0000ffff) || ((regs.eflags&0x240) != 0x200) || - (regs.eip != (unsigned long)&instr[2]) ) + (regs.eip != (unsigned long)&instr[2 + (ctxt.addr_size > 32)]) ) goto fail; printf("okay\n"); @@ -821,6 +877,8 @@ int main(int argc, char **argv) if ( j == 2 ) break; memcpy(res, blowfish32_code, sizeof(blowfish32_code)); #else + ctxt.addr_size = 16 << j; + ctxt.sp_size = 16 << j; memcpy(res, (j == 1) ? blowfish32_code : blowfish64_code, (j == 1) ? sizeof(blowfish32_code) : sizeof(blowfish64_code)); #endif diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8794b82..e8cde12 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -92,7 +92,7 @@ static uint8_t opcode_table[256] = { ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, /* 0x60 - 0x67 */ - ImplicitOps, ImplicitOps, DstReg|SrcMem|ModRM, DstReg|SrcMem16|ModRM|Mov, + ImplicitOps, ImplicitOps, DstReg|SrcMem|ModRM, DstReg|SrcNone|ModRM|Mov, 0, 0, 0, 0, /* 0x68 - 0x6F */ ImplicitOps|Mov, DstReg|SrcImm|ModRM|Mov, @@ -2021,9 +2021,9 @@ x86_emulate( if ( mode_64bit() ) { /* movsxd */ - if ( src.type == OP_REG ) - src.val = *(int32_t *)src.reg; - else if ( (rc = read_ulong(src.mem.seg, src.mem.off, + if ( ea.type == OP_REG ) + src.val = *ea.reg; + else if ( (rc = read_ulong(ea.mem.seg, ea.mem.off, &src.val, 4, ctxt, ops)) ) goto done; dst.val = (int32_t)src.val; @@ -2031,14 +2031,25 @@ x86_emulate( else { /* arpl */ - uint16_t src_val = dst.val; - dst = src; - _regs.eflags &= ~EFLG_ZF; - _regs.eflags |= ((src_val & 3) > (dst.val & 3)) ? EFLG_ZF : 0; - if ( _regs.eflags & EFLG_ZF ) - dst.val = (dst.val & ~3) | (src_val & 3); + unsigned int src_rpl = dst.val & 3; + + dst = ea; + dst.bytes = 2; + if ( dst.type == OP_REG ) + dst.val = *dst.reg; + else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, + &dst.val, 2, ctxt, ops)) ) + goto done; + if ( src_rpl > (dst.val & 3) ) + { + _regs.eflags |= EFLG_ZF; + dst.val = (dst.val & ~3) | src_rpl; + } else + { + _regs.eflags &= ~EFLG_ZF; dst.type = OP_NONE; + } generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); } break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoJ-0006Pk-LV; Sat, 21 Sep 2013 04:28:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoI-0006PV-4s for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:46 +0000 Received: from [85.158.137.68:9714] by server-8.bemta-3.messagelabs.com id B3/93-28652-D702D325; Sat, 21 Sep 2013 04:28:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1379737723!3822632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31432 invoked from network); 21 Sep 2013 04:28:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoE-0000Wr-VJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoE-000170-TY for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:42 +0000 Date: Sat, 21 Sep 2013 04:28:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: MOVSXD must read source operand just once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc6c4576616ef9cf62667a5fb315cd984499d51c Author: Jan Beulich AuthorDate: Fri Sep 20 11:03:12 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:03:12 2013 +0200 x86_emulate: MOVSXD must read source operand just once ... for the case of accessing MMIO. Also streamline the ARPL emulation a little, and add tests for both instructions (the MOVSXD one requires a few other adjustments, as we now need to run in a mode where the emulator's mode_64bit() returns true). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/test_x86_emulator.c | 66 ++++++++++++++++++++++++-- xen/arch/x86/x86_emulate/x86_emulate.c | 31 ++++++++---- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..7404ee3 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -21,6 +21,8 @@ #define EFLG_PF (1<<2) #define EFLG_CF (1<<0) +static unsigned int bytes_read; + static int read( unsigned int seg, unsigned long offset, @@ -28,6 +30,18 @@ static int read( unsigned int bytes, struct x86_emulate_ctxt *ctxt) { + bytes_read += bytes; + memcpy(p_data, (void *)offset, bytes); + return X86EMUL_OKAY; +} + +static int fetch( + unsigned int seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; } @@ -140,7 +154,7 @@ int get_fpu( static struct x86_emulate_ops emulops = { .read = read, - .insn_fetch = read, + .insn_fetch = fetch, .write = write, .cmpxchg = cmpxchg, .cpuid = cpuid, @@ -162,8 +176,8 @@ int main(int argc, char **argv) ctxt.regs = ®s; ctxt.force_writeback = 0; - ctxt.addr_size = 32; - ctxt.sp_size = 32; + ctxt.addr_size = 8 * sizeof(void *); + ctxt.sp_size = 8 * sizeof(void *); res = mmap((void *)0x100000, MMAP_SZ, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); @@ -428,6 +442,44 @@ int main(int argc, char **argv) goto fail; printf("okay\n"); +#ifndef __x86_64__ + printf("%-40s", "Testing arpl %cx,(%%eax)..."); + instr[0] = 0x63; instr[1] = 0x08; + regs.eflags = 0x200; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0x22222222; + regs.eax = (unsigned long)res; + *res = 0x33331111; + bytes_read = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (*res != 0x33331112) || + (regs.ecx != 0x22222222) || + !(regs.eflags & EFLG_ZF) || + (regs.eip != (unsigned long)&instr[2]) ) + goto fail; +#else + printf("%-40s", "Testing movsxd (%%rax),%%rcx..."); + instr[0] = 0x48; instr[1] = 0x63; instr[2] = 0x08; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = 0x123456789abcdef; + regs.eax = (unsigned long)res; + *res = 0xfedcba98; + bytes_read = 0; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (*res != 0xfedcba98) || + (regs.ecx != 0xfffffffffedcba98) || + (regs.eip != (unsigned long)&instr[3]) ) + goto fail; + if ( bytes_read != 4 ) + { + printf("%u bytes read - ", bytes_read); + goto fail; + } +#endif + printf("okay\n"); + printf("%-40s", "Testing xadd %%ax,(%%ecx)..."); instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0xc1; instr[3] = 0x01; regs.eflags = 0x200; @@ -445,7 +497,11 @@ int main(int argc, char **argv) printf("okay\n"); printf("%-40s", "Testing dec %%ax..."); +#ifndef __x86_64__ instr[0] = 0x66; instr[1] = 0x48; +#else + instr[0] = 0x66; instr[1] = 0xff; instr[2] = 0xc8; +#endif regs.eflags = 0x200; regs.eip = (unsigned long)&instr[0]; regs.eax = 0x00000000; @@ -453,7 +509,7 @@ int main(int argc, char **argv) if ( (rc != X86EMUL_OKAY) || (regs.eax != 0x0000ffff) || ((regs.eflags&0x240) != 0x200) || - (regs.eip != (unsigned long)&instr[2]) ) + (regs.eip != (unsigned long)&instr[2 + (ctxt.addr_size > 32)]) ) goto fail; printf("okay\n"); @@ -821,6 +877,8 @@ int main(int argc, char **argv) if ( j == 2 ) break; memcpy(res, blowfish32_code, sizeof(blowfish32_code)); #else + ctxt.addr_size = 16 << j; + ctxt.sp_size = 16 << j; memcpy(res, (j == 1) ? blowfish32_code : blowfish64_code, (j == 1) ? sizeof(blowfish32_code) : sizeof(blowfish64_code)); #endif diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8794b82..e8cde12 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -92,7 +92,7 @@ static uint8_t opcode_table[256] = { ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps|Mov, /* 0x60 - 0x67 */ - ImplicitOps, ImplicitOps, DstReg|SrcMem|ModRM, DstReg|SrcMem16|ModRM|Mov, + ImplicitOps, ImplicitOps, DstReg|SrcMem|ModRM, DstReg|SrcNone|ModRM|Mov, 0, 0, 0, 0, /* 0x68 - 0x6F */ ImplicitOps|Mov, DstReg|SrcImm|ModRM|Mov, @@ -2021,9 +2021,9 @@ x86_emulate( if ( mode_64bit() ) { /* movsxd */ - if ( src.type == OP_REG ) - src.val = *(int32_t *)src.reg; - else if ( (rc = read_ulong(src.mem.seg, src.mem.off, + if ( ea.type == OP_REG ) + src.val = *ea.reg; + else if ( (rc = read_ulong(ea.mem.seg, ea.mem.off, &src.val, 4, ctxt, ops)) ) goto done; dst.val = (int32_t)src.val; @@ -2031,14 +2031,25 @@ x86_emulate( else { /* arpl */ - uint16_t src_val = dst.val; - dst = src; - _regs.eflags &= ~EFLG_ZF; - _regs.eflags |= ((src_val & 3) > (dst.val & 3)) ? EFLG_ZF : 0; - if ( _regs.eflags & EFLG_ZF ) - dst.val = (dst.val & ~3) | (src_val & 3); + unsigned int src_rpl = dst.val & 3; + + dst = ea; + dst.bytes = 2; + if ( dst.type == OP_REG ) + dst.val = *dst.reg; + else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, + &dst.val, 2, ctxt, ops)) ) + goto done; + if ( src_rpl > (dst.val & 3) ) + { + _regs.eflags |= EFLG_ZF; + dst.val = (dst.val & ~3) | src_rpl; + } else + { + _regs.eflags &= ~EFLG_ZF; dst.type = OP_NONE; + } generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); } break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEoT-0006Rk-Qd; Sat, 21 Sep 2013 04:28:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoS-0006RN-GJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:56 +0000 Received: from [85.158.143.35:59421] by server-1.bemta-4.messagelabs.com id 40/4B-16125-7802D325; Sat, 21 Sep 2013 04:28:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379737733!5713175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18532 invoked from network); 21 Sep 2013 04:28:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoP-0000X0-5b for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoP-00017M-3v for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:53 +0000 Date: Sat, 21 Sep 2013 04:28:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: PUSH must read source operand just once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86781624f8df1d50eb4185cfc2ddce926798f7aa Author: Jan Beulich AuthorDate: Fri Sep 20 11:03:53 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:03:53 2013 +0200 x86_emulate: PUSH must read source operand just once ... for the case of accessing MMIO. Rather than doing the early operand type adjustment for just for that case, do it for all of the 0xF6, 0xF7, and 0xFF groups (allowing some other code to be dropped instead). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 94 ++++++++++++++++---------------- 1 files changed, 48 insertions(+), 46 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e8cde12..b4a24c8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1632,6 +1632,41 @@ x86_emulate( if ( override_seg != -1 ) ea.mem.seg = override_seg; + /* Early operand adjustments. */ + if ( !twobyte ) + switch ( b ) + { + case 0xf6 ... 0xf7: /* Grp3 */ + switch ( modrm_reg & 7 ) + { + case 0 ... 1: /* test */ + d = (d & ~SrcMask) | SrcImm; + break; + case 4: /* mul */ + case 5: /* imul */ + case 6: /* div */ + case 7: /* idiv */ + d = (d & (ByteOp | ModRM)) | DstImplicit | SrcMem; + break; + } + break; + case 0xff: /* Grp5 */ + switch ( modrm_reg & 7 ) + { + case 2: /* call (near) */ + case 4: /* jmp (near) */ + case 6: /* push */ + if ( mode_64bit() && op_bytes == 4 ) + op_bytes = 8; + /* fall through */ + case 3: /* call (far, absolute indirect) */ + case 5: /* jmp (far, absolute indirect) */ + d = DstNone|SrcMem|ModRM; + break; + } + break; + } + /* Decode and fetch the source operand: register, memory or immediate. */ switch ( d & SrcMask ) { @@ -3318,16 +3353,6 @@ x86_emulate( switch ( modrm_reg & 7 ) { case 0 ... 1: /* test */ - /* Special case in Grp3: test has an immediate source operand. */ - src.type = OP_IMM; - src.bytes = (d & ByteOp) ? 1 : op_bytes; - if ( src.bytes == 8 ) src.bytes = 4; - switch ( src.bytes ) - { - case 1: src.val = insn_fetch_type(int8_t); break; - case 2: src.val = insn_fetch_type(int16_t); break; - case 4: src.val = insn_fetch_type(int32_t); break; - } goto test; case 2: /* not */ dst.val = ~dst.val; @@ -3336,12 +3361,11 @@ x86_emulate( emulate_1op("neg", dst, _regs.eflags); break; case 4: /* mul */ - src = dst; dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: dst.val = (uint8_t)dst.val; @@ -3377,12 +3401,11 @@ x86_emulate( } break; case 5: /* imul */ - src = dst; dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: dst.val = ((uint16_t)(int8_t)src.val * @@ -3419,10 +3442,10 @@ x86_emulate( break; case 6: /* div */ { unsigned long u[2], v; - src = dst; + dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: u[0] = (uint16_t)_regs.eax; @@ -3469,10 +3492,10 @@ x86_emulate( } case 7: /* idiv */ { unsigned long u[2], v; - src = dst; + dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: u[0] = (int16_t)_regs.eax; @@ -3564,20 +3587,13 @@ x86_emulate( emulate_1op("dec", dst, _regs.eflags); break; case 2: /* call (near) */ + dst.val = _regs.eip; + _regs.eip = src.val; + src.val = dst.val; + goto push; + break; case 4: /* jmp (near) */ - if ( (dst.bytes == 4) && mode_64bit() ) - { - dst.bytes = op_bytes = 8; - if ( dst.type == OP_REG ) - dst.val = *dst.reg; - else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, - &dst.val, 8, ctxt, ops)) != 0 ) - goto done; - } - src.val = _regs.eip; - _regs.eip = dst.val; - if ( (modrm_reg & 7) == 2 ) - goto push; /* call */ + _regs.eip = src.val; dst.type = OP_NONE; break; case 3: /* call (far, absolute indirect) */ @@ -3610,21 +3626,7 @@ x86_emulate( break; } case 6: /* push */ - /* 64-bit mode: PUSH defaults to a 64-bit operand. */ - if ( mode_64bit() && (dst.bytes == 4) ) - { - dst.bytes = 8; - if ( dst.type == OP_REG ) - dst.val = *dst.reg; - else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, - &dst.val, 8, ctxt, ops)) != 0 ) - goto done; - } - if ( (rc = ops->write(x86_seg_ss, sp_pre_dec(dst.bytes), - &dst.val, dst.bytes, ctxt)) != 0 ) - goto done; - dst.type = OP_NONE; - break; + goto push; case 7: generate_exception_if(1, EXC_UD, -1); default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:28:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:28: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 1VNEoT-0006Rk-Qd; Sat, 21 Sep 2013 04:28:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoS-0006RN-GJ for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:56 +0000 Received: from [85.158.143.35:59421] by server-1.bemta-4.messagelabs.com id 40/4B-16125-7802D325; Sat, 21 Sep 2013 04:28:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379737733!5713175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18532 invoked from network); 21 Sep 2013 04:28:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:28:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoP-0000X0-5b for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoP-00017M-3v for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:28:53 +0000 Date: Sat, 21 Sep 2013 04:28:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: PUSH must read source operand just once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86781624f8df1d50eb4185cfc2ddce926798f7aa Author: Jan Beulich AuthorDate: Fri Sep 20 11:03:53 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:03:53 2013 +0200 x86_emulate: PUSH must read source operand just once ... for the case of accessing MMIO. Rather than doing the early operand type adjustment for just for that case, do it for all of the 0xF6, 0xF7, and 0xFF groups (allowing some other code to be dropped instead). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 94 ++++++++++++++++---------------- 1 files changed, 48 insertions(+), 46 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e8cde12..b4a24c8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1632,6 +1632,41 @@ x86_emulate( if ( override_seg != -1 ) ea.mem.seg = override_seg; + /* Early operand adjustments. */ + if ( !twobyte ) + switch ( b ) + { + case 0xf6 ... 0xf7: /* Grp3 */ + switch ( modrm_reg & 7 ) + { + case 0 ... 1: /* test */ + d = (d & ~SrcMask) | SrcImm; + break; + case 4: /* mul */ + case 5: /* imul */ + case 6: /* div */ + case 7: /* idiv */ + d = (d & (ByteOp | ModRM)) | DstImplicit | SrcMem; + break; + } + break; + case 0xff: /* Grp5 */ + switch ( modrm_reg & 7 ) + { + case 2: /* call (near) */ + case 4: /* jmp (near) */ + case 6: /* push */ + if ( mode_64bit() && op_bytes == 4 ) + op_bytes = 8; + /* fall through */ + case 3: /* call (far, absolute indirect) */ + case 5: /* jmp (far, absolute indirect) */ + d = DstNone|SrcMem|ModRM; + break; + } + break; + } + /* Decode and fetch the source operand: register, memory or immediate. */ switch ( d & SrcMask ) { @@ -3318,16 +3353,6 @@ x86_emulate( switch ( modrm_reg & 7 ) { case 0 ... 1: /* test */ - /* Special case in Grp3: test has an immediate source operand. */ - src.type = OP_IMM; - src.bytes = (d & ByteOp) ? 1 : op_bytes; - if ( src.bytes == 8 ) src.bytes = 4; - switch ( src.bytes ) - { - case 1: src.val = insn_fetch_type(int8_t); break; - case 2: src.val = insn_fetch_type(int16_t); break; - case 4: src.val = insn_fetch_type(int32_t); break; - } goto test; case 2: /* not */ dst.val = ~dst.val; @@ -3336,12 +3361,11 @@ x86_emulate( emulate_1op("neg", dst, _regs.eflags); break; case 4: /* mul */ - src = dst; dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: dst.val = (uint8_t)dst.val; @@ -3377,12 +3401,11 @@ x86_emulate( } break; case 5: /* imul */ - src = dst; dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: dst.val = ((uint16_t)(int8_t)src.val * @@ -3419,10 +3442,10 @@ x86_emulate( break; case 6: /* div */ { unsigned long u[2], v; - src = dst; + dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: u[0] = (uint16_t)_regs.eax; @@ -3469,10 +3492,10 @@ x86_emulate( } case 7: /* idiv */ { unsigned long u[2], v; - src = dst; + dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; - switch ( src.bytes ) + switch ( dst.bytes = src.bytes ) { case 1: u[0] = (int16_t)_regs.eax; @@ -3564,20 +3587,13 @@ x86_emulate( emulate_1op("dec", dst, _regs.eflags); break; case 2: /* call (near) */ + dst.val = _regs.eip; + _regs.eip = src.val; + src.val = dst.val; + goto push; + break; case 4: /* jmp (near) */ - if ( (dst.bytes == 4) && mode_64bit() ) - { - dst.bytes = op_bytes = 8; - if ( dst.type == OP_REG ) - dst.val = *dst.reg; - else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, - &dst.val, 8, ctxt, ops)) != 0 ) - goto done; - } - src.val = _regs.eip; - _regs.eip = dst.val; - if ( (modrm_reg & 7) == 2 ) - goto push; /* call */ + _regs.eip = src.val; dst.type = OP_NONE; break; case 3: /* call (far, absolute indirect) */ @@ -3610,21 +3626,7 @@ x86_emulate( break; } case 6: /* push */ - /* 64-bit mode: PUSH defaults to a 64-bit operand. */ - if ( mode_64bit() && (dst.bytes == 4) ) - { - dst.bytes = 8; - if ( dst.type == OP_REG ) - dst.val = *dst.reg; - else if ( (rc = read_ulong(dst.mem.seg, dst.mem.off, - &dst.val, 8, ctxt, ops)) != 0 ) - goto done; - } - if ( (rc = ops->write(x86_seg_ss, sp_pre_dec(dst.bytes), - &dst.val, dst.bytes, ctxt)) != 0 ) - goto done; - dst.type = OP_NONE; - break; + goto push; case 7: generate_exception_if(1, EXC_UD, -1); default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoc-0006Ta-Tr; Sat, 21 Sep 2013 04:29:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEob-0006TF-TT for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:06 +0000 Received: from [85.158.143.35:59651] by server-2.bemta-4.messagelabs.com id 66/B1-26052-1902D325; Sat, 21 Sep 2013 04:29:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379737743!1309624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28334 invoked from network); 21 Sep 2013 04:29:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoZ-0000XZ-CB for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoZ-00017s-AV for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:03 +0000 Date: Sat, 21 Sep 2013 04:29:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fix flag setting for 8-bit signed multiplication X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3abe8efb431d171e824f593615ad4a8efbdbbcf1 Author: Jan Beulich AuthorDate: Fri Sep 20 11:04:52 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:04:52 2013 +0200 x86_emulate: fix flag setting for 8-bit signed multiplication We really need to check for a signed overflow of 8 bits, while the previous check compared the sign-extended 8-bit result with the zero-extended 16-bit one (which was wrong for all negative results). Once at it - also adjust the 16-bit comparison for symmetry - improve the 8-bit multiplication (no need to zero-extend to 32-bits the sign-extended to 16 bits original 8-bit value) - fold both signed multiplication variants Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/x86_emulate.c | 2 + xen/arch/x86/x86_emulate/x86_emulate.c | 56 ++++++++++---------------------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index f18f615..b157ade 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -8,6 +9,7 @@ typedef bool bool_t; #define BUG() abort() +#define ASSERT assert #define cpu_has_amd_erratum(nr) 0 #define mark_regs_dirty(r) ((void)(r)) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b4a24c8..d3023de 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2096,40 +2096,13 @@ x86_emulate( goto push; case 0x69: /* imul imm16/32 */ - case 0x6b: /* imul imm8 */ { - unsigned long src1; /* ModR/M source operand */ + case 0x6b: /* imul imm8 */ if ( ea.type == OP_REG ) - src1 = *ea.reg; + dst.val = *ea.reg; else if ( (rc = read_ulong(ea.mem.seg, ea.mem.off, - &src1, op_bytes, ctxt, ops)) ) + &dst.val, op_bytes, ctxt, ops)) ) goto done; - _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( dst.bytes ) - { - case 2: - dst.val = ((uint32_t)(int16_t)src.val * - (uint32_t)(int16_t)src1); - if ( (int16_t)dst.val != (uint32_t)dst.val ) - _regs.eflags |= EFLG_OF|EFLG_CF; - break; -#ifdef __x86_64__ - case 4: - dst.val = ((uint64_t)(int32_t)src.val * - (uint64_t)(int32_t)src1); - if ( (int32_t)dst.val != dst.val ) - _regs.eflags |= EFLG_OF|EFLG_CF; - break; -#endif - default: { - unsigned long m[2] = { src.val, src1 }; - if ( imul_dbl(m) ) - _regs.eflags |= EFLG_OF|EFLG_CF; - dst.val = m[0]; - break; - } - } - break; - } + goto imul; case 0x6a: /* push imm8 */ src.val = insn_fetch_type(int8_t); @@ -3404,22 +3377,25 @@ x86_emulate( dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; + dst.bytes = src.bytes; + imul: _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( dst.bytes = src.bytes ) + switch ( dst.bytes ) { case 1: - dst.val = ((uint16_t)(int8_t)src.val * - (uint16_t)(int8_t)dst.val); - if ( (int8_t)dst.val != (uint16_t)dst.val ) + dst.val = (int8_t)src.val * (int8_t)dst.val; + if ( (int8_t)dst.val != (int16_t)dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; + ASSERT(b > 0x6b); dst.bytes = 2; break; case 2: dst.val = ((uint32_t)(int16_t)src.val * (uint32_t)(int16_t)dst.val); - if ( (int16_t)dst.val != (uint32_t)dst.val ) + if ( (int16_t)dst.val != (int32_t)dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; - *(uint16_t *)&_regs.edx = dst.val >> 16; + if ( b > 0x6b ) + *(uint16_t *)&_regs.edx = dst.val >> 16; break; #ifdef __x86_64__ case 4: @@ -3427,14 +3403,16 @@ x86_emulate( (uint64_t)(int32_t)dst.val); if ( (int32_t)dst.val != dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; - _regs.edx = (uint32_t)(dst.val >> 32); + if ( b > 0x6b ) + _regs.edx = (uint32_t)(dst.val >> 32); break; #endif default: { unsigned long m[2] = { src.val, dst.val }; if ( imul_dbl(m) ) _regs.eflags |= EFLG_OF|EFLG_CF; - _regs.edx = m[1]; + if ( b > 0x6b ) + _regs.edx = m[1]; dst.val = m[0]; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoc-0006Ta-Tr; Sat, 21 Sep 2013 04:29:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEob-0006TF-TT for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:06 +0000 Received: from [85.158.143.35:59651] by server-2.bemta-4.messagelabs.com id 66/B1-26052-1902D325; Sat, 21 Sep 2013 04:29:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1379737743!1309624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28334 invoked from network); 21 Sep 2013 04:29:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoZ-0000XZ-CB for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoZ-00017s-AV for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:03 +0000 Date: Sat, 21 Sep 2013 04:29:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fix flag setting for 8-bit signed multiplication X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3abe8efb431d171e824f593615ad4a8efbdbbcf1 Author: Jan Beulich AuthorDate: Fri Sep 20 11:04:52 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:04:52 2013 +0200 x86_emulate: fix flag setting for 8-bit signed multiplication We really need to check for a signed overflow of 8 bits, while the previous check compared the sign-extended 8-bit result with the zero-extended 16-bit one (which was wrong for all negative results). Once at it - also adjust the 16-bit comparison for symmetry - improve the 8-bit multiplication (no need to zero-extend to 32-bits the sign-extended to 16 bits original 8-bit value) - fold both signed multiplication variants Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- tools/tests/x86_emulator/x86_emulate.c | 2 + xen/arch/x86/x86_emulate/x86_emulate.c | 56 ++++++++++---------------------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index f18f615..b157ade 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -8,6 +9,7 @@ typedef bool bool_t; #define BUG() abort() +#define ASSERT assert #define cpu_has_amd_erratum(nr) 0 #define mark_regs_dirty(r) ((void)(r)) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b4a24c8..d3023de 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2096,40 +2096,13 @@ x86_emulate( goto push; case 0x69: /* imul imm16/32 */ - case 0x6b: /* imul imm8 */ { - unsigned long src1; /* ModR/M source operand */ + case 0x6b: /* imul imm8 */ if ( ea.type == OP_REG ) - src1 = *ea.reg; + dst.val = *ea.reg; else if ( (rc = read_ulong(ea.mem.seg, ea.mem.off, - &src1, op_bytes, ctxt, ops)) ) + &dst.val, op_bytes, ctxt, ops)) ) goto done; - _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( dst.bytes ) - { - case 2: - dst.val = ((uint32_t)(int16_t)src.val * - (uint32_t)(int16_t)src1); - if ( (int16_t)dst.val != (uint32_t)dst.val ) - _regs.eflags |= EFLG_OF|EFLG_CF; - break; -#ifdef __x86_64__ - case 4: - dst.val = ((uint64_t)(int32_t)src.val * - (uint64_t)(int32_t)src1); - if ( (int32_t)dst.val != dst.val ) - _regs.eflags |= EFLG_OF|EFLG_CF; - break; -#endif - default: { - unsigned long m[2] = { src.val, src1 }; - if ( imul_dbl(m) ) - _regs.eflags |= EFLG_OF|EFLG_CF; - dst.val = m[0]; - break; - } - } - break; - } + goto imul; case 0x6a: /* push imm8 */ src.val = insn_fetch_type(int8_t); @@ -3404,22 +3377,25 @@ x86_emulate( dst.type = OP_REG; dst.reg = (unsigned long *)&_regs.eax; dst.val = *dst.reg; + dst.bytes = src.bytes; + imul: _regs.eflags &= ~(EFLG_OF|EFLG_CF); - switch ( dst.bytes = src.bytes ) + switch ( dst.bytes ) { case 1: - dst.val = ((uint16_t)(int8_t)src.val * - (uint16_t)(int8_t)dst.val); - if ( (int8_t)dst.val != (uint16_t)dst.val ) + dst.val = (int8_t)src.val * (int8_t)dst.val; + if ( (int8_t)dst.val != (int16_t)dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; + ASSERT(b > 0x6b); dst.bytes = 2; break; case 2: dst.val = ((uint32_t)(int16_t)src.val * (uint32_t)(int16_t)dst.val); - if ( (int16_t)dst.val != (uint32_t)dst.val ) + if ( (int16_t)dst.val != (int32_t)dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; - *(uint16_t *)&_regs.edx = dst.val >> 16; + if ( b > 0x6b ) + *(uint16_t *)&_regs.edx = dst.val >> 16; break; #ifdef __x86_64__ case 4: @@ -3427,14 +3403,16 @@ x86_emulate( (uint64_t)(int32_t)dst.val); if ( (int32_t)dst.val != dst.val ) _regs.eflags |= EFLG_OF|EFLG_CF; - _regs.edx = (uint32_t)(dst.val >> 32); + if ( b > 0x6b ) + _regs.edx = (uint32_t)(dst.val >> 32); break; #endif default: { unsigned long m[2] = { src.val, dst.val }; if ( imul_dbl(m) ) _regs.eflags |= EFLG_OF|EFLG_CF; - _regs.edx = m[1]; + if ( b > 0x6b ) + _regs.edx = m[1]; dst.val = m[0]; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29: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 1VNEon-0006VK-0s; Sat, 21 Sep 2013 04:29:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEom-0006V5-6R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:16 +0000 Received: from [85.158.143.35:59875] by server-2.bemta-4.messagelabs.com id AC/B1-26052-B902D325; Sat, 21 Sep 2013 04:29:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1379737753!595555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10588 invoked from network); 21 Sep 2013 04:29:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoj-0000Xf-Lf for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoj-00018G-Gm for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:13 +0000 Date: Sat, 21 Sep 2013 04:29:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fold wide reads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba6059b08219ec841fac95e1a4d067dd1d22f08f Author: Jan Beulich AuthorDate: Fri Sep 20 11:05:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:05:28 2013 +0200 x86_emulate: fold wide reads With HVM's MMIO operand handling now being capable of splitting large reads, there's no need to issue at most machine word size reads when we really need wider operands. Not that this is not done everywhere - there are a couple of cases where keeping the reads separate is more natural (and folding them would complicate the code rather than simplifying it). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index d3023de..473500e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1116,7 +1116,6 @@ protmode_load_seg( { struct segment_register desctab, ss, segr; struct { uint32_t a, b; } desc; - unsigned long val; uint8_t dpl, rpl, cpl; uint32_t new_desc_b, a_flag = 0x100; int rc, fault_type = EXC_GP; @@ -1143,14 +1142,9 @@ protmode_load_seg( if ( ((sel & 0xfff8) + 7) > desctab.limit ) goto raise_exn; - if ( (rc = read_ulong(x86_seg_none, desctab.base + (sel & 0xfff8), - &val, 4, ctxt, ops)) ) + if ( (rc = ops->read(x86_seg_none, desctab.base + (sel & 0xfff8), + &desc, sizeof(desc), ctxt)) ) return rc; - desc.a = val; - if ( (rc = read_ulong(x86_seg_none, desctab.base + (sel & 0xfff8) + 4, - &val, 4, ctxt, ops)) ) - return rc; - desc.b = val; /* Segment present in memory? */ if ( !(desc.b & (1u<<15)) ) @@ -4454,7 +4448,6 @@ x86_emulate( case 0xc7: /* Grp9 (cmpxchg8b/cmpxchg16b) */ { unsigned long old[2], exp[2], new[2]; - unsigned int i; generate_exception_if((modrm_reg & 7) != 1, EXC_UD, -1); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); @@ -4463,10 +4456,9 @@ x86_emulate( op_bytes *= 2; /* Get actual old value. */ - for ( i = 0; i < (op_bytes/sizeof(long)); i++ ) - if ( (rc = read_ulong(ea.mem.seg, ea.mem.off + i*sizeof(long), - &old[i], sizeof(long), ctxt, ops)) != 0 ) - goto done; + if ( (rc = ops->read(ea.mem.seg, ea.mem.off, old, op_bytes, + ctxt)) != 0 ) + goto done; /* Get expected and proposed values. */ if ( op_bytes == 8 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29: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 1VNEon-0006VK-0s; Sat, 21 Sep 2013 04:29:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEom-0006V5-6R for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:16 +0000 Received: from [85.158.143.35:59875] by server-2.bemta-4.messagelabs.com id AC/B1-26052-B902D325; Sat, 21 Sep 2013 04:29:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1379737753!595555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10588 invoked from network); 21 Sep 2013 04:29:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEoj-0000Xf-Lf for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEoj-00018G-Gm for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:13 +0000 Date: Sat, 21 Sep 2013 04:29:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fold wide reads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba6059b08219ec841fac95e1a4d067dd1d22f08f Author: Jan Beulich AuthorDate: Fri Sep 20 11:05:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:05:28 2013 +0200 x86_emulate: fold wide reads With HVM's MMIO operand handling now being capable of splitting large reads, there's no need to issue at most machine word size reads when we really need wider operands. Not that this is not done everywhere - there are a couple of cases where keeping the reads separate is more natural (and folding them would complicate the code rather than simplifying it). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index d3023de..473500e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1116,7 +1116,6 @@ protmode_load_seg( { struct segment_register desctab, ss, segr; struct { uint32_t a, b; } desc; - unsigned long val; uint8_t dpl, rpl, cpl; uint32_t new_desc_b, a_flag = 0x100; int rc, fault_type = EXC_GP; @@ -1143,14 +1142,9 @@ protmode_load_seg( if ( ((sel & 0xfff8) + 7) > desctab.limit ) goto raise_exn; - if ( (rc = read_ulong(x86_seg_none, desctab.base + (sel & 0xfff8), - &val, 4, ctxt, ops)) ) + if ( (rc = ops->read(x86_seg_none, desctab.base + (sel & 0xfff8), + &desc, sizeof(desc), ctxt)) ) return rc; - desc.a = val; - if ( (rc = read_ulong(x86_seg_none, desctab.base + (sel & 0xfff8) + 4, - &val, 4, ctxt, ops)) ) - return rc; - desc.b = val; /* Segment present in memory? */ if ( !(desc.b & (1u<<15)) ) @@ -4454,7 +4448,6 @@ x86_emulate( case 0xc7: /* Grp9 (cmpxchg8b/cmpxchg16b) */ { unsigned long old[2], exp[2], new[2]; - unsigned int i; generate_exception_if((modrm_reg & 7) != 1, EXC_UD, -1); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); @@ -4463,10 +4456,9 @@ x86_emulate( op_bytes *= 2; /* Get actual old value. */ - for ( i = 0; i < (op_bytes/sizeof(long)); i++ ) - if ( (rc = read_ulong(ea.mem.seg, ea.mem.off + i*sizeof(long), - &old[i], sizeof(long), ctxt, ops)) != 0 ) - goto done; + if ( (rc = ops->read(ea.mem.seg, ea.mem.off, old, op_bytes, + ctxt)) != 0 ) + goto done; /* Get expected and proposed values. */ if ( op_bytes == 8 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29: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 1VNEoy-0006XV-4B; Sat, 21 Sep 2013 04:29:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEow-0006X9-Lg for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:26 +0000 Received: from [85.158.143.35:60128] by server-2.bemta-4.messagelabs.com id 32/C1-26052-5A02D325; Sat, 21 Sep 2013 04:29:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379737764!726937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20779 invoked from network); 21 Sep 2013 04:29:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEot-0000Xl-Ru for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEot-00019L-Ps for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:23 +0000 Date: Sat, 21 Sep 2013 04:29:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_credit: filter node-affinity mask against online cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e5a44b6c942d6ea47f15d6f1ed02b03e0d69445 Author: Dario Faggioli AuthorDate: Fri Sep 20 11:37:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:37:28 2013 +0200 sched_credit: filter node-affinity mask against online cpus in _csched_cpu_pick(), as not doing so may result in the domain's node-affinity mask (as retrieved by csched_balance_cpumask() ) and online mask (as retrieved by cpupool_scheduler_cpumask() ) having an empty intersection. Therefore, when attempting a node-affinity load balancing step and running this: ... /* Pick an online CPU from the proper affinity mask */ csched_balance_cpumask(vc, balance_step, &cpus); cpumask_and(&cpus, &cpus, online); ... we end up with an empty cpumask (in cpus). At this point, in the following code: .... /* If present, prefer vc's current processor */ cpu = cpumask_test_cpu(vc->processor, &cpus) ? vc->processor : cpumask_cycle(vc->processor, &cpus); .... an ASSERT (from inside cpumask_cycle() ) triggers like this: (XEN) Xen call trace: (XEN) [] _csched_cpu_pick+0x1d2/0x652 (XEN) [] csched_cpu_pick+0xe/0x10 (XEN) [] vcpu_migrate+0x167/0x31e (XEN) [] cpu_disable_scheduler+0x1c8/0x287 (XEN) [] cpupool_unassign_cpu_helper+0x20/0xb4 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5f/0x8b (XEN) [] idle_loop+0x57/0x5e (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 1: (XEN) Assertion 'cpu < nr_cpu_ids' failed at /home/dario/Sources/xen/xen/xen.git/xen/include/xe:16481 It is for example sufficient to have a domain with node-affinity to NUMA node 1 running, and issueing a `xl cpupool-numa-split' would make the above happen. That is because, by default, all the existing domains remain assigned to the first cpupool, and it now (after the cpupool-numa-split) only includes NUMA node 0. This change prevents that by generalizing the function used for figuring out whether a node-affinity load balancing step is legit or not. This way we can, in _csched_cpu_pick(), figure out early enough that the mask would end up empty, skip the step all together and avoid the splat. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit.c | 57 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index dbe6de6..3d6ea7a 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -296,15 +296,28 @@ static void csched_set_node_affinity( * vcpu-affinity balancing is always necessary and must never be skipped. * OTOH, if a domain's node-affinity is said to be automatically computed * (or if it just spans all the nodes), we can safely avoid dealing with - * node-affinity entirely. Ah, node-affinity is also deemed meaningless - * in case it has empty intersection with the vcpu's vcpu-affinity, as it - * would mean trying to schedule it on _no_ pcpu! + * node-affinity entirely. + * + * Node-affinity is also deemed meaningless in case it has empty + * intersection with mask, to cover the cases where using the node-affinity + * mask seems legit, but would instead led to trying to schedule the vcpu + * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's + * vcpu-affinity, or to the && of vcpu-affinity and the set of online cpus + * in the domain's cpupool. */ -#define __vcpu_has_node_affinity(vc) \ - ( !(cpumask_full(CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || !cpumask_intersects(vc->cpu_affinity, \ - CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || vc->domain->auto_node_affinity == 1) ) +static inline int __vcpu_has_node_affinity(const struct vcpu *vc, + const cpumask_t *mask) +{ + const struct domain *d = vc->domain; + const struct csched_dom *sdom = CSCHED_DOM(d); + + if ( d->auto_node_affinity + || cpumask_full(sdom->node_affinity_cpumask) + || !cpumask_intersects(sdom->node_affinity_cpumask, mask) ) + return 0; + + return 1; +} /* * Each csched-balance step uses its own cpumask. This function determines @@ -393,7 +406,8 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) int new_idlers_empty; if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(new->vcpu) ) + && !__vcpu_has_node_affinity(new->vcpu, + new->vcpu->cpu_affinity) ) continue; /* Are there idlers suitable for new (for this balance step)? */ @@ -626,11 +640,32 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) int cpu = vc->processor; int balance_step; + /* Store in cpus the mask of online cpus on which the domain can run */ online = cpupool_scheduler_cpumask(vc->domain->cpupool); + cpumask_and(&cpus, vc->cpu_affinity, online); + for_each_csched_balance_step( balance_step ) { + /* + * We want to pick up a pcpu among the ones that are online and + * can accommodate vc, which is basically what we computed above + * and stored in cpus. As far as vcpu-affinity is concerned, + * there always will be at least one of these pcpus, hence cpus + * is never empty and the calls to cpumask_cycle() and + * cpumask_test_cpu() below are ok. + * + * On the other hand, when considering node-affinity too, it + * is possible for the mask to become empty (for instance, if the + * domain has been put in a cpupool that does not contain any of the + * nodes in its node-affinity), which would result in the ASSERT()-s + * inside cpumask_*() operations triggering (in debug builds). + * + * Therefore, in this case, we filter the node-affinity mask against + * cpus and, if the result is empty, we just skip the node-affinity + * balancing step all together. + */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, &cpus) ) continue; /* Pick an online CPU from the proper affinity mask */ @@ -1445,7 +1480,7 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) * or counter. */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, vc->cpu_affinity) ) continue; csched_balance_cpumask(vc, balance_step, csched_balance_mask); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29: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 1VNEoy-0006XV-4B; Sat, 21 Sep 2013 04:29:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEow-0006X9-Lg for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:26 +0000 Received: from [85.158.143.35:60128] by server-2.bemta-4.messagelabs.com id 32/C1-26052-5A02D325; Sat, 21 Sep 2013 04:29:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1379737764!726937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20779 invoked from network); 21 Sep 2013 04:29:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEot-0000Xl-Ru for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEot-00019L-Ps for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:23 +0000 Date: Sat, 21 Sep 2013 04:29:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_credit: filter node-affinity mask against online cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e5a44b6c942d6ea47f15d6f1ed02b03e0d69445 Author: Dario Faggioli AuthorDate: Fri Sep 20 11:37:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:37:28 2013 +0200 sched_credit: filter node-affinity mask against online cpus in _csched_cpu_pick(), as not doing so may result in the domain's node-affinity mask (as retrieved by csched_balance_cpumask() ) and online mask (as retrieved by cpupool_scheduler_cpumask() ) having an empty intersection. Therefore, when attempting a node-affinity load balancing step and running this: ... /* Pick an online CPU from the proper affinity mask */ csched_balance_cpumask(vc, balance_step, &cpus); cpumask_and(&cpus, &cpus, online); ... we end up with an empty cpumask (in cpus). At this point, in the following code: .... /* If present, prefer vc's current processor */ cpu = cpumask_test_cpu(vc->processor, &cpus) ? vc->processor : cpumask_cycle(vc->processor, &cpus); .... an ASSERT (from inside cpumask_cycle() ) triggers like this: (XEN) Xen call trace: (XEN) [] _csched_cpu_pick+0x1d2/0x652 (XEN) [] csched_cpu_pick+0xe/0x10 (XEN) [] vcpu_migrate+0x167/0x31e (XEN) [] cpu_disable_scheduler+0x1c8/0x287 (XEN) [] cpupool_unassign_cpu_helper+0x20/0xb4 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5f/0x8b (XEN) [] idle_loop+0x57/0x5e (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 1: (XEN) Assertion 'cpu < nr_cpu_ids' failed at /home/dario/Sources/xen/xen/xen.git/xen/include/xe:16481 It is for example sufficient to have a domain with node-affinity to NUMA node 1 running, and issueing a `xl cpupool-numa-split' would make the above happen. That is because, by default, all the existing domains remain assigned to the first cpupool, and it now (after the cpupool-numa-split) only includes NUMA node 0. This change prevents that by generalizing the function used for figuring out whether a node-affinity load balancing step is legit or not. This way we can, in _csched_cpu_pick(), figure out early enough that the mask would end up empty, skip the step all together and avoid the splat. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit.c | 57 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index dbe6de6..3d6ea7a 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -296,15 +296,28 @@ static void csched_set_node_affinity( * vcpu-affinity balancing is always necessary and must never be skipped. * OTOH, if a domain's node-affinity is said to be automatically computed * (or if it just spans all the nodes), we can safely avoid dealing with - * node-affinity entirely. Ah, node-affinity is also deemed meaningless - * in case it has empty intersection with the vcpu's vcpu-affinity, as it - * would mean trying to schedule it on _no_ pcpu! + * node-affinity entirely. + * + * Node-affinity is also deemed meaningless in case it has empty + * intersection with mask, to cover the cases where using the node-affinity + * mask seems legit, but would instead led to trying to schedule the vcpu + * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's + * vcpu-affinity, or to the && of vcpu-affinity and the set of online cpus + * in the domain's cpupool. */ -#define __vcpu_has_node_affinity(vc) \ - ( !(cpumask_full(CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || !cpumask_intersects(vc->cpu_affinity, \ - CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || vc->domain->auto_node_affinity == 1) ) +static inline int __vcpu_has_node_affinity(const struct vcpu *vc, + const cpumask_t *mask) +{ + const struct domain *d = vc->domain; + const struct csched_dom *sdom = CSCHED_DOM(d); + + if ( d->auto_node_affinity + || cpumask_full(sdom->node_affinity_cpumask) + || !cpumask_intersects(sdom->node_affinity_cpumask, mask) ) + return 0; + + return 1; +} /* * Each csched-balance step uses its own cpumask. This function determines @@ -393,7 +406,8 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) int new_idlers_empty; if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(new->vcpu) ) + && !__vcpu_has_node_affinity(new->vcpu, + new->vcpu->cpu_affinity) ) continue; /* Are there idlers suitable for new (for this balance step)? */ @@ -626,11 +640,32 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) int cpu = vc->processor; int balance_step; + /* Store in cpus the mask of online cpus on which the domain can run */ online = cpupool_scheduler_cpumask(vc->domain->cpupool); + cpumask_and(&cpus, vc->cpu_affinity, online); + for_each_csched_balance_step( balance_step ) { + /* + * We want to pick up a pcpu among the ones that are online and + * can accommodate vc, which is basically what we computed above + * and stored in cpus. As far as vcpu-affinity is concerned, + * there always will be at least one of these pcpus, hence cpus + * is never empty and the calls to cpumask_cycle() and + * cpumask_test_cpu() below are ok. + * + * On the other hand, when considering node-affinity too, it + * is possible for the mask to become empty (for instance, if the + * domain has been put in a cpupool that does not contain any of the + * nodes in its node-affinity), which would result in the ASSERT()-s + * inside cpumask_*() operations triggering (in debug builds). + * + * Therefore, in this case, we filter the node-affinity mask against + * cpus and, if the result is empty, we just skip the node-affinity + * balancing step all together. + */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, &cpus) ) continue; /* Pick an online CPU from the proper affinity mask */ @@ -1445,7 +1480,7 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) * or counter. */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, vc->cpu_affinity) ) continue; csched_balance_cpumask(vc, balance_step, csched_balance_mask); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp8-0006ZV-9B; Sat, 21 Sep 2013 04:29:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp6-0006ZE-HG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:36 +0000 Received: from [85.158.143.35:60403] by server-3.bemta-4.messagelabs.com id 45/1F-08835-FA02D325; Sat, 21 Sep 2013 04:29:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379737774!419405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19777 invoked from network); 21 Sep 2013 04:29:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp4-0000Xt-4B for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEp4-00019p-1O for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:34 +0000 Date: Sat, 21 Sep 2013 04:29:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: remove unused shared header lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ae3285f247e04db6145fc658e5ea2c2cb2df7c6 Author: Matthew Daley AuthorDate: Fri Sep 20 11:40:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:40:00 2013 +0200 gnttab: remove unused shared header lookup Coverity-ID: 1056171 Signed-off-by: Matthew Daley Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index eb50288..f42bc7a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -783,7 +783,6 @@ __gnttab_map_grant_ref( spin_lock(&rgt->lock); act = &active_entry(rgt, op->ref); - shah = shared_entry_header(rgt, op->ref); if ( op->flags & GNTMAP_device_map ) act->pin -= (op->flags & GNTMAP_readonly) ? -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp8-0006ZV-9B; Sat, 21 Sep 2013 04:29:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp6-0006ZE-HG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:36 +0000 Received: from [85.158.143.35:60403] by server-3.bemta-4.messagelabs.com id 45/1F-08835-FA02D325; Sat, 21 Sep 2013 04:29:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379737774!419405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19777 invoked from network); 21 Sep 2013 04:29:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEp4-0000Xt-4B for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEp4-00019p-1O for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:34 +0000 Date: Sat, 21 Sep 2013 04:29:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: remove unused shared header lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ae3285f247e04db6145fc658e5ea2c2cb2df7c6 Author: Matthew Daley AuthorDate: Fri Sep 20 11:40:00 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:40:00 2013 +0200 gnttab: remove unused shared header lookup Coverity-ID: 1056171 Signed-off-by: Matthew Daley Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index eb50288..f42bc7a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -783,7 +783,6 @@ __gnttab_map_grant_ref( spin_lock(&rgt->lock); act = &active_entry(rgt, op->ref); - shah = shared_entry_header(rgt, op->ref); if ( op->flags & GNTMAP_device_map ) act->pin -= (op->flags & GNTMAP_readonly) ? -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpI-0006bU-C4; Sat, 21 Sep 2013 04:29:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpG-0006bE-Sk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:47 +0000 Received: from [193.109.254.147:38723] by server-9.bemta-14.messagelabs.com id 5E/6C-30026-AB02D325; Sat, 21 Sep 2013 04:29:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737784!370351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30271 invoked from network); 21 Sep 2013 04:29:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpE-0000Xz-BG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEpE-0001AB-9l for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:44 +0000 Date: Sat, 21 Sep 2013 04:29:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified_drivers: enable unplug per 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 df17e9c889c48c9c10aa3f9dd0bb11077f54efc4 Author: Olaf Hering AuthorDate: Fri Sep 20 11:41:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:41:08 2013 +0200 unmodified_drivers: enable unplug per default Since xen-3.3 an official unplug protocol for emulated hardware is available in the toolstack. The pvops kernel does the unplug per default, so it is safe to do it also in the drivers for forward ported xenlinux. Currently its required to load xen-platform-pci with the module parameter dev_unplug=all, which is cumbersome. Also recognize the dev_unplug=never parameter, which provides the default before this patch. Signed-off-by: Olaf Hering --- .../linux-2.6/platform-pci/platform-pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index cfd0536..163b168 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -66,7 +66,7 @@ MODULE_LICENSE("GPL"); static char *dev_unplug; module_param(dev_unplug, charp, 0644); MODULE_PARM_DESC(dev_unplug, "Emulated devices to unplug: " - "[all,][ide-disks,][aux-ide-disks,][nics]\n"); + "[all,][ide-disks,][aux-ide-disks,][nics,][never] (default is 'all')\n"); struct pci_dev *xen_platform_pdev; @@ -290,6 +290,10 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) short magic, unplug = 0; char protocol, *p, *q, *err; + /* Unconditionally unplug everything */ + if (!dev_unplug) + unplug = UNPLUG_ALL; + for (p = dev_unplug; p; p = q) { q = strchr(dev_unplug, ','); if (q) @@ -302,6 +306,8 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) unplug |= UNPLUG_AUX_IDE_DISKS; else if (!strcmp(p, "nics")) unplug |= UNPLUG_ALL_NICS; + else if (!strcmp(p, "never")) + unplug = 0; else dev_warn(dev, "unrecognised option '%s' " "in module parameter 'dev_unplug'\n", p); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 21 04:29:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Sep 2013 04:29:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpI-0006bU-C4; Sat, 21 Sep 2013 04:29:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpG-0006bE-Sk for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:47 +0000 Received: from [193.109.254.147:38723] by server-9.bemta-14.messagelabs.com id 5E/6C-30026-AB02D325; Sat, 21 Sep 2013 04:29:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1379737784!370351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30271 invoked from network); 21 Sep 2013 04:29:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2013 04:29:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNEpE-0000Xz-BG for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNEpE-0001AB-9l for xen-changelog@lists.xensource.com; Sat, 21 Sep 2013 04:29:44 +0000 Date: Sat, 21 Sep 2013 04:29:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified_drivers: enable unplug per 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 df17e9c889c48c9c10aa3f9dd0bb11077f54efc4 Author: Olaf Hering AuthorDate: Fri Sep 20 11:41:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 20 11:41:08 2013 +0200 unmodified_drivers: enable unplug per default Since xen-3.3 an official unplug protocol for emulated hardware is available in the toolstack. The pvops kernel does the unplug per default, so it is safe to do it also in the drivers for forward ported xenlinux. Currently its required to load xen-platform-pci with the module parameter dev_unplug=all, which is cumbersome. Also recognize the dev_unplug=never parameter, which provides the default before this patch. Signed-off-by: Olaf Hering --- .../linux-2.6/platform-pci/platform-pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index cfd0536..163b168 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -66,7 +66,7 @@ MODULE_LICENSE("GPL"); static char *dev_unplug; module_param(dev_unplug, charp, 0644); MODULE_PARM_DESC(dev_unplug, "Emulated devices to unplug: " - "[all,][ide-disks,][aux-ide-disks,][nics]\n"); + "[all,][ide-disks,][aux-ide-disks,][nics,][never] (default is 'all')\n"); struct pci_dev *xen_platform_pdev; @@ -290,6 +290,10 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) short magic, unplug = 0; char protocol, *p, *q, *err; + /* Unconditionally unplug everything */ + if (!dev_unplug) + unplug = UNPLUG_ALL; + for (p = dev_unplug; p; p = q) { q = strchr(dev_unplug, ','); if (q) @@ -302,6 +306,8 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) unplug |= UNPLUG_AUX_IDE_DISKS; else if (!strcmp(p, "nics")) unplug |= UNPLUG_ALL_NICS; + else if (!strcmp(p, "never")) + unplug = 0; else dev_warn(dev, "unrecognised option '%s' " "in module parameter 'dev_unplug'\n", p); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXbo-00017V-LS; Sun, 22 Sep 2013 00:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbn-00017M-2Y for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:07 +0000 Received: from [85.158.137.68:54990] by server-11.bemta-3.messagelabs.com id 84/6C-16607-2CA3E325; Sun, 22 Sep 2013 00:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1379809984!3913560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6888 invoked from network); 22 Sep 2013 00:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbk-00068F-2M for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXbj-0000pS-Rf for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:03 +0000 Date: Sun, 22 Sep 2013 00:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: improve VMID allocation. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e2acc2074cefe54ce71ab8a7e41d75a8dabdd10 Author: Ian Campbell AuthorDate: Tue Sep 17 16:56:28 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:18:49 2013 +0100 xen: arm: improve VMID allocation. The VMID field is 8 bits. Rather than allowing only up to 256 VMs per host reboot before things start "acting strange" instead maintain a simple bitmap of used VMIDs and allocate them statically to guests upon creation. This limits us to 256 concurrent VMs which is a reasonable improvement. Eventually we will want a proper scheme to allocate VMIDs on context switch. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 71 ++++++++++++++++++++++++++++++++++++++++++-- xen/arch/arm/setup.c | 2 + xen/include/asm-arm/p2m.h | 3 ++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 307c6d4..2d09fef 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -306,6 +307,59 @@ int p2m_alloc_table(struct domain *d) return 0; } +#define MAX_VMID 256 +#define INVALID_VMID 0 /* VMID 0 is reserved */ + +static spinlock_t vmid_alloc_lock = SPIN_LOCK_UNLOCKED; + +/* VTTBR_EL2 VMID field is 8 bits. Using a bitmap here limits us to + * 256 concurrent domains. */ +static DECLARE_BITMAP(vmid_mask, MAX_VMID); + +void p2m_vmid_allocator_init(void) +{ + set_bit(INVALID_VMID, vmid_mask); +} + +static int p2m_alloc_vmid(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + int rc, nr; + + spin_lock(&vmid_alloc_lock); + + nr = find_first_zero_bit(vmid_mask, MAX_VMID); + + ASSERT(nr != INVALID_VMID); + + if ( nr == MAX_VMID ) + { + rc = -EBUSY; + printk(XENLOG_ERR "p2m.c: dom%d: VMID pool exhausted\n", d->domain_id); + goto out; + } + + set_bit(nr, vmid_mask); + + p2m->vmid = nr; + + rc = 0; + +out: + spin_unlock(&vmid_alloc_lock); + return rc; +} + +static void p2m_free_vmid(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + spin_lock(&vmid_alloc_lock); + if ( p2m->vmid != INVALID_VMID ) + clear_bit(p2m->vmid, vmid_mask); + spin_unlock(&vmid_alloc_lock); +} + void p2m_teardown(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; @@ -318,25 +372,34 @@ void p2m_teardown(struct domain *d) p2m->first_level = NULL; + p2m_free_vmid(d); + spin_unlock(&p2m->lock); } int p2m_init(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; + int rc = 0; spin_lock_init(&p2m->lock); INIT_PAGE_LIST_HEAD(&p2m->pages); - /* XXX allocate properly */ - /* Zero is reserved */ - p2m->vmid = d->domain_id + 1; + spin_lock(&p2m->lock); + p2m->vmid = INVALID_VMID; + + rc = p2m_alloc_vmid(d); + if ( rc != 0 ) + goto err; d->arch.vttbr = 0; p2m->first_level = NULL; - return 0; +err: + spin_unlock(&p2m->lock); + + return rc; } unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index aa87fb1..62147b2 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -548,6 +548,8 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); + p2m_vmid_allocator_init(); + softirq_init(); tasklet_subsys_init(); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index a00069b..c660820 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -20,6 +20,9 @@ struct p2m_domain { uint8_t vmid; }; +/* Initialise vmid allocator */ +void p2m_vmid_allocator_init(void); + /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXbo-00017V-LS; Sun, 22 Sep 2013 00:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbn-00017M-2Y for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:07 +0000 Received: from [85.158.137.68:54990] by server-11.bemta-3.messagelabs.com id 84/6C-16607-2CA3E325; Sun, 22 Sep 2013 00:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1379809984!3913560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6888 invoked from network); 22 Sep 2013 00:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbk-00068F-2M for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXbj-0000pS-Rf for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:03 +0000 Date: Sun, 22 Sep 2013 00:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: improve VMID allocation. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e2acc2074cefe54ce71ab8a7e41d75a8dabdd10 Author: Ian Campbell AuthorDate: Tue Sep 17 16:56:28 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:18:49 2013 +0100 xen: arm: improve VMID allocation. The VMID field is 8 bits. Rather than allowing only up to 256 VMs per host reboot before things start "acting strange" instead maintain a simple bitmap of used VMIDs and allocate them statically to guests upon creation. This limits us to 256 concurrent VMs which is a reasonable improvement. Eventually we will want a proper scheme to allocate VMIDs on context switch. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 71 ++++++++++++++++++++++++++++++++++++++++++-- xen/arch/arm/setup.c | 2 + xen/include/asm-arm/p2m.h | 3 ++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 307c6d4..2d09fef 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -306,6 +307,59 @@ int p2m_alloc_table(struct domain *d) return 0; } +#define MAX_VMID 256 +#define INVALID_VMID 0 /* VMID 0 is reserved */ + +static spinlock_t vmid_alloc_lock = SPIN_LOCK_UNLOCKED; + +/* VTTBR_EL2 VMID field is 8 bits. Using a bitmap here limits us to + * 256 concurrent domains. */ +static DECLARE_BITMAP(vmid_mask, MAX_VMID); + +void p2m_vmid_allocator_init(void) +{ + set_bit(INVALID_VMID, vmid_mask); +} + +static int p2m_alloc_vmid(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + int rc, nr; + + spin_lock(&vmid_alloc_lock); + + nr = find_first_zero_bit(vmid_mask, MAX_VMID); + + ASSERT(nr != INVALID_VMID); + + if ( nr == MAX_VMID ) + { + rc = -EBUSY; + printk(XENLOG_ERR "p2m.c: dom%d: VMID pool exhausted\n", d->domain_id); + goto out; + } + + set_bit(nr, vmid_mask); + + p2m->vmid = nr; + + rc = 0; + +out: + spin_unlock(&vmid_alloc_lock); + return rc; +} + +static void p2m_free_vmid(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + spin_lock(&vmid_alloc_lock); + if ( p2m->vmid != INVALID_VMID ) + clear_bit(p2m->vmid, vmid_mask); + spin_unlock(&vmid_alloc_lock); +} + void p2m_teardown(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; @@ -318,25 +372,34 @@ void p2m_teardown(struct domain *d) p2m->first_level = NULL; + p2m_free_vmid(d); + spin_unlock(&p2m->lock); } int p2m_init(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; + int rc = 0; spin_lock_init(&p2m->lock); INIT_PAGE_LIST_HEAD(&p2m->pages); - /* XXX allocate properly */ - /* Zero is reserved */ - p2m->vmid = d->domain_id + 1; + spin_lock(&p2m->lock); + p2m->vmid = INVALID_VMID; + + rc = p2m_alloc_vmid(d); + if ( rc != 0 ) + goto err; d->arch.vttbr = 0; p2m->first_level = NULL; - return 0; +err: + spin_unlock(&p2m->lock); + + return rc; } unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index aa87fb1..62147b2 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -548,6 +548,8 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); + p2m_vmid_allocator_init(); + softirq_init(); tasklet_subsys_init(); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index a00069b..c660820 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -20,6 +20,9 @@ struct p2m_domain { uint8_t vmid; }; +/* Initialise vmid allocator */ +void p2m_vmid_allocator_init(void); + /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXby-00018C-OU; Sun, 22 Sep 2013 00:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbx-00017q-45 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:17 +0000 Received: from [85.158.143.35:13083] by server-1.bemta-4.messagelabs.com id 73/7C-16125-CCA3E325; Sun, 22 Sep 2013 00:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379809994!5817396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5487 invoked from network); 22 Sep 2013 00:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbu-00068I-CV for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXbu-0000ps-5r for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:14 +0000 Date: Sun, 22 Sep 2013 00:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rework placement of fdt in initial dom0 memory map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbe4633e5cbd9245967fe7910c5ef8464823317a Author: Ian Campbell AuthorDate: Tue Sep 17 16:28:12 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:20:20 2013 +0100 xen: arm: rework placement of fdt in initial dom0 memory map The 32-bit Linux kernel uses its lowmem direct mapping to access the FDT. The lowmem mapping is around 0.75GiB but varies depending on the kernel's .config. Our current scheme of loading the FDT as high as 4GB therefore fails with larger amounts of dom0 RAM. The upstream documentation has recently been update to provide more guidance . In accordance with this load the kernel just below 128MiB (aligned to 2MB) and the FDT just above, or if there is less RAM available then as high as possible. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 23 +++++++++++++++-------- xen/arch/arm/kernel.c | 27 ++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 40af876..fb1fa56 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -791,19 +791,27 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) if ( ret < 0 ) goto err; + /* Actual new size */ + new_size = fdt_totalsize(kinfo->fdt); + /* - * DTB must be load below 4GiB and far enough from linux (Linux uses - * the space after it to decompress) - * Load the DTB at the end of the first bank, while ensuring it is - * also below 4G + * DTB must be loaded such that it does not conflict with the + * kernel decompressor. For 32-bit Linux Documentation/arm/Booting + * recommends just after the 128MB boundary while for 64-bit Linux + * the recommendation in Documentation/arm64/booting.txt is below + * 512MB. Place at 128MB, (or, if we have less RAM, as high as + * possible) in order to satisfy both. */ end = kinfo->mem.bank[0].start + kinfo->mem.bank[0].size; - end = MIN(1ull << 32, end); - kinfo->dtb_paddr = end - fdt_totalsize(kinfo->fdt); + end = MIN(kinfo->mem.bank[0].start + (128<<20) + new_size, end); + + kinfo->dtb_paddr = end - new_size; + /* Align the address to 2Mb. Linux only requires 4 byte alignment */ kinfo->dtb_paddr &= ~((2 << 20) - 1); - if ( fdt_totalsize(kinfo->fdt) > end ) + if ( kinfo->dtb_paddr < kinfo->mem.bank[0].start || + kinfo->mem.bank[0].start + new_size > end ) { printk(XENLOG_ERR "Not enough memory in the first bank for " "the device tree."); @@ -811,7 +819,6 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) goto err; } - return 0; err: diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index f12f895..7a91d60 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -211,11 +211,32 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->zimage.kernel_addr = addr; /* - * If start is zero, the zImage is position independent -- load it - * at 32k from start of RAM. + * If start is zero, the zImage is position independent, in this + * case Documentation/arm/Booting recommends loading below 128MiB + * and above 32MiB. Load it as high as possible within these + * constraints, while also avoiding the DTB. */ if (start == 0) - info->zimage.load_addr = info->mem.bank[0].start + 0x8000; + { + paddr_t load_end; + + load_end = info->mem.bank[0].start + info->mem.bank[0].size; + load_end = MIN(info->mem.bank[0].start + (128<<20), load_end); + + /* + * FDT is loaded above 128M or as high as possible, so the + * only way we can clash is if we have <=128MB, in which case + * FDT will be right at the end and so dtb_paddr will be below + * the proposed kernel load address. Move the kernel down if + * necessary. + */ + if ( load_end >= info->dtb_paddr ) + load_end = info->dtb_paddr; + + info->zimage.load_addr = load_end - end; + /* Align to 2MB */ + info->zimage.load_addr &= ~((2 << 20) - 1); + } else info->zimage.load_addr = start; info->zimage.len = end - start; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXby-00018C-OU; Sun, 22 Sep 2013 00:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbx-00017q-45 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:17 +0000 Received: from [85.158.143.35:13083] by server-1.bemta-4.messagelabs.com id 73/7C-16125-CCA3E325; Sun, 22 Sep 2013 00:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379809994!5817396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5487 invoked from network); 22 Sep 2013 00:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXbu-00068I-CV for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXbu-0000ps-5r for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:14 +0000 Date: Sun, 22 Sep 2013 00:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rework placement of fdt in initial dom0 memory map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbe4633e5cbd9245967fe7910c5ef8464823317a Author: Ian Campbell AuthorDate: Tue Sep 17 16:28:12 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:20:20 2013 +0100 xen: arm: rework placement of fdt in initial dom0 memory map The 32-bit Linux kernel uses its lowmem direct mapping to access the FDT. The lowmem mapping is around 0.75GiB but varies depending on the kernel's .config. Our current scheme of loading the FDT as high as 4GB therefore fails with larger amounts of dom0 RAM. The upstream documentation has recently been update to provide more guidance . In accordance with this load the kernel just below 128MiB (aligned to 2MB) and the FDT just above, or if there is less RAM available then as high as possible. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 23 +++++++++++++++-------- xen/arch/arm/kernel.c | 27 ++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 40af876..fb1fa56 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -791,19 +791,27 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) if ( ret < 0 ) goto err; + /* Actual new size */ + new_size = fdt_totalsize(kinfo->fdt); + /* - * DTB must be load below 4GiB and far enough from linux (Linux uses - * the space after it to decompress) - * Load the DTB at the end of the first bank, while ensuring it is - * also below 4G + * DTB must be loaded such that it does not conflict with the + * kernel decompressor. For 32-bit Linux Documentation/arm/Booting + * recommends just after the 128MB boundary while for 64-bit Linux + * the recommendation in Documentation/arm64/booting.txt is below + * 512MB. Place at 128MB, (or, if we have less RAM, as high as + * possible) in order to satisfy both. */ end = kinfo->mem.bank[0].start + kinfo->mem.bank[0].size; - end = MIN(1ull << 32, end); - kinfo->dtb_paddr = end - fdt_totalsize(kinfo->fdt); + end = MIN(kinfo->mem.bank[0].start + (128<<20) + new_size, end); + + kinfo->dtb_paddr = end - new_size; + /* Align the address to 2Mb. Linux only requires 4 byte alignment */ kinfo->dtb_paddr &= ~((2 << 20) - 1); - if ( fdt_totalsize(kinfo->fdt) > end ) + if ( kinfo->dtb_paddr < kinfo->mem.bank[0].start || + kinfo->mem.bank[0].start + new_size > end ) { printk(XENLOG_ERR "Not enough memory in the first bank for " "the device tree."); @@ -811,7 +819,6 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) goto err; } - return 0; err: diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index f12f895..7a91d60 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -211,11 +211,32 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->zimage.kernel_addr = addr; /* - * If start is zero, the zImage is position independent -- load it - * at 32k from start of RAM. + * If start is zero, the zImage is position independent, in this + * case Documentation/arm/Booting recommends loading below 128MiB + * and above 32MiB. Load it as high as possible within these + * constraints, while also avoiding the DTB. */ if (start == 0) - info->zimage.load_addr = info->mem.bank[0].start + 0x8000; + { + paddr_t load_end; + + load_end = info->mem.bank[0].start + info->mem.bank[0].size; + load_end = MIN(info->mem.bank[0].start + (128<<20), load_end); + + /* + * FDT is loaded above 128M or as high as possible, so the + * only way we can clash is if we have <=128MB, in which case + * FDT will be right at the end and so dtb_paddr will be below + * the proposed kernel load address. Move the kernel down if + * necessary. + */ + if ( load_end >= info->dtb_paddr ) + load_end = info->dtb_paddr; + + info->zimage.load_addr = load_end - end; + /* Align to 2MB */ + info->zimage.load_addr &= ~((2 << 20) - 1); + } else info->zimage.load_addr = start; info->zimage.len = end - start; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXc8-000196-Rf; Sun, 22 Sep 2013 00:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXc7-00018y-GN for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:27 +0000 Received: from [85.158.139.211:44895] by server-16.bemta-5.messagelabs.com id 4F/FC-03533-6DA3E325; Sun, 22 Sep 2013 00:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379810004!3824764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3413 invoked from network); 22 Sep 2013 00:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXc4-00068O-Lp for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXc4-0000qH-H6 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:24 +0000 Date: Sun, 22 Sep 2013 00:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Implement ioremap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45b187020098a9872b05a96c86d3f65d2404ec0c Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:32 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:25:13 2013 +0100 xen/arm: Implement ioremap. Common code uses this, it expects an uncached mapping. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 69c157a..4521c8d 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -694,6 +694,11 @@ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) return (__vmap(&pfn, nr, 1, 1, attributes) + offs); } +void *ioremap(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); +} + static int create_xen_table(lpae_t *entry) { void *p; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXc8-000196-Rf; Sun, 22 Sep 2013 00:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXc7-00018y-GN for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:27 +0000 Received: from [85.158.139.211:44895] by server-16.bemta-5.messagelabs.com id 4F/FC-03533-6DA3E325; Sun, 22 Sep 2013 00:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1379810004!3824764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3413 invoked from network); 22 Sep 2013 00:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXc4-00068O-Lp for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXc4-0000qH-H6 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:24 +0000 Date: Sun, 22 Sep 2013 00:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Implement ioremap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45b187020098a9872b05a96c86d3f65d2404ec0c Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:32 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:25:13 2013 +0100 xen/arm: Implement ioremap. Common code uses this, it expects an uncached mapping. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 69c157a..4521c8d 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -694,6 +694,11 @@ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) return (__vmap(&pfn, nr, 1, 1, attributes) + offs); } +void *ioremap(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); +} + static int create_xen_table(lpae_t *entry) { void *p; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcT-0001BY-VS; Sun, 22 Sep 2013 00:33:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcS-0001BH-HU for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:48 +0000 Received: from [193.109.254.147:64634] by server-1.bemta-14.messagelabs.com id FE/2C-04740-BEA3E325; Sun, 22 Sep 2013 00:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379810025!311114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17931 invoked from network); 22 Sep 2013 00:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcP-00068f-1z for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcP-0000rB-0O for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:45 +0000 Date: Sun, 22 Sep 2013 00:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: make usable 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 7c1de0038895cbc75ebd0caffc5b0f3f03c5ad51 Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:34 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 ns16550: make usable on ARM There are several aspects to this: - Correctly conditionalise use of PCI - Correctly conditionalise use of IO ports - Add discovery via device tree - Support different registers shift/stride and widths - Add vuart hooks. Signed-off-by: Ian Campbell Acked-by: Keir Frser Reviewed-by: Jan Beulich Cc: PranavkumarSawargaonkar --- config/arm32.mk | 1 + xen/Rules.mk | 3 + xen/arch/x86/Rules.mk | 1 + xen/drivers/char/ns16550.c | 193 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 186 insertions(+), 12 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 76e229d..aa79d22 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -12,6 +12,7 @@ CFLAGS += -marm HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y +HAS_NS16550 := y # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/xen/Rules.mk b/xen/Rules.mk index 736882a..df1428f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -60,6 +60,9 @@ CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH +CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE +CFLAGS-$(HAS_PCI) += -DHAS_PCI +CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index eb11b5b..c93d2af 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,6 +1,7 @@ ######################################## # x86-specific definitions +HAS_IOPORTS := y HAS_ACPI := y HAS_VGA := y HAS_VIDEO := y diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e0f80f6..45da924 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -13,14 +13,19 @@ #include #include #include -#include #include #include #include +#ifdef HAS_PCI #include #include +#endif #include +#include #include +#ifdef HAS_DEVICE_TREE +#include +#endif #ifdef CONFIG_X86 #include #endif @@ -40,15 +45,23 @@ string_param("com2", opt_com2); static struct ns16550 { int baud, clock_hz, data_bits, parity, stop_bits, fifo_size, irq; - unsigned long io_base; /* I/O port or memory-mapped I/O address. */ + u64 io_base; /* I/O port or memory-mapped I/O address. */ + u32 io_size; + int reg_shift; /* Bits to shift register offset by */ + int reg_width; /* Size of access to use, the registers + * themselves are still bytes */ char __iomem *remapped_io_base; /* Remapped virtual address of MMIO. */ /* UART with IRQ line: interrupt-driven I/O. */ struct irqaction irqaction; +#ifdef CONFIG_ARM + struct vuart_info vuart; +#endif /* UART with no IRQ line: periodically-polled I/O. */ struct timer timer; struct timer resume_timer; unsigned int timeout_ms; bool_t intr_works; +#ifdef HAS_PCI /* PCI card parameters. */ unsigned int pb_bdf[3]; /* pci bridge BDF */ unsigned int ps_bdf[3]; /* pci serial port BDF */ @@ -57,22 +70,51 @@ static struct ns16550 { u32 bar; u16 cr; u8 bar_idx; +#endif +#ifdef HAS_DEVICE_TREE + struct dt_irq dt_irq; +#endif } ns16550_com[2] = { { 0 } }; static void ns16550_delayed_resume(void *data); static char ns_read_reg(struct ns16550 *uart, int reg) { + void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +#ifdef HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return inb(uart->io_base + reg); - return readb(uart->remapped_io_base + reg); +#endif + switch ( uart->reg_width ) + { + case 1: + return readb(addr); + case 4: + return readl(addr); + default: + return 0xff; + } } static void ns_write_reg(struct ns16550 *uart, int reg, char c) { + void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +#ifdef HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return outb(c, uart->io_base + reg); - writeb(c, uart->remapped_io_base + reg); +#endif + switch ( uart->reg_width ) + { + case 1: + writeb(c, addr); + break; + case 4: + writel(c, addr); + break; + default: + /* Ignored */ + break; + } } static int ns16550_ioport_invalid(struct ns16550 *uart) @@ -163,9 +205,10 @@ static int ns16550_getc(struct serial_port *port, char *pc) static void pci_serial_early_init(struct ns16550 *uart) { +#ifdef HAS_PCI if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 ) return; - + if ( uart->pb_bdf_enable ) pci_conf_write16(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], PCI_IO_BASE, @@ -177,6 +220,7 @@ static void pci_serial_early_init(struct ns16550 *uart) uart->io_base | PCI_BASE_ADDRESS_SPACE_IO); pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, PCI_COMMAND_IO); +#endif } static void ns16550_setup_preirq(struct ns16550 *uart) @@ -223,8 +267,10 @@ static void __init ns16550_init_preirq(struct serial_port *port) { struct ns16550 *uart = port->uart; +#ifdef HAS_IOPORTS /* I/O ports are distinguished by their size (16 bits). */ if ( uart->io_base >= 0x10000 ) +#endif { #ifdef CONFIG_X86 enum fixed_addresses idx = FIX_COM_BEGIN + (uart - ns16550_com); @@ -233,7 +279,7 @@ static void __init ns16550_init_preirq(struct serial_port *port) uart->remapped_io_base = (void __iomem *)fix_to_virt(idx); uart->remapped_io_base += uart->io_base & ~PAGE_MASK; #else - uart->remapped_io_base = (char *)ioremap(uart->io_base, 8); + uart->remapped_io_base = (char *)ioremap(uart->io_base, uart->io_size); #endif } @@ -284,15 +330,22 @@ static void __init ns16550_init_postirq(struct serial_port *port) uart->irqaction.handler = ns16550_interrupt; uart->irqaction.name = "ns16550"; uart->irqaction.dev_id = port; +#ifdef HAS_DEVICE_TREE + if ( (rc = setup_dt_irq(&uart->dt_irq, &uart->irqaction)) != 0 ) + printk("ERROR: Failed to allocate ns16550 DT IRQ.\n"); +#else if ( (rc = setup_irq(uart->irq, &uart->irqaction)) != 0 ) printk("ERROR: Failed to allocate ns16550 IRQ %d\n", uart->irq); +#endif } ns16550_setup_postirq(uart); +#ifdef HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], uart->ps_bdf[2])); +#endif } static void ns16550_suspend(struct serial_port *port) @@ -301,13 +354,16 @@ static void ns16550_suspend(struct serial_port *port) stop_timer(&uart->timer); +#ifdef HAS_PCI if ( uart->bar ) uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND); +#endif } static void _ns16550_resume(struct serial_port *port) { +#ifdef HAS_PCI struct ns16550 *uart = port->uart; if ( uart->bar ) @@ -317,6 +373,7 @@ static void _ns16550_resume(struct serial_port *port) pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, uart->cr); } +#endif ns16550_setup_preirq(port->uart); ns16550_setup_postirq(port->uart); @@ -360,19 +417,17 @@ static void ns16550_resume(struct serial_port *port) _ns16550_resume(port); } -#ifdef CONFIG_X86 static void __init ns16550_endboot(struct serial_port *port) { +#ifdef HAS_IOPORTS struct ns16550 *uart = port->uart; if ( uart->remapped_io_base ) return; if ( ioports_deny_access(dom0, uart->io_base, uart->io_base + 7) != 0 ) BUG(); -} -#else -#define ns16550_endboot NULL #endif +} static int __init ns16550_irq(struct serial_port *port) { @@ -380,6 +435,23 @@ static int __init ns16550_irq(struct serial_port *port) return ((uart->irq > 0) ? uart->irq : -1); } +#ifdef HAS_DEVICE_TREE +static const struct dt_irq __init *ns16550_dt_irq(struct serial_port *port) +{ + struct ns16550 *uart = port->uart; + return &uart->dt_irq; +} +#endif + +#ifdef CONFIG_ARM +static const struct vuart_info *ns16550_vuart_info(struct serial_port *port) +{ + struct ns16550 *uart = port->uart; + + return &uart->vuart; +} +#endif + static struct uart_driver __read_mostly ns16550_driver = { .init_preirq = ns16550_init_preirq, .init_postirq = ns16550_init_postirq, @@ -389,7 +461,13 @@ static struct uart_driver __read_mostly ns16550_driver = { .tx_ready = ns16550_tx_ready, .putc = ns16550_putc, .getc = ns16550_getc, - .irq = ns16550_irq + .irq = ns16550_irq, +#ifdef HAS_DEVICE_TREE + .dt_irq_get = ns16550_dt_irq, +#endif +#ifdef CONFIG_ARM + .vuart_info = ns16550_vuart_info, +#endif }; static int __init parse_parity_char(int c) @@ -414,15 +492,21 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; +#ifdef HAS_IO_PORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. */ if ( uart->io_base >= 0x10000 ) return 1; +#else + return 1; /* Everything is MMIO */ +#endif +#ifdef HAS_PCI pci_serial_early_init(uart); - +#endif + /* * Do a simple existence test first; if we fail this, * there's no point trying anything else. @@ -450,6 +534,7 @@ static int __init check_existence(struct ns16550 *uart) return (status == 0x90); } +#ifdef HAS_PCI static int pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { @@ -518,6 +603,7 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) return 0; } +#endif #define PARSE_ERR(_f, _a...) \ do { \ @@ -564,6 +650,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { +#ifdef HAS_PCI if ( strncmp(conf, "pci", 3) == 0 ) { if ( pci_uart_config(uart, 1/* skip AMT */, uart - ns16550_com) ) @@ -577,6 +664,7 @@ static void __init ns16550_parse_port_config( conf += 3; } else +#endif { uart->io_base = simple_strtoul(conf, &conf, 0); } @@ -585,6 +673,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) uart->irq = simple_strtol(conf, &conf, 10); +#ifdef HAS_PCI if ( *conf == ',' && *++conf != ',' ) { conf = parse_pci(conf, NULL, &uart->ps_bdf[0], @@ -601,6 +690,7 @@ static void __init ns16550_parse_port_config( PARSE_ERR("Bad bridge PCI coordinates"); uart->pb_bdf_enable = 1; } +#endif config_parsed: /* Sanity checks. */ @@ -638,12 +728,91 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) uart->stop_bits = defaults->stop_bits; uart->irq = defaults->irq; uart->io_base = defaults->io_base; + uart->io_size = 8; + uart->reg_width = 1; + uart->reg_shift = 0; + /* Default is no transmit FIFO. */ uart->fifo_size = 1; ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } +#ifdef HAS_DEVICE_TREE +static int __init ns16550_uart_dt_init(struct dt_device_node *dev, + const void *data) +{ + struct ns16550 *uart; + int res; + u32 reg_shift, reg_width; + u64 io_size; + + uart = &ns16550_com[0]; + + uart->baud = BAUD_AUTO; + uart->clock_hz = UART_CLOCK_HZ; + uart->data_bits = 8; + uart->parity = UART_PARITY_NONE; + uart->stop_bits = 1; + /* Default is no transmit FIFO. */ + uart->fifo_size = 1; + + res = dt_device_get_address(dev, 0, &uart->io_base, &io_size); + if ( res ) + return res; + + uart->io_size = io_size; + + ASSERT(uart->io_size == io_size); /* Detect truncation */ + + res = dt_property_read_u32(dev, "reg-shift", ®_shift); + if ( !res ) + uart->reg_shift = 0; + else + uart->reg_shift = reg_shift; + + res = dt_property_read_u32(dev, "reg-io-width", ®_width); + if ( !res ) + uart->reg_width = 1; + else + uart->reg_width = reg_width; + + if ( uart->reg_width != 1 && uart->reg_width != 4 ) + return -EINVAL; + + res = dt_device_get_irq(dev, 0, &uart->dt_irq); + if ( res ) + return res; + + /* The common bit of the driver mostly deals with irq not dt_irq. */ + uart->irq = uart->dt_irq.irq; + + uart->vuart.base_addr = uart->io_base; + uart->vuart.size = uart->io_size; + uart->vuart.data_off = UART_THR <reg_shift; + uart->vuart.status_off = UART_LSR<reg_shift; + uart->vuart.status = UART_LSR_THRE|UART_LSR_TEMT; + + /* Register with generic serial driver. */ + serial_register_uart(uart - ns16550_com, &ns16550_driver, uart); + + dt_device_set_used_by(dev, DOMID_XEN); + + return 0; +} + +static const char const *ns16550_dt_compat[] __initconst = +{ + "ns16550", + NULL +}; + +DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL) + .compatible = ns16550_dt_compat, + .init = ns16550_uart_dt_init, +DT_DEVICE_END + +#endif /* HAS_DEVICE_TREE */ /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:33:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcT-0001BY-VS; Sun, 22 Sep 2013 00:33:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcS-0001BH-HU for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:48 +0000 Received: from [193.109.254.147:64634] by server-1.bemta-14.messagelabs.com id FE/2C-04740-BEA3E325; Sun, 22 Sep 2013 00:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379810025!311114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17931 invoked from network); 22 Sep 2013 00:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcP-00068f-1z for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcP-0000rB-0O for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:45 +0000 Date: Sun, 22 Sep 2013 00:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: make usable 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 7c1de0038895cbc75ebd0caffc5b0f3f03c5ad51 Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:34 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 ns16550: make usable on ARM There are several aspects to this: - Correctly conditionalise use of PCI - Correctly conditionalise use of IO ports - Add discovery via device tree - Support different registers shift/stride and widths - Add vuart hooks. Signed-off-by: Ian Campbell Acked-by: Keir Frser Reviewed-by: Jan Beulich Cc: PranavkumarSawargaonkar --- config/arm32.mk | 1 + xen/Rules.mk | 3 + xen/arch/x86/Rules.mk | 1 + xen/drivers/char/ns16550.c | 193 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 186 insertions(+), 12 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 76e229d..aa79d22 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -12,6 +12,7 @@ CFLAGS += -marm HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y +HAS_NS16550 := y # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/xen/Rules.mk b/xen/Rules.mk index 736882a..df1428f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -60,6 +60,9 @@ CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH +CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE +CFLAGS-$(HAS_PCI) += -DHAS_PCI +CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index eb11b5b..c93d2af 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,6 +1,7 @@ ######################################## # x86-specific definitions +HAS_IOPORTS := y HAS_ACPI := y HAS_VGA := y HAS_VIDEO := y diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e0f80f6..45da924 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -13,14 +13,19 @@ #include #include #include -#include #include #include #include +#ifdef HAS_PCI #include #include +#endif #include +#include #include +#ifdef HAS_DEVICE_TREE +#include +#endif #ifdef CONFIG_X86 #include #endif @@ -40,15 +45,23 @@ string_param("com2", opt_com2); static struct ns16550 { int baud, clock_hz, data_bits, parity, stop_bits, fifo_size, irq; - unsigned long io_base; /* I/O port or memory-mapped I/O address. */ + u64 io_base; /* I/O port or memory-mapped I/O address. */ + u32 io_size; + int reg_shift; /* Bits to shift register offset by */ + int reg_width; /* Size of access to use, the registers + * themselves are still bytes */ char __iomem *remapped_io_base; /* Remapped virtual address of MMIO. */ /* UART with IRQ line: interrupt-driven I/O. */ struct irqaction irqaction; +#ifdef CONFIG_ARM + struct vuart_info vuart; +#endif /* UART with no IRQ line: periodically-polled I/O. */ struct timer timer; struct timer resume_timer; unsigned int timeout_ms; bool_t intr_works; +#ifdef HAS_PCI /* PCI card parameters. */ unsigned int pb_bdf[3]; /* pci bridge BDF */ unsigned int ps_bdf[3]; /* pci serial port BDF */ @@ -57,22 +70,51 @@ static struct ns16550 { u32 bar; u16 cr; u8 bar_idx; +#endif +#ifdef HAS_DEVICE_TREE + struct dt_irq dt_irq; +#endif } ns16550_com[2] = { { 0 } }; static void ns16550_delayed_resume(void *data); static char ns_read_reg(struct ns16550 *uart, int reg) { + void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +#ifdef HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return inb(uart->io_base + reg); - return readb(uart->remapped_io_base + reg); +#endif + switch ( uart->reg_width ) + { + case 1: + return readb(addr); + case 4: + return readl(addr); + default: + return 0xff; + } } static void ns_write_reg(struct ns16550 *uart, int reg, char c) { + void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +#ifdef HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return outb(c, uart->io_base + reg); - writeb(c, uart->remapped_io_base + reg); +#endif + switch ( uart->reg_width ) + { + case 1: + writeb(c, addr); + break; + case 4: + writel(c, addr); + break; + default: + /* Ignored */ + break; + } } static int ns16550_ioport_invalid(struct ns16550 *uart) @@ -163,9 +205,10 @@ static int ns16550_getc(struct serial_port *port, char *pc) static void pci_serial_early_init(struct ns16550 *uart) { +#ifdef HAS_PCI if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 ) return; - + if ( uart->pb_bdf_enable ) pci_conf_write16(0, uart->pb_bdf[0], uart->pb_bdf[1], uart->pb_bdf[2], PCI_IO_BASE, @@ -177,6 +220,7 @@ static void pci_serial_early_init(struct ns16550 *uart) uart->io_base | PCI_BASE_ADDRESS_SPACE_IO); pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, PCI_COMMAND_IO); +#endif } static void ns16550_setup_preirq(struct ns16550 *uart) @@ -223,8 +267,10 @@ static void __init ns16550_init_preirq(struct serial_port *port) { struct ns16550 *uart = port->uart; +#ifdef HAS_IOPORTS /* I/O ports are distinguished by their size (16 bits). */ if ( uart->io_base >= 0x10000 ) +#endif { #ifdef CONFIG_X86 enum fixed_addresses idx = FIX_COM_BEGIN + (uart - ns16550_com); @@ -233,7 +279,7 @@ static void __init ns16550_init_preirq(struct serial_port *port) uart->remapped_io_base = (void __iomem *)fix_to_virt(idx); uart->remapped_io_base += uart->io_base & ~PAGE_MASK; #else - uart->remapped_io_base = (char *)ioremap(uart->io_base, 8); + uart->remapped_io_base = (char *)ioremap(uart->io_base, uart->io_size); #endif } @@ -284,15 +330,22 @@ static void __init ns16550_init_postirq(struct serial_port *port) uart->irqaction.handler = ns16550_interrupt; uart->irqaction.name = "ns16550"; uart->irqaction.dev_id = port; +#ifdef HAS_DEVICE_TREE + if ( (rc = setup_dt_irq(&uart->dt_irq, &uart->irqaction)) != 0 ) + printk("ERROR: Failed to allocate ns16550 DT IRQ.\n"); +#else if ( (rc = setup_irq(uart->irq, &uart->irqaction)) != 0 ) printk("ERROR: Failed to allocate ns16550 IRQ %d\n", uart->irq); +#endif } ns16550_setup_postirq(uart); +#ifdef HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1], uart->ps_bdf[2])); +#endif } static void ns16550_suspend(struct serial_port *port) @@ -301,13 +354,16 @@ static void ns16550_suspend(struct serial_port *port) stop_timer(&uart->timer); +#ifdef HAS_PCI if ( uart->bar ) uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND); +#endif } static void _ns16550_resume(struct serial_port *port) { +#ifdef HAS_PCI struct ns16550 *uart = port->uart; if ( uart->bar ) @@ -317,6 +373,7 @@ static void _ns16550_resume(struct serial_port *port) pci_conf_write16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND, uart->cr); } +#endif ns16550_setup_preirq(port->uart); ns16550_setup_postirq(port->uart); @@ -360,19 +417,17 @@ static void ns16550_resume(struct serial_port *port) _ns16550_resume(port); } -#ifdef CONFIG_X86 static void __init ns16550_endboot(struct serial_port *port) { +#ifdef HAS_IOPORTS struct ns16550 *uart = port->uart; if ( uart->remapped_io_base ) return; if ( ioports_deny_access(dom0, uart->io_base, uart->io_base + 7) != 0 ) BUG(); -} -#else -#define ns16550_endboot NULL #endif +} static int __init ns16550_irq(struct serial_port *port) { @@ -380,6 +435,23 @@ static int __init ns16550_irq(struct serial_port *port) return ((uart->irq > 0) ? uart->irq : -1); } +#ifdef HAS_DEVICE_TREE +static const struct dt_irq __init *ns16550_dt_irq(struct serial_port *port) +{ + struct ns16550 *uart = port->uart; + return &uart->dt_irq; +} +#endif + +#ifdef CONFIG_ARM +static const struct vuart_info *ns16550_vuart_info(struct serial_port *port) +{ + struct ns16550 *uart = port->uart; + + return &uart->vuart; +} +#endif + static struct uart_driver __read_mostly ns16550_driver = { .init_preirq = ns16550_init_preirq, .init_postirq = ns16550_init_postirq, @@ -389,7 +461,13 @@ static struct uart_driver __read_mostly ns16550_driver = { .tx_ready = ns16550_tx_ready, .putc = ns16550_putc, .getc = ns16550_getc, - .irq = ns16550_irq + .irq = ns16550_irq, +#ifdef HAS_DEVICE_TREE + .dt_irq_get = ns16550_dt_irq, +#endif +#ifdef CONFIG_ARM + .vuart_info = ns16550_vuart_info, +#endif }; static int __init parse_parity_char(int c) @@ -414,15 +492,21 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; +#ifdef HAS_IO_PORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. */ if ( uart->io_base >= 0x10000 ) return 1; +#else + return 1; /* Everything is MMIO */ +#endif +#ifdef HAS_PCI pci_serial_early_init(uart); - +#endif + /* * Do a simple existence test first; if we fail this, * there's no point trying anything else. @@ -450,6 +534,7 @@ static int __init check_existence(struct ns16550 *uart) return (status == 0x90); } +#ifdef HAS_PCI static int pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) { @@ -518,6 +603,7 @@ pci_uart_config (struct ns16550 *uart, int skip_amt, int bar_idx) return 0; } +#endif #define PARSE_ERR(_f, _a...) \ do { \ @@ -564,6 +650,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { +#ifdef HAS_PCI if ( strncmp(conf, "pci", 3) == 0 ) { if ( pci_uart_config(uart, 1/* skip AMT */, uart - ns16550_com) ) @@ -577,6 +664,7 @@ static void __init ns16550_parse_port_config( conf += 3; } else +#endif { uart->io_base = simple_strtoul(conf, &conf, 0); } @@ -585,6 +673,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) uart->irq = simple_strtol(conf, &conf, 10); +#ifdef HAS_PCI if ( *conf == ',' && *++conf != ',' ) { conf = parse_pci(conf, NULL, &uart->ps_bdf[0], @@ -601,6 +690,7 @@ static void __init ns16550_parse_port_config( PARSE_ERR("Bad bridge PCI coordinates"); uart->pb_bdf_enable = 1; } +#endif config_parsed: /* Sanity checks. */ @@ -638,12 +728,91 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) uart->stop_bits = defaults->stop_bits; uart->irq = defaults->irq; uart->io_base = defaults->io_base; + uart->io_size = 8; + uart->reg_width = 1; + uart->reg_shift = 0; + /* Default is no transmit FIFO. */ uart->fifo_size = 1; ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } +#ifdef HAS_DEVICE_TREE +static int __init ns16550_uart_dt_init(struct dt_device_node *dev, + const void *data) +{ + struct ns16550 *uart; + int res; + u32 reg_shift, reg_width; + u64 io_size; + + uart = &ns16550_com[0]; + + uart->baud = BAUD_AUTO; + uart->clock_hz = UART_CLOCK_HZ; + uart->data_bits = 8; + uart->parity = UART_PARITY_NONE; + uart->stop_bits = 1; + /* Default is no transmit FIFO. */ + uart->fifo_size = 1; + + res = dt_device_get_address(dev, 0, &uart->io_base, &io_size); + if ( res ) + return res; + + uart->io_size = io_size; + + ASSERT(uart->io_size == io_size); /* Detect truncation */ + + res = dt_property_read_u32(dev, "reg-shift", ®_shift); + if ( !res ) + uart->reg_shift = 0; + else + uart->reg_shift = reg_shift; + + res = dt_property_read_u32(dev, "reg-io-width", ®_width); + if ( !res ) + uart->reg_width = 1; + else + uart->reg_width = reg_width; + + if ( uart->reg_width != 1 && uart->reg_width != 4 ) + return -EINVAL; + + res = dt_device_get_irq(dev, 0, &uart->dt_irq); + if ( res ) + return res; + + /* The common bit of the driver mostly deals with irq not dt_irq. */ + uart->irq = uart->dt_irq.irq; + + uart->vuart.base_addr = uart->io_base; + uart->vuart.size = uart->io_size; + uart->vuart.data_off = UART_THR <reg_shift; + uart->vuart.status_off = UART_LSR<reg_shift; + uart->vuart.status = UART_LSR_THRE|UART_LSR_TEMT; + + /* Register with generic serial driver. */ + serial_register_uart(uart - ns16550_com, &ns16550_driver, uart); + + dt_device_set_used_by(dev, DOMID_XEN); + + return 0; +} + +static const char const *ns16550_dt_compat[] __initconst = +{ + "ns16550", + NULL +}; + +DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL) + .compatible = ns16550_dt_compat, + .init = ns16550_uart_dt_init, +DT_DEVICE_END + +#endif /* HAS_DEVICE_TREE */ /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXce-0001DJ-4D; Sun, 22 Sep 2013 00:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcc-0001D3-7Q for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:58 +0000 Received: from [85.158.139.211:45516] by server-3.bemta-5.messagelabs.com id E7/28-19273-5FA3E325; Sun, 22 Sep 2013 00:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379810035!1143418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12889 invoked from network); 22 Sep 2013 00:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcZ-00068l-9m for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcZ-0000s6-7t for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:55 +0000 Date: Sun, 22 Sep 2013 00:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: support DesignWare 8250 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50417cd978aa54930d065ac1f139f935d14af76d Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:35 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 ns16550: support DesignWare 8250 This hardware has an additional feature which signals an error if you try to write LCR while the UART is busy. We need to clear this error during setup, otherwise LCR.DLAB doesn't get set and we cannot read/write the divisor. This has been tested on the cubieboard2 Signed-off-by: Ian Campbell Acked-by: Keir Fraser Cc: jbeulich@suse.com --- xen/drivers/char/ns16550.c | 14 ++++++++++++++ xen/include/xen/8250-uart.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 45da924..5892eb7 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -61,6 +61,7 @@ static struct ns16550 { struct timer resume_timer; unsigned int timeout_ms; bool_t intr_works; + bool_t dw_usr_bsy; #ifdef HAS_PCI /* PCI card parameters. */ unsigned int pb_bdf[3]; /* pci bridge BDF */ @@ -237,6 +238,16 @@ static void ns16550_setup_preirq(struct ns16550 *uart) /* No interrupts. */ ns_write_reg(uart, UART_IER, 0); + if ( uart->dw_usr_bsy && + (ns_read_reg(uart, UART_IIR) & UART_IIR_BSY) == UART_IIR_BSY ) + { + /* DesignWare 8250 detects if LCR is written while the UART is + * busy and raises a "busy detect" interrupt. Read the UART + * Status Register to clear this state. + */ + ns_read_reg(uart, UART_USR); + } + /* Line control and baud-rate generator. */ ns_write_reg(uart, UART_LCR, lcr | UART_LCR_DLAB); if ( uart->baud != BAUD_AUTO ) @@ -787,6 +798,8 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, /* The common bit of the driver mostly deals with irq not dt_irq. */ uart->irq = uart->dt_irq.irq; + uart->dw_usr_bsy = dt_device_is_compatible(dev, "snps,dw-apb-uart"); + uart->vuart.base_addr = uart->io_base; uart->vuart.size = uart->io_size; uart->vuart.data_off = UART_THR <reg_shift; @@ -804,6 +817,7 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, static const char const *ns16550_dt_compat[] __initconst = { "ns16550", + "snps,dw-apb-uart", NULL }; diff --git a/xen/include/xen/8250-uart.h b/xen/include/xen/8250-uart.h index 8693d15..a682bae 100644 --- a/xen/include/xen/8250-uart.h +++ b/xen/include/xen/8250-uart.h @@ -32,6 +32,7 @@ #define UART_MCR 0x04 /* Modem control */ #define UART_LSR 0x05 /* line status */ #define UART_MSR 0x06 /* Modem status */ +#define UART_USR 0x1f /* Status register (DW) */ #define UART_DLL 0x00 /* divisor latch (ls) (DLAB=1) */ #define UART_DLM 0x01 /* divisor latch (ms) (DLAB=1) */ @@ -48,6 +49,7 @@ #define UART_IIR_RDA 0x04 /* - rx data recv'd */ #define UART_IIR_THR 0x02 /* - tx reg. empty */ #define UART_IIR_MSI 0x00 /* - MODEM status */ +#define UART_IIR_BSY 0x07 /* - busy detect (DW) */ /* FIFO Control Register */ #define UART_FCR_ENABLE 0x01 /* enable FIFO */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00: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 1VNXce-0001DJ-4D; Sun, 22 Sep 2013 00:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcc-0001D3-7Q for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:58 +0000 Received: from [85.158.139.211:45516] by server-3.bemta-5.messagelabs.com id E7/28-19273-5FA3E325; Sun, 22 Sep 2013 00:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1379810035!1143418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12889 invoked from network); 22 Sep 2013 00:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcZ-00068l-9m for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcZ-0000s6-7t for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:33:55 +0000 Date: Sun, 22 Sep 2013 00:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: support DesignWare 8250 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50417cd978aa54930d065ac1f139f935d14af76d Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:35 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 ns16550: support DesignWare 8250 This hardware has an additional feature which signals an error if you try to write LCR while the UART is busy. We need to clear this error during setup, otherwise LCR.DLAB doesn't get set and we cannot read/write the divisor. This has been tested on the cubieboard2 Signed-off-by: Ian Campbell Acked-by: Keir Fraser Cc: jbeulich@suse.com --- xen/drivers/char/ns16550.c | 14 ++++++++++++++ xen/include/xen/8250-uart.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 45da924..5892eb7 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -61,6 +61,7 @@ static struct ns16550 { struct timer resume_timer; unsigned int timeout_ms; bool_t intr_works; + bool_t dw_usr_bsy; #ifdef HAS_PCI /* PCI card parameters. */ unsigned int pb_bdf[3]; /* pci bridge BDF */ @@ -237,6 +238,16 @@ static void ns16550_setup_preirq(struct ns16550 *uart) /* No interrupts. */ ns_write_reg(uart, UART_IER, 0); + if ( uart->dw_usr_bsy && + (ns_read_reg(uart, UART_IIR) & UART_IIR_BSY) == UART_IIR_BSY ) + { + /* DesignWare 8250 detects if LCR is written while the UART is + * busy and raises a "busy detect" interrupt. Read the UART + * Status Register to clear this state. + */ + ns_read_reg(uart, UART_USR); + } + /* Line control and baud-rate generator. */ ns_write_reg(uart, UART_LCR, lcr | UART_LCR_DLAB); if ( uart->baud != BAUD_AUTO ) @@ -787,6 +798,8 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, /* The common bit of the driver mostly deals with irq not dt_irq. */ uart->irq = uart->dt_irq.irq; + uart->dw_usr_bsy = dt_device_is_compatible(dev, "snps,dw-apb-uart"); + uart->vuart.base_addr = uart->io_base; uart->vuart.size = uart->io_size; uart->vuart.data_off = UART_THR <reg_shift; @@ -804,6 +817,7 @@ static int __init ns16550_uart_dt_init(struct dt_device_node *dev, static const char const *ns16550_dt_compat[] __initconst = { "ns16550", + "snps,dw-apb-uart", NULL }; diff --git a/xen/include/xen/8250-uart.h b/xen/include/xen/8250-uart.h index 8693d15..a682bae 100644 --- a/xen/include/xen/8250-uart.h +++ b/xen/include/xen/8250-uart.h @@ -32,6 +32,7 @@ #define UART_MCR 0x04 /* Modem control */ #define UART_LSR 0x05 /* line status */ #define UART_MSR 0x06 /* Modem status */ +#define UART_USR 0x1f /* Status register (DW) */ #define UART_DLL 0x00 /* divisor latch (ls) (DLAB=1) */ #define UART_DLM 0x01 /* divisor latch (ms) (DLAB=1) */ @@ -48,6 +49,7 @@ #define UART_IIR_RDA 0x04 /* - rx data recv'd */ #define UART_IIR_THR 0x02 /* - tx reg. empty */ #define UART_IIR_MSI 0x00 /* - MODEM status */ +#define UART_IIR_BSY 0x07 /* - busy detect (DW) */ /* FIFO Control Register */ #define UART_FCR_ENABLE 0x01 /* enable FIFO */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXcn-0001Eu-7D; Sun, 22 Sep 2013 00:34:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcm-0001EX-1W for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:08 +0000 Received: from [85.158.143.35:16497] by server-1.bemta-4.messagelabs.com id 82/9C-16125-FFA3E325; Sun, 22 Sep 2013 00:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379810045!5815881!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25534 invoked from network); 22 Sep 2013 00:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcj-00069K-GD for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcj-0000se-Do for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:05 +0000 Date: Sun, 22 Sep 2013 00:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Support Cortex-A7 GIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b3c792a0f65391b7c115a81f292ecff9bf151e6 Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:36 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 xen/arm: Support Cortex-A7 GIC Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/gic.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 92a3349..2bc4219 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -135,7 +135,8 @@ #ifndef __ASSEMBLY__ #include -#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic") +#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXcn-0001Eu-7D; Sun, 22 Sep 2013 00:34:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcm-0001EX-1W for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:08 +0000 Received: from [85.158.143.35:16497] by server-1.bemta-4.messagelabs.com id 82/9C-16125-FFA3E325; Sun, 22 Sep 2013 00:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379810045!5815881!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25534 invoked from network); 22 Sep 2013 00:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcj-00069K-GD for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXcj-0000se-Do for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:05 +0000 Date: Sun, 22 Sep 2013 00:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Support Cortex-A7 GIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b3c792a0f65391b7c115a81f292ecff9bf151e6 Author: Ian Campbell AuthorDate: Fri Sep 20 17:18:36 2013 +0100 Commit: Ian Campbell CommitDate: Sat Sep 21 16:27:45 2013 +0100 xen/arm: Support Cortex-A7 GIC Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/gic.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 92a3349..2bc4219 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -135,7 +135,8 @@ #ifndef __ASSEMBLY__ #include -#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic") +#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ + DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXcx-0001Gk-AN; Sun, 22 Sep 2013 00:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcw-0001GR-6I for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:18 +0000 Received: from [193.109.254.147:65174] by server-14.bemta-14.messagelabs.com id A9/CD-07546-90B3E325; Sun, 22 Sep 2013 00:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379810055!3492159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3018 invoked from network); 22 Sep 2013 00:34:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXct-00069Q-Oc for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXct-0000t4-Ju for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:15 +0000 Date: Sun, 22 Sep 2013 00:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix nodename generation in init_netfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e7da90205a08b9ab31f4ada97c2d5bab491c2ec Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:57 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:41:42 2013 +0100 mini-os: fix nodename generation in init_netfront Using strlen here makes no sense. Coverity-ID: 1056053 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 4e087a5..a999985 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -309,8 +309,10 @@ struct netfront_dev *init_netfront(char *_nodename, void (*thenetif_rx)(unsigned if (!_nodename) snprintf(nodename, sizeof(nodename), "device/vif/%d", netfrontends); - else - strncpy(nodename, _nodename, strlen(nodename)); + else { + strncpy(nodename, _nodename, sizeof(nodename) - 1); + nodename[sizeof(nodename) - 1] = 0; + } netfrontends++; if (!thenetif_rx) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXcx-0001Gk-AN; Sun, 22 Sep 2013 00:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXcw-0001GR-6I for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:18 +0000 Received: from [193.109.254.147:65174] by server-14.bemta-14.messagelabs.com id A9/CD-07546-90B3E325; Sun, 22 Sep 2013 00:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379810055!3492159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3018 invoked from network); 22 Sep 2013 00:34:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXct-00069Q-Oc for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXct-0000t4-Ju for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:15 +0000 Date: Sun, 22 Sep 2013 00:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix nodename generation in init_netfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e7da90205a08b9ab31f4ada97c2d5bab491c2ec Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:57 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:41:42 2013 +0100 mini-os: fix nodename generation in init_netfront Using strlen here makes no sense. Coverity-ID: 1056053 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 4e087a5..a999985 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -309,8 +309,10 @@ struct netfront_dev *init_netfront(char *_nodename, void (*thenetif_rx)(unsigned if (!_nodename) snprintf(nodename, sizeof(nodename), "device/vif/%d", netfrontends); - else - strncpy(nodename, _nodename, strlen(nodename)); + else { + strncpy(nodename, _nodename, sizeof(nodename) - 1); + nodename[sizeof(nodename) - 1] = 0; + } netfrontends++; if (!thenetif_rx) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXd8-0001J0-DQ; Sun, 22 Sep 2013 00:34:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXd6-0001IY-OT for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:28 +0000 Received: from [85.158.137.68:6943] by server-6.bemta-3.messagelabs.com id D4/38-04812-31B3E325; Sun, 22 Sep 2013 00:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379810066!3920439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6480 invoked from network); 22 Sep 2013 00:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXd4-00069d-0B for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXd3-0000tU-Sm for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:25 +0000 Date: Sun, 22 Sep 2013 00:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in blkfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74ca2b137585eba5e5a64a301d3628a07460a28f Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:58 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:41:55 2013 +0100 mini-os: fix various memory leaks in blkfront Coverity-ID: 1055814 Coverity-ID: 1055815 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/blkfront.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index ddcf665..aead6bd 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -250,7 +250,7 @@ error: void shutdown_blkfront(struct blkfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -295,12 +295,15 @@ void shutdown_blkfront(struct blkfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_blkfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXd8-0001J0-DQ; Sun, 22 Sep 2013 00:34:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXd6-0001IY-OT for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:28 +0000 Received: from [85.158.137.68:6943] by server-6.bemta-3.messagelabs.com id D4/38-04812-31B3E325; Sun, 22 Sep 2013 00:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1379810066!3920439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6480 invoked from network); 22 Sep 2013 00:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXd4-00069d-0B for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXd3-0000tU-Sm for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:25 +0000 Date: Sun, 22 Sep 2013 00:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in blkfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74ca2b137585eba5e5a64a301d3628a07460a28f Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:58 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:41:55 2013 +0100 mini-os: fix various memory leaks in blkfront Coverity-ID: 1055814 Coverity-ID: 1055815 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/blkfront.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index ddcf665..aead6bd 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -250,7 +250,7 @@ error: void shutdown_blkfront(struct blkfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -295,12 +295,15 @@ void shutdown_blkfront(struct blkfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_blkfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXdI-0001Kt-H0; Sun, 22 Sep 2013 00:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdG-0001Ka-Vy for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:39 +0000 Received: from [193.109.254.147:52164] by server-6.bemta-14.messagelabs.com id DD/08-20235-E1B3E325; Sun, 22 Sep 2013 00:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1379810076!733103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26183 invoked from network); 22 Sep 2013 00:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdE-00069l-AR for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdE-0000tw-80 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:36 +0000 Date: Sun, 22 Sep 2013 00:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in {fb, kbd}front X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00f502ebfebd60eb24452c5ae1c467f559157e94 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:59 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:07 2013 +0100 mini-os: fix various memory leaks in {fb, kbd}front Coverity-ID: 1055819-1055826 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/fbfront.c | 48 +++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 3d0b8f5..a276193 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -171,7 +171,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -181,7 +182,8 @@ done: if((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state: %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -236,7 +238,7 @@ int kbdfront_receive(struct kbdfront_dev *dev, union xenkbd_in_event *buf, int n void shutdown_kbdfront(struct kbdfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -278,14 +280,18 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) close_kbdfront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_kbdfront(dev); @@ -405,7 +411,7 @@ struct fbfront_dev *init_fbfront(char *_nodename, unsigned long *mfns, int width char* message=NULL; struct xenfb_page *s; int retry=0; - char* msg; + char* msg=NULL; int i, j; struct fbfront_dev *dev; int max_pd; @@ -532,7 +538,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -545,7 +552,8 @@ done: if ((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state: %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -556,6 +564,7 @@ done: return dev; error: + free(msg); free(err); free_fbfront(dev); return NULL; @@ -627,7 +636,7 @@ void fbfront_resize(struct fbfront_dev *dev, int width, int height, int stride, void shutdown_fbfront(struct fbfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -654,7 +663,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) } state = xenbus_read_integer(path); if (state < XenbusStateClosed) { - xenbus_wait_for_state_change(path, &state, &dev->events); + err = xenbus_wait_for_state_change(path, &state, &dev->events); if (err) free(err); } @@ -669,16 +678,21 @@ void shutdown_fbfront(struct fbfront_dev *dev) close_fbfront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_fbfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXdI-0001Kt-H0; Sun, 22 Sep 2013 00:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdG-0001Ka-Vy for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:39 +0000 Received: from [193.109.254.147:52164] by server-6.bemta-14.messagelabs.com id DD/08-20235-E1B3E325; Sun, 22 Sep 2013 00:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1379810076!733103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26183 invoked from network); 22 Sep 2013 00:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdE-00069l-AR for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdE-0000tw-80 for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:36 +0000 Date: Sun, 22 Sep 2013 00:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in {fb, kbd}front X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00f502ebfebd60eb24452c5ae1c467f559157e94 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:59 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:07 2013 +0100 mini-os: fix various memory leaks in {fb, kbd}front Coverity-ID: 1055819-1055826 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/fbfront.c | 48 +++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 3d0b8f5..a276193 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -171,7 +171,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -181,7 +182,8 @@ done: if((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state: %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -236,7 +238,7 @@ int kbdfront_receive(struct kbdfront_dev *dev, union xenkbd_in_event *buf, int n void shutdown_kbdfront(struct kbdfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -278,14 +280,18 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) close_kbdfront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_kbdfront(dev); @@ -405,7 +411,7 @@ struct fbfront_dev *init_fbfront(char *_nodename, unsigned long *mfns, int width char* message=NULL; struct xenfb_page *s; int retry=0; - char* msg; + char* msg=NULL; int i, j; struct fbfront_dev *dev; int max_pd; @@ -532,7 +538,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -545,7 +552,8 @@ done: if ((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state: %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -556,6 +564,7 @@ done: return dev; error: + free(msg); free(err); free_fbfront(dev); return NULL; @@ -627,7 +636,7 @@ void fbfront_resize(struct fbfront_dev *dev, int width, int height, int stride, void shutdown_fbfront(struct fbfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -654,7 +663,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) } state = xenbus_read_integer(path); if (state < XenbusStateClosed) { - xenbus_wait_for_state_change(path, &state, &dev->events); + err = xenbus_wait_for_state_change(path, &state, &dev->events); if (err) free(err); } @@ -669,16 +678,21 @@ void shutdown_fbfront(struct fbfront_dev *dev) close_fbfront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_fbfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXdR-0001MR-KH; Sun, 22 Sep 2013 00:34:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdR-0001MH-6X for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:49 +0000 Received: from [193.109.254.147:58649] by server-7.bemta-14.messagelabs.com id FD/2E-04456-82B3E325; Sun, 22 Sep 2013 00:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1379810086!628083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26471 invoked from network); 22 Sep 2013 00:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdO-00069r-Gf for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdO-0000uL-EP for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:46 +0000 Date: Sun, 22 Sep 2013 00:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in netfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 927c43c82b4af7347d667da5549503bb5af17b97 Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:00 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:20 2013 +0100 mini-os: fix various memory leaks in netfront Coverity-ID: 1055832 Coverity-ID: 1055833 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index a999985..3a5be64 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -506,7 +506,7 @@ int netfront_tap_open(char *nodename) { void shutdown_netfront(struct netfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -549,16 +549,21 @@ void shutdown_netfront(struct netfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_netfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:34:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:34: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 1VNXdR-0001MR-KH; Sun, 22 Sep 2013 00:34:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdR-0001MH-6X for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:49 +0000 Received: from [193.109.254.147:58649] by server-7.bemta-14.messagelabs.com id FD/2E-04456-82B3E325; Sun, 22 Sep 2013 00:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1379810086!628083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26471 invoked from network); 22 Sep 2013 00:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdO-00069r-Gf for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdO-0000uL-EP for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:46 +0000 Date: Sun, 22 Sep 2013 00:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in netfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 927c43c82b4af7347d667da5549503bb5af17b97 Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:00 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:20 2013 +0100 mini-os: fix various memory leaks in netfront Coverity-ID: 1055832 Coverity-ID: 1055833 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/netfront.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index a999985..3a5be64 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -506,7 +506,7 @@ int netfront_tap_open(char *nodename) { void shutdown_netfront(struct netfront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -549,16 +549,21 @@ void shutdown_netfront(struct netfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_netfront(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdb-0001Nu-NU; Sun, 22 Sep 2013 00:34:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdb-0001Nk-6v for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:59 +0000 Received: from [85.158.143.35:17662] by server-1.bemta-4.messagelabs.com id 92/BC-16125-23B3E325; Sun, 22 Sep 2013 00:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379810096!5817553!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7418 invoked from network); 22 Sep 2013 00:34:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdY-0006A0-Ld for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdY-0000vU-KV for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:56 +0000 Date: Sun, 22 Sep 2013 00:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in pcifront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a384c17325618bc3f93d0b293d9be0dddfa53e6b Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:01 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:31 2013 +0100 mini-os: fix various memory leaks in pcifront Coverity-ID: 1055834-1055840 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/pcifront.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index cdf9c9b..7838021 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -122,11 +122,12 @@ void pcifront_watches(void *opaque) } else if (state == XenbusStateClosing) break; } - if (err) + if (err) { printk("pcifront_watches: done waiting err=%s\n", err); - else + free(err); + } else printk("pcifront_watches: done waiting\n"); - xenbus_unwatch_path_token(XBT_NIL, be_state, be_state); + err = xenbus_unwatch_path_token(XBT_NIL, be_state, be_state); shutdown_pcifront(pcidev); free(be_state); free(be_path); @@ -143,7 +144,7 @@ struct pcifront_dev *init_pcifront(char *_nodename) char* err; char* message=NULL; int retry=0; - char* msg; + char* msg = NULL; char* nodename = _nodename ? _nodename : "device/pci/0"; int dom; @@ -250,7 +251,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not avalable, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -258,7 +260,8 @@ done: if ((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -272,6 +275,7 @@ done: return dev; error: + free(msg); free(err); free_pcifront(dev); return NULL; @@ -301,6 +305,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u msg = xenbus_read(XBT_NIL, path, &s); if (msg) { printk("Error %s when reading the PCI root name at %s\n", msg, path); + free(msg); continue; } @@ -319,7 +324,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u void shutdown_pcifront(struct pcifront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -361,12 +366,15 @@ void shutdown_pcifront(struct pcifront_dev *dev) close_pcifront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_pcifront(dev); @@ -397,6 +405,7 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev, msg = xenbus_read(XBT_NIL, path, &s); if (msg) { printk("Error %s when reading the PCI root name at %s\n", msg, path); + free(msg); 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 Sun Sep 22 00:35:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdb-0001Nu-NU; Sun, 22 Sep 2013 00:34:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdb-0001Nk-6v for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:59 +0000 Received: from [85.158.143.35:17662] by server-1.bemta-4.messagelabs.com id 92/BC-16125-23B3E325; Sun, 22 Sep 2013 00:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1379810096!5817553!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7418 invoked from network); 22 Sep 2013 00:34:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdY-0006A0-Ld for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdY-0000vU-KV for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:34:56 +0000 Date: Sun, 22 Sep 2013 00:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in pcifront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a384c17325618bc3f93d0b293d9be0dddfa53e6b Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:01 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:31 2013 +0100 mini-os: fix various memory leaks in pcifront Coverity-ID: 1055834-1055840 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/pcifront.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index cdf9c9b..7838021 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -122,11 +122,12 @@ void pcifront_watches(void *opaque) } else if (state == XenbusStateClosing) break; } - if (err) + if (err) { printk("pcifront_watches: done waiting err=%s\n", err); - else + free(err); + } else printk("pcifront_watches: done waiting\n"); - xenbus_unwatch_path_token(XBT_NIL, be_state, be_state); + err = xenbus_unwatch_path_token(XBT_NIL, be_state, be_state); shutdown_pcifront(pcidev); free(be_state); free(be_path); @@ -143,7 +144,7 @@ struct pcifront_dev *init_pcifront(char *_nodename) char* err; char* message=NULL; int retry=0; - char* msg; + char* msg = NULL; char* nodename = _nodename ? _nodename : "device/pci/0"; int dom; @@ -250,7 +251,8 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not avalable, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -258,7 +260,8 @@ done: if ((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) != NULL) { printk("error switching state %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + free(err); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } @@ -272,6 +275,7 @@ done: return dev; error: + free(msg); free(err); free_pcifront(dev); return NULL; @@ -301,6 +305,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u msg = xenbus_read(XBT_NIL, path, &s); if (msg) { printk("Error %s when reading the PCI root name at %s\n", msg, path); + free(msg); continue; } @@ -319,7 +324,7 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u void shutdown_pcifront(struct pcifront_dev *dev) { - char* err = NULL; + char* err = NULL, *err2; XenbusState state; char path[strlen(dev->backend) + strlen("/state") + 1]; @@ -361,12 +366,15 @@ void shutdown_pcifront(struct pcifront_dev *dev) close_pcifront: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); - xenbus_rm(XBT_NIL, nodename); + err2 = xenbus_rm(XBT_NIL, nodename); + if (err2) free(err2); if (!err) free_pcifront(dev); @@ -397,6 +405,7 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev, msg = xenbus_read(XBT_NIL, path, &s); if (msg) { printk("Error %s when reading the PCI root name at %s\n", msg, path); + free(msg); 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 Sun Sep 22 00:35:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdm-0001Q4-Sd; Sun, 22 Sep 2013 00:35:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdl-0001Pd-Bn for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:09 +0000 Received: from [193.109.254.147:8578] by server-1.bemta-14.messagelabs.com id 3E/6C-04740-C3B3E325; Sun, 22 Sep 2013 00:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379810107!311196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20920 invoked from network); 22 Sep 2013 00:35: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; 22 Sep 2013 00:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdi-0006AZ-SL for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdi-0000w5-QQ for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:06 +0000 Date: Sun, 22 Sep 2013 00:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in consfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2849d8fabab965973e23ac23fd28afd2873bac8 Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:02 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:42 2013 +0100 mini-os: fix various memory leaks in consfront Coverity-ID: 1055816 Coverity-ID: 1055817 Coverity-ID: 1055818 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/console/xenbus.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 4194982..b317114 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -42,7 +42,8 @@ void free_consfront(struct consfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); mask_evtchn(dev->evtchn); unbind_evtchn(dev->evtchn); @@ -58,7 +59,7 @@ close: struct consfront_dev *init_consfront(char *_nodename) { xenbus_transaction_t xbt; - char* err; + char* err = NULL; char* message=NULL; int retry=0; char* msg = NULL; @@ -87,7 +88,7 @@ struct consfront_dev *init_consfront(char *_nodename) snprintf(path, sizeof(path), "%s/backend-id", nodename); if ((res = xenbus_read_integer(path)) < 0) - return NULL; + goto error; else dev->dom = res; evtchn_alloc_unbound(dev->dom, console_handle_input, dev, &dev->evtchn); @@ -170,7 +171,7 @@ done: msg = xenbus_wait_for_state_change(path, &state, &dev->events); if (msg != NULL || state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdm-0001Q4-Sd; Sun, 22 Sep 2013 00:35:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdl-0001Pd-Bn for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:09 +0000 Received: from [193.109.254.147:8578] by server-1.bemta-14.messagelabs.com id 3E/6C-04740-C3B3E325; Sun, 22 Sep 2013 00:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379810107!311196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20920 invoked from network); 22 Sep 2013 00:35: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; 22 Sep 2013 00:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdi-0006AZ-SL for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdi-0000w5-QQ for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:06 +0000 Date: Sun, 22 Sep 2013 00:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in consfront X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2849d8fabab965973e23ac23fd28afd2873bac8 Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:02 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:42:42 2013 +0100 mini-os: fix various memory leaks in consfront Coverity-ID: 1055816 Coverity-ID: 1055817 Coverity-ID: 1055818 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/console/xenbus.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index 4194982..b317114 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -42,7 +42,8 @@ void free_consfront(struct consfront_dev *dev) close: if (err) free(err); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); + if (err) free(err); mask_evtchn(dev->evtchn); unbind_evtchn(dev->evtchn); @@ -58,7 +59,7 @@ close: struct consfront_dev *init_consfront(char *_nodename) { xenbus_transaction_t xbt; - char* err; + char* err = NULL; char* message=NULL; int retry=0; char* msg = NULL; @@ -87,7 +88,7 @@ struct consfront_dev *init_consfront(char *_nodename) snprintf(path, sizeof(path), "%s/backend-id", nodename); if ((res = xenbus_read_integer(path)) < 0) - return NULL; + goto error; else dev->dom = res; evtchn_alloc_unbound(dev->dom, console_handle_input, dev, &dev->evtchn); @@ -170,7 +171,7 @@ done: msg = xenbus_wait_for_state_change(path, &state, &dev->events); if (msg != NULL || state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - xenbus_unwatch_path_token(XBT_NIL, path, path); + err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdw-0001SH-WA; Sun, 22 Sep 2013 00:35:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdv-0001Rx-MI for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:19 +0000 Received: from [85.158.143.35:44770] by server-1.bemta-4.messagelabs.com id 70/CC-16125-74B3E325; Sun, 22 Sep 2013 00:35:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379810117!5815981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28233 invoked from network); 22 Sep 2013 00:35:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:35:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdt-0006Af-4W for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdt-0000wV-0A for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:17 +0000 Date: Sun, 22 Sep 2013 00:35:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in various locations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ea48409238672ed1e08cf8fa2cc8593e36a363a Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:03 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:43:04 2013 +0100 mini-os: fix various memory leaks in various locations Coverity-ID: 1055827 Coverity-ID: 1055828 Coverity-ID: 1055829 Coverity-ID: 1055830 Coverity-ID: 1055831 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/kernel.c | 7 +++++-- extras/mini-os/lib/xs.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index e9402b9..24fa25c 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -84,8 +84,10 @@ static void shutdown_thread(void *p) free(err); xenbus_wait_for_watch(&events); } - xenbus_unwatch_path_token(XBT_NIL, path, token); - xenbus_write(XBT_NIL, path, ""); + err = xenbus_unwatch_path_token(XBT_NIL, path, token); + if (err) free(err); + err = xenbus_write(XBT_NIL, path, ""); + if (err) free(err); printk("Shutting down (%s)\n", shutdown); if (!strcmp(shutdown, "poweroff")) @@ -96,6 +98,7 @@ static void shutdown_thread(void *p) /* Unknown */ shutdown_reason = SHUTDOWN_crash; app_shutdown(shutdown_reason); + free(shutdown); } #endif diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c index c603d17..324bd05 100644 --- a/extras/mini-os/lib/xs.c +++ b/extras/mini-os/lib/xs.c @@ -144,6 +144,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t t, msg = xenbus_ls(t, path, &res); if (msg) { printk("xs_directory(%s): %s\n", path, msg); + free(msg); return NULL; } @@ -163,6 +164,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t t, } *num = n; + free(res); return entries; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXdw-0001SH-WA; Sun, 22 Sep 2013 00:35:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdv-0001Rx-MI for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:19 +0000 Received: from [85.158.143.35:44770] by server-1.bemta-4.messagelabs.com id 70/CC-16125-74B3E325; Sun, 22 Sep 2013 00:35:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379810117!5815981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28233 invoked from network); 22 Sep 2013 00:35:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:35:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXdt-0006Af-4W for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXdt-0000wV-0A for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:17 +0000 Date: Sun, 22 Sep 2013 00:35:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: fix various memory leaks in various locations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ea48409238672ed1e08cf8fa2cc8593e36a363a Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:03 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:43:04 2013 +0100 mini-os: fix various memory leaks in various locations Coverity-ID: 1055827 Coverity-ID: 1055828 Coverity-ID: 1055829 Coverity-ID: 1055830 Coverity-ID: 1055831 Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/kernel.c | 7 +++++-- extras/mini-os/lib/xs.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index e9402b9..24fa25c 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -84,8 +84,10 @@ static void shutdown_thread(void *p) free(err); xenbus_wait_for_watch(&events); } - xenbus_unwatch_path_token(XBT_NIL, path, token); - xenbus_write(XBT_NIL, path, ""); + err = xenbus_unwatch_path_token(XBT_NIL, path, token); + if (err) free(err); + err = xenbus_write(XBT_NIL, path, ""); + if (err) free(err); printk("Shutting down (%s)\n", shutdown); if (!strcmp(shutdown, "poweroff")) @@ -96,6 +98,7 @@ static void shutdown_thread(void *p) /* Unknown */ shutdown_reason = SHUTDOWN_crash; app_shutdown(shutdown_reason); + free(shutdown); } #endif diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c index c603d17..324bd05 100644 --- a/extras/mini-os/lib/xs.c +++ b/extras/mini-os/lib/xs.c @@ -144,6 +144,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t t, msg = xenbus_ls(t, path, &res); if (msg) { printk("xs_directory(%s): %s\n", path, msg); + free(msg); return NULL; } @@ -163,6 +164,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t t, } *num = n; + free(res); return entries; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXe7-0001US-3L; Sun, 22 Sep 2013 00:35:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXe6-0001U9-5X for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:30 +0000 Received: from [85.158.137.68:12123] by server-5.bemta-3.messagelabs.com id 4B/02-23058-15B3E325; Sun, 22 Sep 2013 00:35:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379810127!3922762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11346 invoked from network); 22 Sep 2013 00:35:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:35:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXe3-0006Al-9l for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXe3-0000wt-7z for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:27 +0000 Date: Sun, 22 Sep 2013 00:35:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gdbsx: clear sockaddr before using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1bfef44580d73943bd9453167e5614db13927f Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:04 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:43:13 2013 +0100 gdbsx: clear sockaddr before using it ...so that sin_zero is actually zero. Coverity-ID: 1056070 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/debugger/gdbsx/gx/gx_comm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/debugger/gdbsx/gx/gx_comm.c b/tools/debugger/gdbsx/gx/gx_comm.c index ed4a7be..7680dbd 100644 --- a/tools/debugger/gdbsx/gx/gx_comm.c +++ b/tools/debugger/gdbsx/gx/gx_comm.c @@ -84,6 +84,7 @@ do_tcp(char *port_str) tmp = 1; setsockopt(sock_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&tmp,sizeof(tmp)); + memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = PF_INET; sockaddr.sin_port = htons (port); sockaddr.sin_addr.s_addr = INADDR_ANY; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 22 00:35:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Sep 2013 00:35: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 1VNXe7-0001US-3L; Sun, 22 Sep 2013 00:35:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXe6-0001U9-5X for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:30 +0000 Received: from [85.158.137.68:12123] by server-5.bemta-3.messagelabs.com id 4B/02-23058-15B3E325; Sun, 22 Sep 2013 00:35:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1379810127!3922762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11346 invoked from network); 22 Sep 2013 00:35:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2013 00:35:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VNXe3-0006Al-9l for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VNXe3-0000wt-7z for xen-changelog@lists.xensource.com; Sun, 22 Sep 2013 00:35:27 +0000 Date: Sun, 22 Sep 2013 00:35:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gdbsx: clear sockaddr before using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1bfef44580d73943bd9453167e5614db13927f Author: Matthew Daley AuthorDate: Wed Sep 18 15:38:04 2013 +1200 Commit: Ian Campbell CommitDate: Sat Sep 21 16:43:13 2013 +0100 gdbsx: clear sockaddr before using it ...so that sin_zero is actually zero. Coverity-ID: 1056070 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/debugger/gdbsx/gx/gx_comm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/debugger/gdbsx/gx/gx_comm.c b/tools/debugger/gdbsx/gx/gx_comm.c index ed4a7be..7680dbd 100644 --- a/tools/debugger/gdbsx/gx/gx_comm.c +++ b/tools/debugger/gdbsx/gx/gx_comm.c @@ -84,6 +84,7 @@ do_tcp(char *port_str) tmp = 1; setsockopt(sock_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&tmp,sizeof(tmp)); + memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = PF_INET; sockaddr.sin_port = htons (port); sockaddr.sin_addr.s_addr = INADDR_ANY; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHX-0004JF-K4; Mon, 23 Sep 2013 23:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHW-0004J9-JY for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:06 +0000 Received: from [193.109.254.147:33102] by server-12.bemta-14.messagelabs.com id 4B/34-27329-98AC0425; Mon, 23 Sep 2013 23:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1379977864!1560100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12284 invoked from network); 23 Sep 2013 23:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHU-00031H-3x for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHT-0006Ig-HG for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:03 +0000 Date: Mon, 23 Sep 2013 23:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched/arinc653: check for guest data transfer failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a10907615c42b71f1dde01bc190d339e9db051b Author: Matthew Daley AuthorDate: Mon Sep 23 16:20:59 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:20:59 2013 +0200 sched/arinc653: check for guest data transfer failures Coverity-ID: 1055121 Coverity-ID: 1055122 Coverity-ID: 1055123 Coverity-ID: 1055124 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser master commit: 546ba2f17008387cf9821df46e6dac04f0883a9b master date: 2013-09-10 17:16:02 +0200 --- xen/common/sched_arinc653.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 63ddb82..2502192 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -635,12 +635,21 @@ a653sched_adjust_global(const struct scheduler *ops, switch ( sc->cmd ) { case XEN_SYSCTL_SCHEDOP_putinfo: - copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1); + if ( copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1) ) + { + rc = -EFAULT; + break; + } + rc = arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: rc = arinc653_sched_get(ops, &local_sched); - copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1); + if ( rc ) + break; + + if ( copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1) ) + rc = -EFAULT; break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHX-0004JF-K4; Mon, 23 Sep 2013 23:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHW-0004J9-JY for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:06 +0000 Received: from [193.109.254.147:33102] by server-12.bemta-14.messagelabs.com id 4B/34-27329-98AC0425; Mon, 23 Sep 2013 23:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1379977864!1560100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12284 invoked from network); 23 Sep 2013 23:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHU-00031H-3x for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHT-0006Ig-HG for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:03 +0000 Date: Mon, 23 Sep 2013 23:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched/arinc653: check for guest data transfer failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a10907615c42b71f1dde01bc190d339e9db051b Author: Matthew Daley AuthorDate: Mon Sep 23 16:20:59 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:20:59 2013 +0200 sched/arinc653: check for guest data transfer failures Coverity-ID: 1055121 Coverity-ID: 1055122 Coverity-ID: 1055123 Coverity-ID: 1055124 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: George Dunlap Acked-by: Keir Fraser master commit: 546ba2f17008387cf9821df46e6dac04f0883a9b master date: 2013-09-10 17:16:02 +0200 --- xen/common/sched_arinc653.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 63ddb82..2502192 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -635,12 +635,21 @@ a653sched_adjust_global(const struct scheduler *ops, switch ( sc->cmd ) { case XEN_SYSCTL_SCHEDOP_putinfo: - copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1); + if ( copy_from_guest(&local_sched, sc->u.sched_arinc653.schedule, 1) ) + { + rc = -EFAULT; + break; + } + rc = arinc653_sched_set(ops, &local_sched); break; case XEN_SYSCTL_SCHEDOP_getinfo: rc = arinc653_sched_get(ops, &local_sched); - copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1); + if ( rc ) + break; + + if ( copy_to_guest(sc->u.sched_arinc653.schedule, &local_sched, 1) ) + rc = -EFAULT; break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23: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 1VOFHj-0004K1-NS; Mon, 23 Sep 2013 23:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHh-0004Jr-QF for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:18 +0000 Received: from [85.158.143.35:2407] by server-1.bemta-4.messagelabs.com id F1/03-16125-59AC0425; Mon, 23 Sep 2013 23:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379977875!923100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23595 invoked from network); 23 Sep 2013 23:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHe-00031K-NU for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHe-0006J4-Ea for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:14 +0000 Date: Mon, 23 Sep 2013 23:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: fix memory cut-off when using PFN compression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9db6b06dd235976e4cbf69625bd53391cc9f094 Author: Jan Beulich AuthorDate: Mon Sep 23 16:21:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:21:52 2013 +0200 x86: fix memory cut-off when using PFN compression For one setup_max_pdx(), when invoked a second time (after SRAT got parsed), needs to start from the original max_page value again (using the already adjusted one from the first invocation would not allow the cut-off boundary to be moved up). Second, _if_ we need to cut off some part of memory, we must not allow this to also propagate into the NUMA accounting. Otherwise cutoff_node() results in nodes_cover_memory() to find some parts of memory apparently not having a PXM association, causing all SRAT info to be ignored. The only possibly problematic consumer of node_spanned_pages (the meaning of which gets altered here in that it now also includes memory Xen can't actively make use of) is XEN_SYSCTL_numainfo: At a first glance the potentially larger reported memory size shouldn't confuse tool stacks. And finally we must not put our boot time modules at addresses which (at that time) can't be guaranteed to be accessible later. This applies to both the EFI boot loader and the module relocation code. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Dario Faggioli master commit: 8efce9d69998a3d3c720ac7dbdb9b7e240369957 master date: 2013-09-12 09:52:53 +0200 --- xen/arch/x86/efi/boot.c | 3 ++- xen/arch/x86/setup.c | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 055ac13..66a6fdb 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -459,7 +459,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, what = what ?: L"Seek"; else { - file->addr = (EFI_PHYSICAL_ADDRESS)1 << (32 + PAGE_SHIFT); + file->addr = min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(size), &file->addr); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index a70d31b..0b92874 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -377,9 +377,9 @@ static uint64_t __init consider_modules( return e; } -static void __init setup_max_pdx(void) +static void __init setup_max_pdx(unsigned long top_page) { - max_pdx = pfn_to_pdx(max_page - 1) + 1; + max_pdx = pfn_to_pdx(top_page - 1) + 1; if ( max_pdx > (DIRECTMAP_SIZE >> PAGE_SHIFT) ) max_pdx = DIRECTMAP_SIZE >> PAGE_SHIFT; @@ -547,7 +547,7 @@ void __init __start_xen(unsigned long mbi_p) unsigned int initrdidx; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_headroom, *module_map; + unsigned long nr_pages, raw_max_page, modules_headroom, *module_map; int i, j, e820_warn = 0, bytes = 0; bool_t acpi_boot_table_init_done = 0; struct ns16550_defaults ns16550 = { @@ -751,7 +751,7 @@ void __init __start_xen(unsigned long mbi_p) } /* Sanitise the raw E820 map to produce a final clean version. */ - max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); + max_page = raw_max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); /* Create a temporary copy of the E820 map. */ memcpy(&boot_e820, &e820, sizeof(e820)); @@ -820,7 +820,10 @@ void __init __start_xen(unsigned long mbi_p) (end - s) >> PAGE_SHIFT, PAGE_HYPERVISOR); } - e = min_t(uint64_t, e, 1ULL << (PAGE_SHIFT + 32)); + if ( e > min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)) ) + e = min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)); #define reloc_size ((__pa(&_end) + mask) & ~mask) /* Is the region suitable for relocating Xen? */ if ( !xen_phys_start && e <= limit ) @@ -969,7 +972,7 @@ void __init __start_xen(unsigned long mbi_p) /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(&boot_e820); - setup_max_pdx(); + setup_max_pdx(raw_max_page); if ( highmem_start ) xenheap_max_mfn(PFN_DOWN(highmem_start)); @@ -995,7 +998,7 @@ void __init __start_xen(unsigned long mbi_p) { acpi_boot_table_init_done = 1; srat_parse_regions(s); - setup_max_pdx(); + setup_max_pdx(raw_max_page); } if ( pfn_to_pdx((e - 1) >> PAGE_SHIFT) >= max_pdx ) @@ -1133,7 +1136,7 @@ void __init __start_xen(unsigned long mbi_p) acpi_numa_init(); - numa_initmem_init(0, max_page); + numa_initmem_init(0, raw_max_page); end_boot_allocator(); system_state = SYS_STATE_boot; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23: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 1VOFHj-0004K1-NS; Mon, 23 Sep 2013 23:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHh-0004Jr-QF for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:18 +0000 Received: from [85.158.143.35:2407] by server-1.bemta-4.messagelabs.com id F1/03-16125-59AC0425; Mon, 23 Sep 2013 23:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1379977875!923100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23595 invoked from network); 23 Sep 2013 23:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHe-00031K-NU for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHe-0006J4-Ea for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:14 +0000 Date: Mon, 23 Sep 2013 23:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: fix memory cut-off when using PFN compression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9db6b06dd235976e4cbf69625bd53391cc9f094 Author: Jan Beulich AuthorDate: Mon Sep 23 16:21:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:21:52 2013 +0200 x86: fix memory cut-off when using PFN compression For one setup_max_pdx(), when invoked a second time (after SRAT got parsed), needs to start from the original max_page value again (using the already adjusted one from the first invocation would not allow the cut-off boundary to be moved up). Second, _if_ we need to cut off some part of memory, we must not allow this to also propagate into the NUMA accounting. Otherwise cutoff_node() results in nodes_cover_memory() to find some parts of memory apparently not having a PXM association, causing all SRAT info to be ignored. The only possibly problematic consumer of node_spanned_pages (the meaning of which gets altered here in that it now also includes memory Xen can't actively make use of) is XEN_SYSCTL_numainfo: At a first glance the potentially larger reported memory size shouldn't confuse tool stacks. And finally we must not put our boot time modules at addresses which (at that time) can't be guaranteed to be accessible later. This applies to both the EFI boot loader and the module relocation code. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Dario Faggioli master commit: 8efce9d69998a3d3c720ac7dbdb9b7e240369957 master date: 2013-09-12 09:52:53 +0200 --- xen/arch/x86/efi/boot.c | 3 ++- xen/arch/x86/setup.c | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 055ac13..66a6fdb 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -459,7 +459,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, what = what ?: L"Seek"; else { - file->addr = (EFI_PHYSICAL_ADDRESS)1 << (32 + PAGE_SHIFT); + file->addr = min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(size), &file->addr); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index a70d31b..0b92874 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -377,9 +377,9 @@ static uint64_t __init consider_modules( return e; } -static void __init setup_max_pdx(void) +static void __init setup_max_pdx(unsigned long top_page) { - max_pdx = pfn_to_pdx(max_page - 1) + 1; + max_pdx = pfn_to_pdx(top_page - 1) + 1; if ( max_pdx > (DIRECTMAP_SIZE >> PAGE_SHIFT) ) max_pdx = DIRECTMAP_SIZE >> PAGE_SHIFT; @@ -547,7 +547,7 @@ void __init __start_xen(unsigned long mbi_p) unsigned int initrdidx; multiboot_info_t *mbi = __va(mbi_p); module_t *mod = (module_t *)__va(mbi->mods_addr); - unsigned long nr_pages, modules_headroom, *module_map; + unsigned long nr_pages, raw_max_page, modules_headroom, *module_map; int i, j, e820_warn = 0, bytes = 0; bool_t acpi_boot_table_init_done = 0; struct ns16550_defaults ns16550 = { @@ -751,7 +751,7 @@ void __init __start_xen(unsigned long mbi_p) } /* Sanitise the raw E820 map to produce a final clean version. */ - max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); + max_page = raw_max_page = init_e820(memmap_type, e820_raw, &e820_raw_nr); /* Create a temporary copy of the E820 map. */ memcpy(&boot_e820, &e820, sizeof(e820)); @@ -820,7 +820,10 @@ void __init __start_xen(unsigned long mbi_p) (end - s) >> PAGE_SHIFT, PAGE_HYPERVISOR); } - e = min_t(uint64_t, e, 1ULL << (PAGE_SHIFT + 32)); + if ( e > min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)) ) + e = min(HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START, + 1UL << (PAGE_SHIFT + 32)); #define reloc_size ((__pa(&_end) + mask) & ~mask) /* Is the region suitable for relocating Xen? */ if ( !xen_phys_start && e <= limit ) @@ -969,7 +972,7 @@ void __init __start_xen(unsigned long mbi_p) /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(&boot_e820); - setup_max_pdx(); + setup_max_pdx(raw_max_page); if ( highmem_start ) xenheap_max_mfn(PFN_DOWN(highmem_start)); @@ -995,7 +998,7 @@ void __init __start_xen(unsigned long mbi_p) { acpi_boot_table_init_done = 1; srat_parse_regions(s); - setup_max_pdx(); + setup_max_pdx(raw_max_page); } if ( pfn_to_pdx((e - 1) >> PAGE_SHIFT) >= max_pdx ) @@ -1133,7 +1136,7 @@ void __init __start_xen(unsigned long mbi_p) acpi_numa_init(); - numa_initmem_init(0, max_page); + numa_initmem_init(0, raw_max_page); end_boot_allocator(); system_state = SYS_STATE_boot; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11: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 1VOFHt-0004L5-QT; Mon, 23 Sep 2013 23: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 1VOFHr-0004Kd-SL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:28 +0000 Received: from [193.109.254.147:59133] by server-8.bemta-14.messagelabs.com id A5/55-14324-F9AC0425; Mon, 23 Sep 2013 23:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1379977885!3846355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3506 invoked from network); 23 Sep 2013 23:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHp-00031Q-6G for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHo-0006JW-SH for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:24 +0000 Date: Mon, 23 Sep 2013 23:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc/x86: fix page table creation for huge guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b55b8a9f9b8d11cbc8756243c6ded01f5e618603 Author: Jan Beulich AuthorDate: Mon Sep 23 16:22:47 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:22:47 2013 +0200 libxc/x86: fix page table creation for huge guests The switch-over logic from one page directory to the next was wrong; it needs to be deferred until we actually reach the last page within a given region, instead of being done when the last entry of a page directory gets started with. Signed-off-by: Jan Beulich Tested-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson master commit: 06d086832155fc7f5344e9d108b979de34674d11 master date: 2013-09-12 17:41:04 +0200 --- tools/libxc/xc_dom_x86.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 126c0f8..41f59d3 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -251,7 +251,7 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - unsigned long l3off, l2off, l1off; + unsigned long l3off, l2off = 0, l1off; xen_vaddr_t addr; xen_pfn_t pgpfn; xen_pfn_t l3mfn = xc_dom_p2m_guest(dom, l3pfn); @@ -299,8 +299,6 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l2off = l2_table_offset_pae(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) - l2tab = NULL; l1pfn++; } @@ -312,8 +310,13 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_PAE - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) + l2tab = NULL; + } } if ( dom->virt_pgtab_end <= 0xc0000000 ) @@ -360,7 +363,7 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab = NULL; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - uint64_t l4off, l3off, l2off, l1off; + uint64_t l4off, l3off = 0, l2off = 0, l1off; uint64_t addr; xen_pfn_t pgpfn; @@ -391,8 +394,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3off = l3_table_offset_x86_64(addr); l3tab[l3off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT; - if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) - l3tab = NULL; l2pfn++; } @@ -405,8 +406,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l2off = l2_table_offset_x86_64(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) - l2tab = NULL; l1pfn++; } @@ -418,8 +417,17 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_X86_64 - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) + { + l2tab = NULL; + if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) + l3tab = NULL; + } + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11: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 1VOFHt-0004L5-QT; Mon, 23 Sep 2013 23: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 1VOFHr-0004Kd-SL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:28 +0000 Received: from [193.109.254.147:59133] by server-8.bemta-14.messagelabs.com id A5/55-14324-F9AC0425; Mon, 23 Sep 2013 23:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1379977885!3846355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3506 invoked from network); 23 Sep 2013 23:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHp-00031Q-6G for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHo-0006JW-SH for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:24 +0000 Date: Mon, 23 Sep 2013 23:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc/x86: fix page table creation for huge guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b55b8a9f9b8d11cbc8756243c6ded01f5e618603 Author: Jan Beulich AuthorDate: Mon Sep 23 16:22:47 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:22:47 2013 +0200 libxc/x86: fix page table creation for huge guests The switch-over logic from one page directory to the next was wrong; it needs to be deferred until we actually reach the last page within a given region, instead of being done when the last entry of a page directory gets started with. Signed-off-by: Jan Beulich Tested-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson master commit: 06d086832155fc7f5344e9d108b979de34674d11 master date: 2013-09-12 17:41:04 +0200 --- tools/libxc/xc_dom_x86.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 126c0f8..41f59d3 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -251,7 +251,7 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - unsigned long l3off, l2off, l1off; + unsigned long l3off, l2off = 0, l1off; xen_vaddr_t addr; xen_pfn_t pgpfn; xen_pfn_t l3mfn = xc_dom_p2m_guest(dom, l3pfn); @@ -299,8 +299,6 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) l2off = l2_table_offset_pae(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) - l2tab = NULL; l1pfn++; } @@ -312,8 +310,13 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_PAE - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_PAE - 1) ) + l2tab = NULL; + } } if ( dom->virt_pgtab_end <= 0xc0000000 ) @@ -360,7 +363,7 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3_pgentry_64_t *l3tab = NULL; l2_pgentry_64_t *l2tab = NULL; l1_pgentry_64_t *l1tab = NULL; - uint64_t l4off, l3off, l2off, l1off; + uint64_t l4off, l3off = 0, l2off = 0, l1off; uint64_t addr; xen_pfn_t pgpfn; @@ -391,8 +394,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l3off = l3_table_offset_x86_64(addr); l3tab[l3off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l2pfn)) | L3_PROT; - if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) - l3tab = NULL; l2pfn++; } @@ -405,8 +406,6 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) l2off = l2_table_offset_x86_64(addr); l2tab[l2off] = pfn_to_paddr(xc_dom_p2m_guest(dom, l1pfn)) | L2_PROT; - if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) - l2tab = NULL; l1pfn++; } @@ -418,8 +417,17 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) if ( (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ + if ( l1off == (L1_PAGETABLE_ENTRIES_X86_64 - 1) ) + { l1tab = NULL; + if ( l2off == (L2_PAGETABLE_ENTRIES_X86_64 - 1) ) + { + l2tab = NULL; + if ( l3off == (L3_PAGETABLE_ENTRIES_X86_64 - 1) ) + l3tab = NULL; + } + } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI2-0004MG-Tz; Mon, 23 Sep 2013 23:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI1-0004M0-My for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:37 +0000 Received: from [85.158.143.35:46077] by server-2.bemta-4.messagelabs.com id E0/67-26052-9AAC0425; Mon, 23 Sep 2013 23:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379977895!6219107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5685 invoked from network); 23 Sep 2013 23:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHz-00031Y-Bn for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHz-0006K0-9m for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:35 +0000 Date: Mon, 23 Sep 2013 23:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] cpufreq: missing check of copy_from_guest() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e5a66bc88a0cf0ff0f3339381a2332f305d1a9c Author: Tim Deegan AuthorDate: Mon Sep 23 16:23:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:23:14 2013 +0200 cpufreq: missing check of copy_from_guest() Coverity CID 1055131 Coverity CID 1055132 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich master commit: 803f9a6cdfeda64beee908576de0ad02d6b0c480 master date: 2013-09-12 17:47:08 +0100 --- xen/drivers/cpufreq/cpufreq.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 0de5d41..ab66884 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -471,8 +471,12 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in ret = -ENOMEM; goto out; } - copy_from_guest(pxpt->states, dom0_px_info->states, - dom0_px_info->state_count); + if ( copy_from_guest(pxpt->states, dom0_px_info->states, + dom0_px_info->state_count) ) + { + ret = -EFAULT; + goto out; + } pxpt->state_count = dom0_px_info->state_count; if ( cpufreq_verbose ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI2-0004MG-Tz; Mon, 23 Sep 2013 23:11:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI1-0004M0-My for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:37 +0000 Received: from [85.158.143.35:46077] by server-2.bemta-4.messagelabs.com id E0/67-26052-9AAC0425; Mon, 23 Sep 2013 23:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1379977895!6219107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5685 invoked from network); 23 Sep 2013 23:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFHz-00031Y-Bn for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFHz-0006K0-9m for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:35 +0000 Date: Mon, 23 Sep 2013 23:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] cpufreq: missing check of copy_from_guest() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e5a66bc88a0cf0ff0f3339381a2332f305d1a9c Author: Tim Deegan AuthorDate: Mon Sep 23 16:23:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:23:14 2013 +0200 cpufreq: missing check of copy_from_guest() Coverity CID 1055131 Coverity CID 1055132 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jan Beulich master commit: 803f9a6cdfeda64beee908576de0ad02d6b0c480 master date: 2013-09-12 17:47:08 +0100 --- xen/drivers/cpufreq/cpufreq.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 0de5d41..ab66884 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -471,8 +471,12 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in ret = -ENOMEM; goto out; } - copy_from_guest(pxpt->states, dom0_px_info->states, - dom0_px_info->state_count); + if ( copy_from_guest(pxpt->states, dom0_px_info->states, + dom0_px_info->state_count) ) + { + ret = -EFAULT; + goto out; + } pxpt->state_count = dom0_px_info->state_count; if ( cpufreq_verbose ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11: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 1VOFIE-0004O4-0p; Mon, 23 Sep 2013 23:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIC-0004Nh-4L for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:48 +0000 Received: from [85.158.139.211:12768] by server-11.bemta-5.messagelabs.com id 5B/2B-10409-3BAC0425; Mon, 23 Sep 2013 23:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379977905!4157973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20992 invoked from network); 23 Sep 2013 23:11:46 -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; 23 Sep 2013 23:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI9-00031h-Hq for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFI9-0006L6-Fm for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:45 +0000 Date: Mon, 23 Sep 2013 23:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: machine_restart() must not call acpi_dmar_reinstate() twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6916c31d0ea7deeedbfe5e034202567c73b73a4e Author: Jan Beulich AuthorDate: Mon Sep 23 16:23:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:23:52 2013 +0200 x86: machine_restart() must not call acpi_dmar_reinstate() twice .. as that function is not idempotent (it always alters the table checksum). The (generally) duplicate call was a result from it being made before machine_restart() re-invoking itself on the boot CPU. Considering that no problem arose so far from the table corruption I doubt that we need to restore the correct table signature on the reboot path in general. The only case I can see this as potentially necessary is the tboot one, hence do the call just in that case. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 master date: 2013-09-13 14:27:34 +0200 --- xen/arch/x86/shutdown.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 7593191..be3da89 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -115,8 +115,6 @@ void machine_restart(unsigned int delay_millisecs) console_start_sync(); spin_debug_disable(); - acpi_dmar_reinstate(); - local_irq_enable(); /* Ensure we are the boot CPU. */ @@ -141,7 +139,10 @@ void machine_restart(unsigned int delay_millisecs) mdelay(delay_millisecs); if ( tboot_in_measured_env() ) + { + acpi_dmar_reinstate(); tboot_shutdown(TB_SHUTDOWN_REBOOT); + } efi_reset_system(reboot_mode != 0); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:11:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:11: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 1VOFIE-0004O4-0p; Mon, 23 Sep 2013 23:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIC-0004Nh-4L for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:48 +0000 Received: from [85.158.139.211:12768] by server-11.bemta-5.messagelabs.com id 5B/2B-10409-3BAC0425; Mon, 23 Sep 2013 23:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1379977905!4157973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20992 invoked from network); 23 Sep 2013 23:11:46 -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; 23 Sep 2013 23:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFI9-00031h-Hq for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFI9-0006L6-Fm for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:45 +0000 Date: Mon, 23 Sep 2013 23:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: machine_restart() must not call acpi_dmar_reinstate() twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6916c31d0ea7deeedbfe5e034202567c73b73a4e Author: Jan Beulich AuthorDate: Mon Sep 23 16:23:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:23:52 2013 +0200 x86: machine_restart() must not call acpi_dmar_reinstate() twice .. as that function is not idempotent (it always alters the table checksum). The (generally) duplicate call was a result from it being made before machine_restart() re-invoking itself on the boot CPU. Considering that no problem arose so far from the table corruption I doubt that we need to restore the correct table signature on the reboot path in general. The only case I can see this as potentially necessary is the tboot one, hence do the call just in that case. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: a54dc5f4fe1eae6b1beb21326ef0338cd3969cd1 master date: 2013-09-13 14:27:34 +0200 --- xen/arch/x86/shutdown.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 7593191..be3da89 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -115,8 +115,6 @@ void machine_restart(unsigned int delay_millisecs) console_start_sync(); spin_debug_disable(); - acpi_dmar_reinstate(); - local_irq_enable(); /* Ensure we are the boot CPU. */ @@ -141,7 +139,10 @@ void machine_restart(unsigned int delay_millisecs) mdelay(delay_millisecs); if ( tboot_in_measured_env() ) + { + acpi_dmar_reinstate(); tboot_shutdown(TB_SHUTDOWN_REBOOT); + } efi_reset_system(reboot_mode != 0); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIO-0004QL-4A; Mon, 23 Sep 2013 23:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIM-0004Pn-CO for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:58 +0000 Received: from [193.109.254.147:4055] by server-7.bemta-14.messagelabs.com id D7/D6-04456-DBAC0425; Mon, 23 Sep 2013 23:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379977915!3846064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 548 invoked from network); 23 Sep 2013 23:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIJ-00031n-NL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIJ-0006LT-LZ for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:55 +0000 Date: Mon, 23 Sep 2013 23:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvm/vpmu: Prevent dump handlers from incorrectly mutating state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b30611e6b43573ca10977e8a7f57092f7076bb7 Author: Andrew Cooper AuthorDate: Mon Sep 23 16:24:48 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:24:48 2013 +0200 hvm/vpmu: Prevent dump handlers from incorrectly mutating state Discovered by Coverity, CID 1055181 core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it was intending to check for it. Signed-off-by: Andrew Cooper This would have been avoided if the dump function declared all its pointers "const" - doing this now (also in SVM). Also fixing some indentation issues at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 42c5b1214071d363a52c6356dfe2ed820f500849 master date: 2013-09-16 12:22:20 +0200 --- xen/arch/x86/hvm/svm/vpmu.c | 12 ++++++------ xen/arch/x86/hvm/vmx/vpmu_core2.c | 19 ++++++++++--------- xen/include/asm-x86/hvm/vpmu.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 4d1fbc8..66a3815 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu *v) } /* VPMU part of the 'q' keyhandler */ -static void amd_vpmu_dump(struct vcpu *v) +static void amd_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - struct amd_vpmu_context *ctxt = vpmu->context; + const struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct amd_vpmu_context *ctxt = vpmu->context; unsigned int i; printk(" VPMU state: 0x%x ", vpmu->flags); @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v) rdmsrl(ctrls[i], ctrl); rdmsrl(counters[i], cntr); - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n", - ctrls[i], ctxt->ctrls[i], ctrl, - counters[i], ctxt->counters[i], cntr); + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n", + ctrls[i], ctxt->ctrls[i], ctrl, + counters[i], ctxt->counters[i], cntr); } } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 3a0d2ee..4b8dc55 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -652,11 +652,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, } /* Dump vpmu info on console, called in the context of keyhandler 'q'. */ -static void core2_vpmu_dump(struct vcpu *v) +static void core2_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct vpmu_struct *vpmu = vcpu_vpmu(v); int i, num; - struct core2_vpmu_context *core2_vpmu_cxt = NULL; + const struct core2_vpmu_context *core2_vpmu_cxt = NULL; u64 val; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -664,7 +664,7 @@ static void core2_vpmu_dump(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_RUNNING) ) { - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) ) + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) printk(" vPMU loaded\n"); else printk(" vPMU allocated\n"); @@ -677,10 +677,11 @@ static void core2_vpmu_dump(struct vcpu *v) /* Print the contents of the counter and its configuration msr. */ for ( i = 0; i < num; i++ ) { - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair; + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair; + if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] ) printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n", - i, msr_pair[i].counter, msr_pair[i].control); + i, msr_pair[i].counter, msr_pair[i].control); } /* * The configuration of the fixed counter is 4 bits each in the @@ -690,9 +691,9 @@ static void core2_vpmu_dump(struct vcpu *v) for ( i = 0; i < core2_fix_counters.num; i++ ) { if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] ) - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n", - i, core2_vpmu_cxt->fix_counters[i], - val & FIXED_CTR_CTRL_MASK); + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n", + i, core2_vpmu_cxt->fix_counters[i], + val & FIXED_CTR_CTRL_MASK); val >>= FIXED_CTR_CTRL_BITS; } } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 03b9462..40f63fb 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -54,7 +54,7 @@ struct arch_vpmu_ops { void (*arch_vpmu_destroy)(struct vcpu *v); int (*arch_vpmu_save)(struct vcpu *v); void (*arch_vpmu_load)(struct vcpu *v); - void (*arch_vpmu_dump)(struct vcpu *v); + void (*arch_vpmu_dump)(const struct vcpu *); }; int vmx_vpmu_initialise(struct vcpu *, unsigned int flags); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIO-0004QL-4A; Mon, 23 Sep 2013 23:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIM-0004Pn-CO for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:58 +0000 Received: from [193.109.254.147:4055] by server-7.bemta-14.messagelabs.com id D7/D6-04456-DBAC0425; Mon, 23 Sep 2013 23:11:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1379977915!3846064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 548 invoked from network); 23 Sep 2013 23:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIJ-00031n-NL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIJ-0006LT-LZ for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:11:55 +0000 Date: Mon, 23 Sep 2013 23:11:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvm/vpmu: Prevent dump handlers from incorrectly mutating state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b30611e6b43573ca10977e8a7f57092f7076bb7 Author: Andrew Cooper AuthorDate: Mon Sep 23 16:24:48 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:24:48 2013 +0200 hvm/vpmu: Prevent dump handlers from incorrectly mutating state Discovered by Coverity, CID 1055181 core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it was intending to check for it. Signed-off-by: Andrew Cooper This would have been avoided if the dump function declared all its pointers "const" - doing this now (also in SVM). Also fixing some indentation issues at once. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 42c5b1214071d363a52c6356dfe2ed820f500849 master date: 2013-09-16 12:22:20 +0200 --- xen/arch/x86/hvm/svm/vpmu.c | 12 ++++++------ xen/arch/x86/hvm/vmx/vpmu_core2.c | 19 ++++++++++--------- xen/include/asm-x86/hvm/vpmu.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 4d1fbc8..66a3815 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu *v) } /* VPMU part of the 'q' keyhandler */ -static void amd_vpmu_dump(struct vcpu *v) +static void amd_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - struct amd_vpmu_context *ctxt = vpmu->context; + const struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct amd_vpmu_context *ctxt = vpmu->context; unsigned int i; printk(" VPMU state: 0x%x ", vpmu->flags); @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v) rdmsrl(ctrls[i], ctrl); rdmsrl(counters[i], cntr); - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n", - ctrls[i], ctxt->ctrls[i], ctrl, - counters[i], ctxt->counters[i], cntr); + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n", + ctrls[i], ctxt->ctrls[i], ctrl, + counters[i], ctxt->counters[i], cntr); } } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 3a0d2ee..4b8dc55 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -652,11 +652,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, } /* Dump vpmu info on console, called in the context of keyhandler 'q'. */ -static void core2_vpmu_dump(struct vcpu *v) +static void core2_vpmu_dump(const struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); + const struct vpmu_struct *vpmu = vcpu_vpmu(v); int i, num; - struct core2_vpmu_context *core2_vpmu_cxt = NULL; + const struct core2_vpmu_context *core2_vpmu_cxt = NULL; u64 val; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -664,7 +664,7 @@ static void core2_vpmu_dump(struct vcpu *v) if ( !vpmu_is_set(vpmu, VPMU_RUNNING) ) { - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) ) + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) printk(" vPMU loaded\n"); else printk(" vPMU allocated\n"); @@ -677,10 +677,11 @@ static void core2_vpmu_dump(struct vcpu *v) /* Print the contents of the counter and its configuration msr. */ for ( i = 0; i < num; i++ ) { - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair; + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair; + if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] ) printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n", - i, msr_pair[i].counter, msr_pair[i].control); + i, msr_pair[i].counter, msr_pair[i].control); } /* * The configuration of the fixed counter is 4 bits each in the @@ -690,9 +691,9 @@ static void core2_vpmu_dump(struct vcpu *v) for ( i = 0; i < core2_fix_counters.num; i++ ) { if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] ) - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n", - i, core2_vpmu_cxt->fix_counters[i], - val & FIXED_CTR_CTRL_MASK); + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n", + i, core2_vpmu_cxt->fix_counters[i], + val & FIXED_CTR_CTRL_MASK); val >>= FIXED_CTR_CTRL_BITS; } } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 03b9462..40f63fb 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -54,7 +54,7 @@ struct arch_vpmu_ops { void (*arch_vpmu_destroy)(struct vcpu *v); int (*arch_vpmu_save)(struct vcpu *v); void (*arch_vpmu_load)(struct vcpu *v); - void (*arch_vpmu_dump)(struct vcpu *v); + void (*arch_vpmu_dump)(const struct vcpu *); }; int vmx_vpmu_initialise(struct vcpu *, unsigned int flags); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23: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 1VOFIX-0004SK-8w; Mon, 23 Sep 2013 23: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 1VOFIW-0004Ru-6T for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:08 +0000 Received: from [85.158.143.35:47099] by server-2.bemta-4.messagelabs.com id E8/87-26052-7CAC0425; Mon, 23 Sep 2013 23:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1379977926!1192011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10260 invoked from network); 23 Sep 2013 23:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIT-00032P-Tl for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIT-0006Lz-RN for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:05 +0000 Date: Mon, 23 Sep 2013 23:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] passthrough/amd: Missing 'break' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e38a6b4656905d9a4190e9685c226d58bfc4fe28 Author: Tim Deegan AuthorDate: Mon Sep 23 16:25:33 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:25:33 2013 +0200 passthrough/amd: Missing 'break' Coverity CID 1055502 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 72fa4fdf647ba99ecaf39589a93cde8dd36eed3c master date: 2013-09-17 16:36:25 +0100 --- xen/drivers/passthrough/amd/iommu_guest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 85f2361..952600a 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -728,6 +728,7 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, break; case IOMMU_EVENT_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->event_log.reg_base, val); + break; case IOMMU_PPR_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->ppr_log.reg_base, val); break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23: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 1VOFIX-0004SK-8w; Mon, 23 Sep 2013 23: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 1VOFIW-0004Ru-6T for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:08 +0000 Received: from [85.158.143.35:47099] by server-2.bemta-4.messagelabs.com id E8/87-26052-7CAC0425; Mon, 23 Sep 2013 23:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1379977926!1192011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10260 invoked from network); 23 Sep 2013 23:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2013 23:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIT-00032P-Tl for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIT-0006Lz-RN for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:05 +0000 Date: Mon, 23 Sep 2013 23:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] passthrough/amd: Missing 'break' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e38a6b4656905d9a4190e9685c226d58bfc4fe28 Author: Tim Deegan AuthorDate: Mon Sep 23 16:25:33 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:25:33 2013 +0200 passthrough/amd: Missing 'break' Coverity CID 1055502 Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 72fa4fdf647ba99ecaf39589a93cde8dd36eed3c master date: 2013-09-17 16:36:25 +0100 --- xen/drivers/passthrough/amd/iommu_guest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c index 85f2361..952600a 100644 --- a/xen/drivers/passthrough/amd/iommu_guest.c +++ b/xen/drivers/passthrough/amd/iommu_guest.c @@ -728,6 +728,7 @@ static void guest_iommu_mmio_write64(struct guest_iommu *iommu, break; case IOMMU_EVENT_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->event_log.reg_base, val); + break; case IOMMU_PPR_LOG_BASE_LOW_OFFSET: u64_to_reg(&iommu->ppr_log.reg_base, val); break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIh-0004Ui-C3; Mon, 23 Sep 2013 23:12:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIg-0004UP-P0 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:18 +0000 Received: from [85.158.139.211:33538] by server-9.bemta-5.messagelabs.com id BF/E6-24493-2DAC0425; Mon, 23 Sep 2013 23:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1379977936!4160482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28340 invoked from network); 23 Sep 2013 23:12:17 -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; 23 Sep 2013 23:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIe-00032V-4T for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIe-0006MN-1S for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:16 +0000 Date: Mon, 23 Sep 2013 23:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: fix failure path in hvm_vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9b46e5c84fdd38b4df766148bdf6582b4a04746 Author: George Dunlap AuthorDate: Mon Sep 23 16:27:08 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:27:08 2013 +0200 x86/HVM: fix failure path in hvm_vcpu_initialise It looks like one of the failure cases in hvm_vcpu_initialise jumps to the wrong label; this could lead to slow leaks if something isn't cleaned up properly. I will probably change these labels in a future patch, but I figured it was better to have this fix separately. This is also a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor master commit: 925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e master date: 2013-09-18 14:45:24 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 26a3e9f..a2fb715 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1125,7 +1125,7 @@ int hvm_vcpu_initialise(struct vcpu *v) /* Create bufioreq event channel. */ rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); if ( rc < 0 ) - goto fail2; + goto fail4; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIh-0004Ui-C3; Mon, 23 Sep 2013 23:12:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIg-0004UP-P0 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:18 +0000 Received: from [85.158.139.211:33538] by server-9.bemta-5.messagelabs.com id BF/E6-24493-2DAC0425; Mon, 23 Sep 2013 23:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1379977936!4160482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28340 invoked from network); 23 Sep 2013 23:12:17 -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; 23 Sep 2013 23:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIe-00032V-4T for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIe-0006MN-1S for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:16 +0000 Date: Mon, 23 Sep 2013 23:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: fix failure path in hvm_vcpu_initialise X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9b46e5c84fdd38b4df766148bdf6582b4a04746 Author: George Dunlap AuthorDate: Mon Sep 23 16:27:08 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:27:08 2013 +0200 x86/HVM: fix failure path in hvm_vcpu_initialise It looks like one of the failure cases in hvm_vcpu_initialise jumps to the wrong label; this could lead to slow leaks if something isn't cleaned up properly. I will probably change these labels in a future patch, but I figured it was better to have this fix separately. This is also a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor master commit: 925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e master date: 2013-09-18 14:45:24 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 26a3e9f..a2fb715 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1125,7 +1125,7 @@ int hvm_vcpu_initialise(struct vcpu *v) /* Create bufioreq event channel. */ rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); if ( rc < 0 ) - goto fail2; + goto fail4; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIr-0004X3-FE; Mon, 23 Sep 2013 23:12:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIq-0004Wk-RL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:28 +0000 Received: from [193.109.254.147:39619] by server-13.bemta-14.messagelabs.com id F1/FA-01215-CDAC0425; Mon, 23 Sep 2013 23:12:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1379977946!974154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23999 invoked from network); 23 Sep 2013 23:12: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; 23 Sep 2013 23:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIo-00032f-Gl for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIo-0006Mj-Es for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:26 +0000 Date: Mon, 23 Sep 2013 23:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: fix failure path in construct_vmcs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 420bd9be17b480d8c2e1c9897bfd3a42d209c8e5 Author: George Dunlap AuthorDate: Mon Sep 23 16:27:39 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:27:39 2013 +0200 VMX: fix failure path in construct_vmcs If the allocation fails, make sure to call vmx_vmcs_exit(). This is a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor master commit: dad7e45bf44c0569546a3ed7d0fa4182a4a73f0a master date: 2013-09-18 14:45:42 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 759718f..6ef9739 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -894,7 +894,10 @@ static int construct_vmcs(struct vcpu *v) unsigned long *msr_bitmap = alloc_xenheap_page(); if ( msr_bitmap == NULL ) + { + vmx_vmcs_exit(v); return -ENOMEM; + } memset(msr_bitmap, ~0, PAGE_SIZE); v->arch.hvm_vmx.msr_bitmap = msr_bitmap; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12: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 1VOFIr-0004X3-FE; Mon, 23 Sep 2013 23:12:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIq-0004Wk-RL for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:28 +0000 Received: from [193.109.254.147:39619] by server-13.bemta-14.messagelabs.com id F1/FA-01215-CDAC0425; Mon, 23 Sep 2013 23:12:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1379977946!974154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23999 invoked from network); 23 Sep 2013 23:12: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; 23 Sep 2013 23:12:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIo-00032f-Gl for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIo-0006Mj-Es for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:26 +0000 Date: Mon, 23 Sep 2013 23:12:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: fix failure path in construct_vmcs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 420bd9be17b480d8c2e1c9897bfd3a42d209c8e5 Author: George Dunlap AuthorDate: Mon Sep 23 16:27:39 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:27:39 2013 +0200 VMX: fix failure path in construct_vmcs If the allocation fails, make sure to call vmx_vmcs_exit(). This is a candidate for backport. Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor master commit: dad7e45bf44c0569546a3ed7d0fa4182a4a73f0a master date: 2013-09-18 14:45:42 +0200 --- xen/arch/x86/hvm/vmx/vmcs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 759718f..6ef9739 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -894,7 +894,10 @@ static int construct_vmcs(struct vcpu *v) unsigned long *msr_bitmap = alloc_xenheap_page(); if ( msr_bitmap == NULL ) + { + vmx_vmcs_exit(v); return -ENOMEM; + } memset(msr_bitmap, ~0, PAGE_SIZE); v->arch.hvm_vmx.msr_bitmap = msr_bitmap; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ2-0004ZP-IR; Mon, 23 Sep 2013 23:12:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ1-0004ZC-P6 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:40 +0000 Received: from [85.158.139.211:38242] by server-1.bemta-5.messagelabs.com id 88/96-26518-7EAC0425; Mon, 23 Sep 2013 23:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1379977956!4148742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6146 invoked from network); 23 Sep 2013 23:12:37 -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; 23 Sep 2013 23:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIy-00032n-LW for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIy-0006Nf-KD for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:36 +0000 Date: Mon, 23 Sep 2013 23:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: properly handle MMIO reads and writes wider than a machine word X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa456b1e9909b59d3bcd55653c9a47ec5da82b9e Author: Jan Beulich AuthorDate: Mon Sep 23 16:28:21 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:28:21 2013 +0200 x86/HVM: properly handle MMIO reads and writes wider than a machine word Just like real hardware we ought to split such accesses transparently to the caller. With little extra effort we can at once even handle page crossing accesses correctly. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3b89f08a498ddac09d4002d9849e329018ceb107 master date: 2013-09-20 11:01:08 +0200 --- xen/arch/x86/hvm/emulate.c | 115 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 95 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9bfba48..4ce4e0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -438,6 +438,7 @@ static int __hvmemul_read( { struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -447,16 +448,38 @@ static int __hvmemul_read( seg, offset, bytes, &reps, access_type, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* + * We only need to handle sizes actual instruction operands can have. All + * such sizes are either powers of 2 or the sum of two powers of 2. Thus + * picking as initial chunk size the largest power of 2 not greater than + * the total size will always result in only power-of-2 size requests + * issued to hvmemul_do_mmio() (hvmemul_do_io() rejects non-powers-of-2). + */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_READ, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -473,14 +496,32 @@ static int __hvmemul_read( return X86EMUL_EXCEPTION; case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; - case HVMCOPY_bad_gfn_to_mfn: + case HVMCOPY_bad_gfn_to_mfn: if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -537,6 +578,7 @@ static int hvmemul_write( container_of(ctxt, struct hvm_emulate_ctxt, ctxt); struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present | PFEC_write_access; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -546,14 +588,30 @@ static int hvmemul_write( seg, offset, bytes, &reps, hvm_access_write, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* See the respective comment in __hvmemul_read(). */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -569,12 +627,29 @@ static int hvmemul_write( case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; case HVMCOPY_bad_gfn_to_mfn: - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:12:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:12:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ2-0004ZP-IR; Mon, 23 Sep 2013 23:12:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ1-0004ZC-P6 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:40 +0000 Received: from [85.158.139.211:38242] by server-1.bemta-5.messagelabs.com id 88/96-26518-7EAC0425; Mon, 23 Sep 2013 23:12:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1379977956!4148742!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6146 invoked from network); 23 Sep 2013 23:12:37 -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; 23 Sep 2013 23:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFIy-00032n-LW for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFIy-0006Nf-KD for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:36 +0000 Date: Mon, 23 Sep 2013 23:12:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: properly handle MMIO reads and writes wider than a machine word X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa456b1e9909b59d3bcd55653c9a47ec5da82b9e Author: Jan Beulich AuthorDate: Mon Sep 23 16:28:21 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:28:21 2013 +0200 x86/HVM: properly handle MMIO reads and writes wider than a machine word Just like real hardware we ought to split such accesses transparently to the caller. With little extra effort we can at once even handle page crossing accesses correctly. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3b89f08a498ddac09d4002d9849e329018ceb107 master date: 2013-09-20 11:01:08 +0200 --- xen/arch/x86/hvm/emulate.c | 115 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 95 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 9bfba48..4ce4e0c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -438,6 +438,7 @@ static int __hvmemul_read( { struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -447,16 +448,38 @@ static int __hvmemul_read( seg, offset, bytes, &reps, access_type, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* + * We only need to handle sizes actual instruction operands can have. All + * such sizes are either powers of 2 or the sum of two powers of 2. Thus + * picking as initial chunk size the largest power of 2 not greater than + * the total size will always result in only power-of-2 size requests + * issued to hvmemul_do_mmio() (hvmemul_do_io() rejects non-powers-of-2). + */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_READ, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -473,14 +496,32 @@ static int __hvmemul_read( return X86EMUL_EXCEPTION; case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; - case HVMCOPY_bad_gfn_to_mfn: + case HVMCOPY_bad_gfn_to_mfn: if ( access_type == hvm_access_insn_fetch ) return X86EMUL_UNHANDLEABLE; - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_READ, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -537,6 +578,7 @@ static int hvmemul_write( container_of(ctxt, struct hvm_emulate_ctxt, ctxt); struct vcpu *curr = current; unsigned long addr, reps = 1; + unsigned int off, chunk = min(bytes, 1U << LONG_BYTEORDER); uint32_t pfec = PFEC_page_present | PFEC_write_access; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; paddr_t gpa; @@ -546,14 +588,30 @@ static int hvmemul_write( seg, offset, bytes, &reps, hvm_access_write, hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) return rc; + off = addr & (PAGE_SIZE - 1); + /* See the respective comment in __hvmemul_read(). */ + while ( chunk & (chunk - 1) ) + chunk &= chunk - 1; + if ( off + bytes > PAGE_SIZE ) + while ( off & (chunk - 1) ) + chunk >>= 1; if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) { - unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); - if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + while ( (off + chunk) <= PAGE_SIZE ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + return rc; + addr += chunk; + off += chunk; + gpa += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + } } if ( (seg != x86_seg_none) && @@ -569,12 +627,29 @@ static int hvmemul_write( case HVMCOPY_unhandleable: return X86EMUL_UNHANDLEABLE; case HVMCOPY_bad_gfn_to_mfn: - rc = hvmemul_linear_to_phys( - addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); - if ( rc != X86EMUL_OKAY ) - return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, - IOREQ_WRITE, 0, p_data); + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + while ( rc == X86EMUL_OKAY ) + { + rc = hvmemul_do_mmio(gpa, &reps, chunk, 0, IOREQ_WRITE, 0, p_data); + if ( rc != X86EMUL_OKAY || bytes == chunk ) + break; + addr += chunk; + off += chunk; + p_data += chunk; + bytes -= chunk; + if ( bytes < chunk ) + chunk = bytes; + if ( off < PAGE_SIZE ) + gpa += chunk; + else + { + rc = hvmemul_linear_to_phys(addr, &gpa, chunk, &reps, pfec, + hvmemul_ctxt); + off = 0; + } + } + return rc; case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:13:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:13:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJQ-0004cV-Lo; Mon, 23 Sep 2013 23:13:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJP-0004cB-8Q for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:13:03 +0000 Received: from [193.109.254.147:5595] by server-3.bemta-14.messagelabs.com id 18/D9-11293-EFAC0425; Mon, 23 Sep 2013 23:13:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379977981!658257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15248 invoked from network); 23 Sep 2013 23:13:01 -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; 23 Sep 2013 23:13:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ8-00032t-QK for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFJ8-0006O1-P6 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:46 +0000 Date: Mon, 23 Sep 2013 23:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] unmodified_drivers: enable unplug per 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 d4d9332a1c3fbd3f1802ffb24a95429cfc1512ed Author: Olaf Hering AuthorDate: Mon Sep 23 16:28:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:28:52 2013 +0200 unmodified_drivers: enable unplug per default Since xen-3.3 an official unplug protocol for emulated hardware is available in the toolstack. The pvops kernel does the unplug per default, so it is safe to do it also in the drivers for forward ported xenlinux. Currently its required to load xen-platform-pci with the module parameter dev_unplug=all, which is cumbersome. Also recognize the dev_unplug=never parameter, which provides the default before this patch. Signed-off-by: Olaf Hering master commit: df17e9c889c48c9c10aa3f9dd0bb11077f54efc4 master date: 2013-09-20 11:41:08 +0200 --- .../linux-2.6/platform-pci/platform-pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index cfd0536..163b168 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -66,7 +66,7 @@ MODULE_LICENSE("GPL"); static char *dev_unplug; module_param(dev_unplug, charp, 0644); MODULE_PARM_DESC(dev_unplug, "Emulated devices to unplug: " - "[all,][ide-disks,][aux-ide-disks,][nics]\n"); + "[all,][ide-disks,][aux-ide-disks,][nics,][never] (default is 'all')\n"); struct pci_dev *xen_platform_pdev; @@ -290,6 +290,10 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) short magic, unplug = 0; char protocol, *p, *q, *err; + /* Unconditionally unplug everything */ + if (!dev_unplug) + unplug = UNPLUG_ALL; + for (p = dev_unplug; p; p = q) { q = strchr(dev_unplug, ','); if (q) @@ -302,6 +306,8 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) unplug |= UNPLUG_AUX_IDE_DISKS; else if (!strcmp(p, "nics")) unplug |= UNPLUG_ALL_NICS; + else if (!strcmp(p, "never")) + unplug = 0; else dev_warn(dev, "unrecognised option '%s' " "in module parameter 'dev_unplug'\n", p); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 23 23:13:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Sep 2013 23:13:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJQ-0004cV-Lo; Mon, 23 Sep 2013 23:13:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJP-0004cB-8Q for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:13:03 +0000 Received: from [193.109.254.147:5595] by server-3.bemta-14.messagelabs.com id 18/D9-11293-EFAC0425; Mon, 23 Sep 2013 23:13:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1379977981!658257!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15248 invoked from network); 23 Sep 2013 23:13:01 -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; 23 Sep 2013 23:13:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VOFJ8-00032t-QK for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VOFJ8-0006O1-P6 for xen-changelog@lists.xensource.com; Mon, 23 Sep 2013 23:12:46 +0000 Date: Mon, 23 Sep 2013 23:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] unmodified_drivers: enable unplug per 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 d4d9332a1c3fbd3f1802ffb24a95429cfc1512ed Author: Olaf Hering AuthorDate: Mon Sep 23 16:28:52 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 16:28:52 2013 +0200 unmodified_drivers: enable unplug per default Since xen-3.3 an official unplug protocol for emulated hardware is available in the toolstack. The pvops kernel does the unplug per default, so it is safe to do it also in the drivers for forward ported xenlinux. Currently its required to load xen-platform-pci with the module parameter dev_unplug=all, which is cumbersome. Also recognize the dev_unplug=never parameter, which provides the default before this patch. Signed-off-by: Olaf Hering master commit: df17e9c889c48c9c10aa3f9dd0bb11077f54efc4 master date: 2013-09-20 11:41:08 +0200 --- .../linux-2.6/platform-pci/platform-pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index cfd0536..163b168 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -66,7 +66,7 @@ MODULE_LICENSE("GPL"); static char *dev_unplug; module_param(dev_unplug, charp, 0644); MODULE_PARM_DESC(dev_unplug, "Emulated devices to unplug: " - "[all,][ide-disks,][aux-ide-disks,][nics]\n"); + "[all,][ide-disks,][aux-ide-disks,][nics,][never] (default is 'all')\n"); struct pci_dev *xen_platform_pdev; @@ -290,6 +290,10 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) short magic, unplug = 0; char protocol, *p, *q, *err; + /* Unconditionally unplug everything */ + if (!dev_unplug) + unplug = UNPLUG_ALL; + for (p = dev_unplug; p; p = q) { q = strchr(dev_unplug, ','); if (q) @@ -302,6 +306,8 @@ static int check_platform_magic(struct device *dev, long ioaddr, long iolen) unplug |= UNPLUG_AUX_IDE_DISKS; else if (!strcmp(p, "nics")) unplug |= UNPLUG_ALL_NICS; + else if (!strcmp(p, "never")) + unplug = 0; else dev_warn(dev, "unrecognised option '%s' " "in module parameter 'dev_unplug'\n", p); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 24 07:33:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07: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 1VON7M-0006P2-Qw; Tue, 24 Sep 2013 07:33:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7L-0006Ou-Av for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:07 +0000 Received: from [193.109.254.147:20288] by server-9.bemta-14.messagelabs.com id D9/D3-30026-23041425; Tue, 24 Sep 2013 07:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1380007983!3905854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26942 invoked from network); 24 Sep 2013 07:33:04 -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; 24 Sep 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 1VON7H-0007L1-Cf for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7H-00043p-9N for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:03 +0000 Date: Tue, 24 Sep 2013 07:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fix wrap around handling for repeated string instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2e2df452e9cc80844c5de9301862a6285bd30c1 Author: Jan Beulich AuthorDate: Mon Sep 23 09:52:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:52:29 2013 +0200 x86_emulate: fix wrap around handling for repeated string instructions For one, repeat count clipping for MOVS must be done taking into consideration both source and destination addresses. And then we should allow a wrap on the final iteration only if either the wrap is a precise one (i.e. the access itself doesn't wrap, just the resulting index register value would) or if there is just one iteration. In all other cases we should do a bulk operation first without hitting the wrap, and then issue an individual iteration. If we don't do it that way, - the last iteration not completing successfully will cause the whole operation to fail (i.e. registers not get updated to the failure point) - hvmemul_virtual_to_linear() may needlessly enforce non-repeated operation Additionally with the prior implementation there was a case (df=1, ea=~0, reps=~0, bytes_per_rep=1) where we'd end up passing zero reps back to the caller, yet various places assume that there's at least on iteration. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 473500e..bb40b83 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -773,13 +773,20 @@ static void __put_rep_prefix( __put_rep_prefix(&_regs, ctxt->regs, ad_bytes, reps_completed); \ }) -/* Clip maximum repetitions so that the index register only just wraps. */ +/* Clip maximum repetitions so that the index register at most just wraps. */ #define truncate_ea_and_reps(ea, reps, bytes_per_rep) ({ \ - unsigned long __todo = (ctxt->regs->eflags & EFLG_DF) ? (ea) : ~(ea); \ - __todo = truncate_word(__todo, ad_bytes); \ - __todo = (__todo / (bytes_per_rep)) + 1; \ - (reps) = (__todo < (reps)) ? __todo : (reps); \ - truncate_word((ea), ad_bytes); \ + unsigned long todo__, ea__ = truncate_word(ea, ad_bytes); \ + if ( !(ctxt->regs->eflags & EFLG_DF) ) \ + todo__ = truncate_word(-(ea), ad_bytes) / (bytes_per_rep); \ + else if ( truncate_word((ea) + (bytes_per_rep) - 1, ad_bytes) < ea__ )\ + todo__ = 1; \ + else \ + todo__ = ea__ / (bytes_per_rep) + 1; \ + if ( !todo__ ) \ + (reps) = 1; \ + else if ( todo__ < (reps) ) \ + (reps) = todo__; \ + ea__; \ }) /* Compatibility function: read guest memory, zero-extend result to a ulong. */ @@ -2385,8 +2392,9 @@ x86_emulate( dst.bytes = (d & ByteOp) ? 1 : op_bytes; dst.mem.seg = x86_seg_es; dst.mem.off = truncate_ea_and_reps(_regs.edi, nr_reps, dst.bytes); + src.mem.off = truncate_ea_and_reps(_regs.esi, nr_reps, dst.bytes); if ( (nr_reps > 1) && (ops->rep_movs != NULL) && - ((rc = ops->rep_movs(ea.mem.seg, truncate_ea(_regs.esi), + ((rc = ops->rep_movs(ea.mem.seg, src.mem.off, dst.mem.seg, dst.mem.off, dst.bytes, &nr_reps, ctxt)) != X86EMUL_UNHANDLEABLE) ) { @@ -2395,7 +2403,7 @@ x86_emulate( } else { - if ( (rc = read_ulong(ea.mem.seg, truncate_ea(_regs.esi), + if ( (rc = read_ulong(ea.mem.seg, src.mem.off, &dst.val, dst.bytes, ctxt, ops)) != 0 ) goto done; dst.type = OP_MEM; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 24 07:33:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07: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 1VON7M-0006P2-Qw; Tue, 24 Sep 2013 07:33:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7L-0006Ou-Av for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:07 +0000 Received: from [193.109.254.147:20288] by server-9.bemta-14.messagelabs.com id D9/D3-30026-23041425; Tue, 24 Sep 2013 07:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1380007983!3905854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26942 invoked from network); 24 Sep 2013 07:33:04 -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; 24 Sep 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 1VON7H-0007L1-Cf for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7H-00043p-9N for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:03 +0000 Date: Tue, 24 Sep 2013 07:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: fix wrap around handling for repeated string instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2e2df452e9cc80844c5de9301862a6285bd30c1 Author: Jan Beulich AuthorDate: Mon Sep 23 09:52:29 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:52:29 2013 +0200 x86_emulate: fix wrap around handling for repeated string instructions For one, repeat count clipping for MOVS must be done taking into consideration both source and destination addresses. And then we should allow a wrap on the final iteration only if either the wrap is a precise one (i.e. the access itself doesn't wrap, just the resulting index register value would) or if there is just one iteration. In all other cases we should do a bulk operation first without hitting the wrap, and then issue an individual iteration. If we don't do it that way, - the last iteration not completing successfully will cause the whole operation to fail (i.e. registers not get updated to the failure point) - hvmemul_virtual_to_linear() may needlessly enforce non-repeated operation Additionally with the prior implementation there was a case (df=1, ea=~0, reps=~0, bytes_per_rep=1) where we'd end up passing zero reps back to the caller, yet various places assume that there's at least on iteration. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 473500e..bb40b83 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -773,13 +773,20 @@ static void __put_rep_prefix( __put_rep_prefix(&_regs, ctxt->regs, ad_bytes, reps_completed); \ }) -/* Clip maximum repetitions so that the index register only just wraps. */ +/* Clip maximum repetitions so that the index register at most just wraps. */ #define truncate_ea_and_reps(ea, reps, bytes_per_rep) ({ \ - unsigned long __todo = (ctxt->regs->eflags & EFLG_DF) ? (ea) : ~(ea); \ - __todo = truncate_word(__todo, ad_bytes); \ - __todo = (__todo / (bytes_per_rep)) + 1; \ - (reps) = (__todo < (reps)) ? __todo : (reps); \ - truncate_word((ea), ad_bytes); \ + unsigned long todo__, ea__ = truncate_word(ea, ad_bytes); \ + if ( !(ctxt->regs->eflags & EFLG_DF) ) \ + todo__ = truncate_word(-(ea), ad_bytes) / (bytes_per_rep); \ + else if ( truncate_word((ea) + (bytes_per_rep) - 1, ad_bytes) < ea__ )\ + todo__ = 1; \ + else \ + todo__ = ea__ / (bytes_per_rep) + 1; \ + if ( !todo__ ) \ + (reps) = 1; \ + else if ( todo__ < (reps) ) \ + (reps) = todo__; \ + ea__; \ }) /* Compatibility function: read guest memory, zero-extend result to a ulong. */ @@ -2385,8 +2392,9 @@ x86_emulate( dst.bytes = (d & ByteOp) ? 1 : op_bytes; dst.mem.seg = x86_seg_es; dst.mem.off = truncate_ea_and_reps(_regs.edi, nr_reps, dst.bytes); + src.mem.off = truncate_ea_and_reps(_regs.esi, nr_reps, dst.bytes); if ( (nr_reps > 1) && (ops->rep_movs != NULL) && - ((rc = ops->rep_movs(ea.mem.seg, truncate_ea(_regs.esi), + ((rc = ops->rep_movs(ea.mem.seg, src.mem.off, dst.mem.seg, dst.mem.off, dst.bytes, &nr_reps, ctxt)) != X86EMUL_UNHANDLEABLE) ) { @@ -2395,7 +2403,7 @@ x86_emulate( } else { - if ( (rc = read_ulong(ea.mem.seg, truncate_ea(_regs.esi), + if ( (rc = read_ulong(ea.mem.seg, src.mem.off, &dst.val, dst.bytes, ctxt, ops)) != 0 ) goto done; dst.type = OP_MEM; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 24 07:33:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7V-0006PV-1s; Tue, 24 Sep 2013 07:33:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7U-0006PM-1c for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:16 +0000 Received: from [193.109.254.147:21100] by server-16.bemta-14.messagelabs.com id CE/1B-06264-B3041425; Tue, 24 Sep 2013 07:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1380007993!1618272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27844 invoked from network); 24 Sep 2013 07:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7R-0007L4-IF for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7R-00044D-FW for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:13 +0000 Date: Tue, 24 Sep 2013 07:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: linear address must be canonical for the whole accessed range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f12732670b31b2fea899a4160d455574658474f Author: Jan Beulich AuthorDate: Mon Sep 23 09:53:55 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:53:55 2013 +0200 x86/HVM: linear address must be canonical for the whole accessed range ... rather than just for the first byte. While at it, also - make the real mode case at least dpo a wrap around check - drop the mis-named "gpf" label (we're not generating faults here) and use in-place returns instead Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7203184..e0e0f5d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1931,8 +1931,7 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr) { - unsigned long addr = offset; - uint32_t last_byte; + unsigned long addr = offset, last_byte; if ( !(current->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE) ) { @@ -1941,6 +1940,9 @@ int hvm_virtual_to_linear_addr( * Certain of them are not done in native real mode anyway. */ addr = (uint32_t)(addr + reg->base); + last_byte = (uint32_t)addr + bytes - 1; + if ( last_byte < addr ) + return 0; } else if ( addr_size != 64 ) { @@ -1952,17 +1954,17 @@ int hvm_virtual_to_linear_addr( { case hvm_access_read: if ( (reg->attr.fields.type & 0xa) == 0x8 ) - goto gpf; /* execute-only code segment */ + return 0; /* execute-only code segment */ break; case hvm_access_write: if ( (reg->attr.fields.type & 0xa) != 0x2 ) - goto gpf; /* not a writable data segment */ + return 0; /* not a writable data segment */ break; default: break; } - last_byte = offset + bytes - 1; + last_byte = (uint32_t)offset + bytes - 1; /* Is this a grows-down data segment? Special limit check if so. */ if ( (reg->attr.fields.type & 0xc) == 0x4 ) @@ -1973,10 +1975,10 @@ int hvm_virtual_to_linear_addr( /* Check first byte and last byte against respective bounds. */ if ( (offset <= reg->limit) || (last_byte < offset) ) - goto gpf; + return 0; } else if ( (last_byte > reg->limit) || (last_byte < offset) ) - goto gpf; /* last byte is beyond limit or wraps 0xFFFFFFFF */ + return 0; /* last byte is beyond limit or wraps 0xFFFFFFFF */ /* * Hardware truncates to 32 bits in compatibility mode. @@ -1993,15 +1995,14 @@ int hvm_virtual_to_linear_addr( if ( (seg == x86_seg_fs) || (seg == x86_seg_gs) ) addr += reg->base; - if ( !is_canonical_address(addr) ) - goto gpf; + last_byte = addr + bytes - 1; + if ( !is_canonical_address(addr) || last_byte < addr || + !is_canonical_address(last_byte) ) + return 0; } *linear_addr = addr; return 1; - - gpf: - return 0; } /* On non-NULL return, we leave this function holding an additional -- generated by git-patchbot for /home/xen/git/xen.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 Sep 24 07:33:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7V-0006PV-1s; Tue, 24 Sep 2013 07:33:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7U-0006PM-1c for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:16 +0000 Received: from [193.109.254.147:21100] by server-16.bemta-14.messagelabs.com id CE/1B-06264-B3041425; Tue, 24 Sep 2013 07:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1380007993!1618272!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27844 invoked from network); 24 Sep 2013 07:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7R-0007L4-IF for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7R-00044D-FW for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:13 +0000 Date: Tue, 24 Sep 2013 07:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: linear address must be canonical for the whole accessed range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f12732670b31b2fea899a4160d455574658474f Author: Jan Beulich AuthorDate: Mon Sep 23 09:53:55 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:53:55 2013 +0200 x86/HVM: linear address must be canonical for the whole accessed range ... rather than just for the first byte. While at it, also - make the real mode case at least dpo a wrap around check - drop the mis-named "gpf" label (we're not generating faults here) and use in-place returns instead Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7203184..e0e0f5d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1931,8 +1931,7 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr) { - unsigned long addr = offset; - uint32_t last_byte; + unsigned long addr = offset, last_byte; if ( !(current->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE) ) { @@ -1941,6 +1940,9 @@ int hvm_virtual_to_linear_addr( * Certain of them are not done in native real mode anyway. */ addr = (uint32_t)(addr + reg->base); + last_byte = (uint32_t)addr + bytes - 1; + if ( last_byte < addr ) + return 0; } else if ( addr_size != 64 ) { @@ -1952,17 +1954,17 @@ int hvm_virtual_to_linear_addr( { case hvm_access_read: if ( (reg->attr.fields.type & 0xa) == 0x8 ) - goto gpf; /* execute-only code segment */ + return 0; /* execute-only code segment */ break; case hvm_access_write: if ( (reg->attr.fields.type & 0xa) != 0x2 ) - goto gpf; /* not a writable data segment */ + return 0; /* not a writable data segment */ break; default: break; } - last_byte = offset + bytes - 1; + last_byte = (uint32_t)offset + bytes - 1; /* Is this a grows-down data segment? Special limit check if so. */ if ( (reg->attr.fields.type & 0xc) == 0x4 ) @@ -1973,10 +1975,10 @@ int hvm_virtual_to_linear_addr( /* Check first byte and last byte against respective bounds. */ if ( (offset <= reg->limit) || (last_byte < offset) ) - goto gpf; + return 0; } else if ( (last_byte > reg->limit) || (last_byte < offset) ) - goto gpf; /* last byte is beyond limit or wraps 0xFFFFFFFF */ + return 0; /* last byte is beyond limit or wraps 0xFFFFFFFF */ /* * Hardware truncates to 32 bits in compatibility mode. @@ -1993,15 +1995,14 @@ int hvm_virtual_to_linear_addr( if ( (seg == x86_seg_fs) || (seg == x86_seg_gs) ) addr += reg->base; - if ( !is_canonical_address(addr) ) - goto gpf; + last_byte = addr + bytes - 1; + if ( !is_canonical_address(addr) || last_byte < addr || + !is_canonical_address(last_byte) ) + return 0; } *linear_addr = addr; return 1; - - gpf: - return 0; } /* On non-NULL return, we leave this function holding an additional -- generated by git-patchbot for /home/xen/git/xen.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 Sep 24 07:33:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33: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 1VON7g-0006Qb-6a; Tue, 24 Sep 2013 07:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7e-0006QF-Ot for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:27 +0000 Received: from [85.158.137.68:62590] by server-11.bemta-3.messagelabs.com id AD/A1-16607-54041425; Tue, 24 Sep 2013 07:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1380008003!4337474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15614 invoked from network); 24 Sep 2013 07:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7b-0007LA-NY for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7b-000456-LK for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:23 +0000 Date: Tue, 24 Sep 2013 07:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: refuse doing string operations in certain situations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14fcce2fa883405bab26b60821a6cc5f2c770833 Author: Jan Beulich AuthorDate: Mon Sep 23 09:55:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:55:14 2013 +0200 x86/HVM: refuse doing string operations in certain situations We shouldn't do any acceleration for - "rep movs" when either side is passed through MMIO or when both sides are handled by qemu - "rep ins" and "rep outs" when the memory operand is any kind of MMIO Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/emulate.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 4ce4e0c..b206997 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -686,6 +686,7 @@ static int hvmemul_rep_ins( unsigned long addr; uint32_t pfec = PFEC_page_present | PFEC_write_access; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -702,6 +703,10 @@ static int hvmemul_rep_ins( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -719,6 +724,7 @@ static int hvmemul_rep_outs( unsigned long addr; uint32_t pfec = PFEC_page_present; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -735,6 +741,10 @@ static int hvmemul_rep_outs( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -787,6 +797,10 @@ static int hvmemul_rep_movs( (void) get_gfn_query_unlocked(current->domain, sgpa >> PAGE_SHIFT, &sp2mt); (void) get_gfn_query_unlocked(current->domain, dgpa >> PAGE_SHIFT, &dp2mt); + if ( sp2mt == p2m_mmio_direct || dp2mt == p2m_mmio_direct || + (sp2mt == p2m_mmio_dm && dp2mt == p2m_mmio_dm) ) + return X86EMUL_UNHANDLEABLE; + if ( sp2mt == p2m_mmio_dm ) return hvmemul_do_mmio( sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 24 07:33:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33: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 1VON7g-0006Qb-6a; Tue, 24 Sep 2013 07:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7e-0006QF-Ot for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:27 +0000 Received: from [85.158.137.68:62590] by server-11.bemta-3.messagelabs.com id AD/A1-16607-54041425; Tue, 24 Sep 2013 07:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1380008003!4337474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15614 invoked from network); 24 Sep 2013 07:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7b-0007LA-NY for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7b-000456-LK for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:23 +0000 Date: Tue, 24 Sep 2013 07:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: refuse doing string operations in certain situations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14fcce2fa883405bab26b60821a6cc5f2c770833 Author: Jan Beulich AuthorDate: Mon Sep 23 09:55:14 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 09:55:14 2013 +0200 x86/HVM: refuse doing string operations in certain situations We shouldn't do any acceleration for - "rep movs" when either side is passed through MMIO or when both sides are handled by qemu - "rep ins" and "rep outs" when the memory operand is any kind of MMIO Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/emulate.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 4ce4e0c..b206997 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -686,6 +686,7 @@ static int hvmemul_rep_ins( unsigned long addr; uint32_t pfec = PFEC_page_present | PFEC_write_access; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -702,6 +703,10 @@ static int hvmemul_rep_ins( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -719,6 +724,7 @@ static int hvmemul_rep_outs( unsigned long addr; uint32_t pfec = PFEC_page_present; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -735,6 +741,10 @@ static int hvmemul_rep_outs( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -787,6 +797,10 @@ static int hvmemul_rep_movs( (void) get_gfn_query_unlocked(current->domain, sgpa >> PAGE_SHIFT, &sp2mt); (void) get_gfn_query_unlocked(current->domain, dgpa >> PAGE_SHIFT, &dp2mt); + if ( sp2mt == p2m_mmio_direct || dp2mt == p2m_mmio_direct || + (sp2mt == p2m_mmio_dm && dp2mt == p2m_mmio_dm) ) + return X86EMUL_UNHANDLEABLE; + if ( sp2mt == p2m_mmio_dm ) return hvmemul_do_mmio( sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 24 07:33:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 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 1VON7s-0006Rv-9d; Tue, 24 Sep 2013 07:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7q-0006Re-6d for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:38 +0000 Received: from [85.158.139.211:36535] by server-11.bemta-5.messagelabs.com id CB/2D-10409-15041425; Tue, 24 Sep 2013 07:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380008014!4191181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15706 invoked from network); 24 Sep 2013 07:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 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 1VON7l-0007LI-TM for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7l-00045W-R9 for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:33 +0000 Date: Tue, 24 Sep 2013 07:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: also use proper instruction mnemonic for VMREAD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 36291997b655421e1b5d3cfe5c012464b1041ba8 Author: Jan Beulich AuthorDate: Mon Sep 23 17:37:00 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 17:37:00 2013 +0200 VMX: also use proper instruction mnemonic for VMREAD ... when assembler supports it, following commit cfd54835 ("VMX: use proper instruction mnemonics if assembler supports them"). This merely got split off from the earlier change becase of the significant number of call sites needing to be changed. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/intr.c | 40 +++++- xen/arch/x86/hvm/vmx/realmode.c | 7 +- xen/arch/x86/hvm/vmx/vmcs.c | 10 +- xen/arch/x86/hvm/vmx/vmx.c | 262 +++++++++++++++++++++---------------- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- xen/arch/x86/hvm/vmx/vvmx.c | 60 +++++---- xen/include/asm-x86/hvm/vmx/vmx.h | 21 ++- 7 files changed, 246 insertions(+), 156 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index e6d5b46..1942e31 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -76,7 +76,9 @@ static void enable_intr_window(struct vcpu *v, struct hvm_intack intack) if ( unlikely(tb_init_done) ) { - unsigned int intr = __vmread(VM_ENTRY_INTR_INFO); + unsigned long intr; + + __vmread(VM_ENTRY_INTR_INFO, &intr); HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); } @@ -92,7 +94,9 @@ static void enable_intr_window(struct vcpu *v, struct hvm_intack intack) * we may immediately vmexit and hance make no progress! * (see SDM 3B 21.3, "Other Causes of VM Exits"). */ - u32 intr_shadow = __vmread(GUEST_INTERRUPTIBILITY_INFO); + unsigned long intr_shadow; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); if ( intr_shadow & VMX_INTR_SHADOW_STI ) { /* Having both STI-blocking and MOV-SS-blocking fails vmentry. */ @@ -151,9 +155,16 @@ enum hvm_intblk nvmx_intr_blocked(struct vcpu *v) if ( nestedhvm_vcpu_in_guestmode(v) ) { if ( nvcpu->nv_vmexit_pending || - nvcpu->nv_vmswitch_in_progress || - (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK) ) + nvcpu->nv_vmswitch_in_progress ) r = hvm_intblk_rflags_ie; + else + { + unsigned long intr_info; + + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) + r = hvm_intblk_rflags_ie; + } } else if ( nvcpu->nv_vmentry_pending ) r = hvm_intblk_rflags_ie; @@ -228,6 +239,8 @@ void vmx_intr_assist(void) pt_vector = pt_update_irq(v); do { + unsigned long intr_info; + intack = hvm_vcpu_has_pending_irq(v); if ( likely(intack.source == hvm_intsrc_none) ) goto out; @@ -247,7 +260,8 @@ void vmx_intr_assist(void) goto out; } - if ( __vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK ) + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) { if ( (intack.source == hvm_intsrc_pic) || (intack.source == hvm_intsrc_nmi) || @@ -262,12 +276,21 @@ void vmx_intr_assist(void) ASSERT(intack.source == hvm_intsrc_lapic); tpr_threshold = intack.vector >> 4; goto out; - } else if ( (intblk != hvm_intblk_none) || - (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK) ) + } + else if ( intblk != hvm_intblk_none ) { enable_intr_window(v, intack); goto out; } + else + { + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) + { + enable_intr_window(v, intack); + goto out; + } + } intack = hvm_vcpu_ack_pending_irq(v, intack); } while ( intack.source == hvm_intsrc_none ); @@ -284,7 +307,7 @@ void vmx_intr_assist(void) intack.source != hvm_intsrc_pic && intack.source != hvm_intsrc_vector ) { - unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned long status; unsigned int i, n; /* @@ -296,6 +319,7 @@ void vmx_intr_assist(void) vmx_set_eoi_exit_bitmap(v, pt_vector); /* we need update the RVI field */ + __vmread(GUEST_INTR_STATUS, &status); status &= ~VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK; status |= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK & intack.vector; diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c index ce7a13b..2e12e24 100644 --- a/xen/arch/x86/hvm/vmx/realmode.c +++ b/xen/arch/x86/hvm/vmx/realmode.c @@ -104,7 +104,6 @@ static void realmode_deliver_exception( static void realmode_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt) { struct vcpu *curr = current; - uint32_t intr_info; int rc; perfc_incr(realmode_emulations); @@ -121,7 +120,9 @@ static void realmode_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt) { if ( !hvmemul_ctxt->exn_pending ) { - intr_info = __vmread(VM_ENTRY_INTR_INFO); + unsigned long intr_info; + + __vmread(VM_ENTRY_INTR_INFO, &intr_info); __vmwrite(VM_ENTRY_INTR_INFO, 0); if ( !(intr_info & INTR_INFO_VALID_MASK) ) { @@ -177,7 +178,7 @@ void vmx_realmode(struct cpu_user_regs *regs) unsigned int emulations = 0; /* Get-and-clear VM_ENTRY_INTR_INFO. */ - intr_info = __vmread(VM_ENTRY_INTR_INFO); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); if ( intr_info & INTR_INFO_VALID_MASK ) __vmwrite(VM_ENTRY_INTR_INFO, 0); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 0be5616..89a22a4 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -815,7 +815,7 @@ u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding) u64 res; virtual_vmcs_enter(vvmcs); - res = __vmread(vmcs_encoding); + __vmread(vmcs_encoding, &res); virtual_vmcs_exit(vvmcs); return res; @@ -1219,14 +1219,18 @@ void vmx_destroy_vmcs(struct vcpu *v) void vm_launch_fail(void) { - unsigned long error = __vmread(VM_INSTRUCTION_ERROR); + unsigned long error; + + __vmread(VM_INSTRUCTION_ERROR, &error); printk(" error code %lx\n", error); domain_crash_synchronous(); } void vm_resume_fail(void) { - unsigned long error = __vmread(VM_INSTRUCTION_ERROR); + unsigned long error; + + __vmread(VM_INSTRUCTION_ERROR, &error); printk(" error code %lx\n", error); domain_crash_synchronous(); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d6a7710..9ca8632 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -163,11 +163,11 @@ long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) switch ( msr ) { case MSR_FS_BASE: - *msr_content = __vmread(GUEST_FS_BASE); + __vmread(GUEST_FS_BASE, msr_content); break; case MSR_GS_BASE: - *msr_content = __vmread(GUEST_GS_BASE); + __vmread(GUEST_GS_BASE, msr_content); break; case MSR_SHADOW_GS_BASE: @@ -348,13 +348,13 @@ void vmx_update_exception_bitmap(struct vcpu *v) static int vmx_guest_x86_mode(struct vcpu *v) { - unsigned int cs_ar_bytes; + unsigned long cs_ar_bytes; if ( unlikely(!(v->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE)) ) return 0; if ( unlikely(guest_cpu_user_regs()->eflags & X86_EFLAGS_VM) ) return 1; - cs_ar_bytes = __vmread(GUEST_CS_AR_BYTES); + __vmread(GUEST_CS_AR_BYTES, &cs_ar_bytes); if ( hvm_long_mode_enabled(v) && likely(cs_ar_bytes & X86_SEG_AR_CS_LM_ACTIVE) ) return 8; @@ -377,7 +377,7 @@ static void vmx_save_dr(struct vcpu *v) v->arch.debugreg[3] = read_debugreg(3); v->arch.debugreg[6] = read_debugreg(6); /* DR7 must be saved as it is used by vmx_restore_dr(). */ - v->arch.debugreg[7] = __vmread(GUEST_DR7); + __vmread(GUEST_DR7, &v->arch.debugreg[7]); } static void __restore_debug_registers(struct vcpu *v) @@ -410,7 +410,7 @@ static void vmx_restore_dr(struct vcpu *v) static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) { - uint32_t ev; + unsigned long ev; vmx_vmcs_enter(v); @@ -421,17 +421,19 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) c->msr_efer = v->arch.hvm_vcpu.guest_efer; - c->sysenter_cs = __vmread(GUEST_SYSENTER_CS); - c->sysenter_esp = __vmread(GUEST_SYSENTER_ESP); - c->sysenter_eip = __vmread(GUEST_SYSENTER_EIP); + __vmread(GUEST_SYSENTER_CS, &c->sysenter_cs); + __vmread(GUEST_SYSENTER_ESP, &c->sysenter_esp); + __vmread(GUEST_SYSENTER_EIP, &c->sysenter_eip); c->pending_event = 0; c->error_code = 0; - if ( ((ev = __vmread(VM_ENTRY_INTR_INFO)) & INTR_INFO_VALID_MASK) && + __vmread(VM_ENTRY_INTR_INFO, &ev); + if ( (ev & INTR_INFO_VALID_MASK) && hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) ) { c->pending_event = ev; - c->error_code = __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE); + __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE, &ev); + c->error_code = ev; } vmx_vmcs_exit(v); @@ -667,74 +669,78 @@ static void vmx_ctxt_switch_to(struct vcpu *v) void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, struct segment_register *reg) { - uint32_t attr = 0; + unsigned long attr = 0, sel = 0, limit; vmx_vmcs_enter(v); switch ( seg ) { case x86_seg_cs: - reg->sel = __vmread(GUEST_CS_SELECTOR); - reg->limit = __vmread(GUEST_CS_LIMIT); - reg->base = __vmread(GUEST_CS_BASE); - attr = __vmread(GUEST_CS_AR_BYTES); + __vmread(GUEST_CS_SELECTOR, &sel); + __vmread(GUEST_CS_LIMIT, &limit); + __vmread(GUEST_CS_BASE, ®->base); + __vmread(GUEST_CS_AR_BYTES, &attr); break; case x86_seg_ds: - reg->sel = __vmread(GUEST_DS_SELECTOR); - reg->limit = __vmread(GUEST_DS_LIMIT); - reg->base = __vmread(GUEST_DS_BASE); - attr = __vmread(GUEST_DS_AR_BYTES); + __vmread(GUEST_DS_SELECTOR, &sel); + __vmread(GUEST_DS_LIMIT, &limit); + __vmread(GUEST_DS_BASE, ®->base); + __vmread(GUEST_DS_AR_BYTES, &attr); break; case x86_seg_es: - reg->sel = __vmread(GUEST_ES_SELECTOR); - reg->limit = __vmread(GUEST_ES_LIMIT); - reg->base = __vmread(GUEST_ES_BASE); - attr = __vmread(GUEST_ES_AR_BYTES); + __vmread(GUEST_ES_SELECTOR, &sel); + __vmread(GUEST_ES_LIMIT, &limit); + __vmread(GUEST_ES_BASE, ®->base); + __vmread(GUEST_ES_AR_BYTES, &attr); break; case x86_seg_fs: - reg->sel = __vmread(GUEST_FS_SELECTOR); - reg->limit = __vmread(GUEST_FS_LIMIT); - reg->base = __vmread(GUEST_FS_BASE); - attr = __vmread(GUEST_FS_AR_BYTES); + __vmread(GUEST_FS_SELECTOR, &sel); + __vmread(GUEST_FS_LIMIT, &limit); + __vmread(GUEST_FS_BASE, ®->base); + __vmread(GUEST_FS_AR_BYTES, &attr); break; case x86_seg_gs: - reg->sel = __vmread(GUEST_GS_SELECTOR); - reg->limit = __vmread(GUEST_GS_LIMIT); - reg->base = __vmread(GUEST_GS_BASE); - attr = __vmread(GUEST_GS_AR_BYTES); + __vmread(GUEST_GS_SELECTOR, &sel); + __vmread(GUEST_GS_LIMIT, &limit); + __vmread(GUEST_GS_BASE, ®->base); + __vmread(GUEST_GS_AR_BYTES, &attr); break; case x86_seg_ss: - reg->sel = __vmread(GUEST_SS_SELECTOR); - reg->limit = __vmread(GUEST_SS_LIMIT); - reg->base = __vmread(GUEST_SS_BASE); - attr = __vmread(GUEST_SS_AR_BYTES); + __vmread(GUEST_SS_SELECTOR, &sel); + __vmread(GUEST_SS_LIMIT, &limit); + __vmread(GUEST_SS_BASE, ®->base); + __vmread(GUEST_SS_AR_BYTES, &attr); break; case x86_seg_tr: - reg->sel = __vmread(GUEST_TR_SELECTOR); - reg->limit = __vmread(GUEST_TR_LIMIT); - reg->base = __vmread(GUEST_TR_BASE); - attr = __vmread(GUEST_TR_AR_BYTES); + __vmread(GUEST_TR_SELECTOR, &sel); + __vmread(GUEST_TR_LIMIT, &limit); + __vmread(GUEST_TR_BASE, ®->base); + __vmread(GUEST_TR_AR_BYTES, &attr); break; case x86_seg_gdtr: - reg->limit = __vmread(GUEST_GDTR_LIMIT); - reg->base = __vmread(GUEST_GDTR_BASE); + __vmread(GUEST_GDTR_LIMIT, &limit); + __vmread(GUEST_GDTR_BASE, ®->base); break; case x86_seg_idtr: - reg->limit = __vmread(GUEST_IDTR_LIMIT); - reg->base = __vmread(GUEST_IDTR_BASE); + __vmread(GUEST_IDTR_LIMIT, &limit); + __vmread(GUEST_IDTR_BASE, ®->base); break; case x86_seg_ldtr: - reg->sel = __vmread(GUEST_LDTR_SELECTOR); - reg->limit = __vmread(GUEST_LDTR_LIMIT); - reg->base = __vmread(GUEST_LDTR_BASE); - attr = __vmread(GUEST_LDTR_AR_BYTES); + __vmread(GUEST_LDTR_SELECTOR, &sel); + __vmread(GUEST_LDTR_LIMIT, &limit); + __vmread(GUEST_LDTR_BASE, ®->base); + __vmread(GUEST_LDTR_AR_BYTES, &attr); break; default: BUG(); + return; } vmx_vmcs_exit(v); + reg->sel = sel; + reg->limit = limit; + reg->attr.bytes = (attr & 0xff) | ((attr >> 4) & 0xf00); /* Unusable flag is folded into Present flag. */ if ( attr & (1u<<16) ) @@ -917,7 +923,7 @@ static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) return 0; vmx_vmcs_enter(v); - *gpat = __vmread(GUEST_PAT); + __vmread(GUEST_PAT, gpat); vmx_vmcs_exit(v); return 1; } @@ -968,7 +974,11 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) static unsigned int vmx_get_interrupt_shadow(struct vcpu *v) { - return __vmread(GUEST_INTERRUPTIBILITY_INFO); + unsigned long intr_shadow; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); + + return intr_shadow; } static void vmx_set_interrupt_shadow(struct vcpu *v, unsigned int intr_shadow) @@ -1193,7 +1203,7 @@ static void vmx_update_guest_efer(struct vcpu *v) vmx_vmcs_enter(v); - vm_entry_value = __vmread(VM_ENTRY_CONTROLS); + __vmread(VM_ENTRY_CONTROLS, &vm_entry_value); if ( v->arch.hvm_vcpu.guest_efer & EFER_LMA ) vm_entry_value |= VM_ENTRY_IA32E_MODE; else @@ -1319,7 +1329,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) if ( nestedhvm_vcpu_in_guestmode(curr) ) intr_info = vcpu_2_nvmx(curr).intr.intr_info; else - intr_info = __vmread(VM_ENTRY_INTR_INFO); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); switch ( _trap.vector ) { @@ -1374,8 +1384,12 @@ static void vmx_inject_trap(struct hvm_trap *trap) static int vmx_event_pending(struct vcpu *v) { + unsigned long intr_info; + ASSERT(v == current); - return (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + + return intr_info & INTR_INFO_VALID_MASK; } static void vmx_set_uc_mode(struct vcpu *v) @@ -1402,7 +1416,7 @@ static void vmx_set_info_guest(struct vcpu *v) * to set the GUEST_PENDING_DBG_EXCEPTIONS.BS here incurs * immediately vmexit and hence make no progress. */ - intr_shadow = __vmread(GUEST_INTERRUPTIBILITY_INFO); + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); if ( v->domain->debugger_attached && (v->arch.user_regs.eflags & X86_EFLAGS_TF) && (intr_shadow & VMX_INTR_SHADOW_STI) ) @@ -1436,7 +1450,7 @@ static void vmx_process_isr(int isr, struct vcpu *v) isr = 0; vmx_vmcs_enter(v); - status = __vmread(GUEST_INTR_STATUS); + __vmread(GUEST_INTR_STATUS, &status); old = status >> VMX_GUEST_INTR_STATUS_SVI_OFFSET; if ( isr != old ) { @@ -1503,9 +1517,10 @@ static void vmx_sync_pir_to_irr(struct vcpu *v) static void vmx_handle_eoi(u8 vector) { - unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned long status; /* We need to clear the SVI field. */ + __vmread(GUEST_INTR_STATUS, &status); status &= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK; __vmwrite(GUEST_INTR_STATUS, status); } @@ -1616,8 +1631,9 @@ const struct hvm_function_table * __init start_vmx(void) */ static int get_instruction_length(void) { - int len; - len = __vmread(VM_EXIT_INSTRUCTION_LEN); /* Safe: callers audited */ + unsigned long len; + + __vmread(VM_EXIT_INSTRUCTION_LEN, &len); /* Safe: callers audited */ BUG_ON((len < 1) || (len > 15)); return len; } @@ -1630,7 +1646,7 @@ void update_guest_eip(void) regs->eip += get_instruction_length(); /* Safe: callers audited */ regs->eflags &= ~X86_EFLAGS_RF; - x = __vmread(GUEST_INTERRUPTIBILITY_INFO); + __vmread(GUEST_INTERRUPTIBILITY_INFO, &x); if ( x & (VMX_INTR_SHADOW_STI | VMX_INTR_SHADOW_MOV_SS) ) { x &= ~(VMX_INTR_SHADOW_STI | VMX_INTR_SHADOW_MOV_SS); @@ -1860,16 +1876,16 @@ static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) switch ( msr ) { case MSR_IA32_SYSENTER_CS: - *msr_content = (u32)__vmread(GUEST_SYSENTER_CS); + __vmread(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: - *msr_content = __vmread(GUEST_SYSENTER_ESP); + __vmread(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: - *msr_content = __vmread(GUEST_SYSENTER_EIP); + __vmread(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: - *msr_content = __vmread(GUEST_IA32_DEBUGCTL); + __vmread(GUEST_IA32_DEBUGCTL, msr_content); break; case IA32_FEATURE_CONTROL_MSR: case MSR_IA32_VMX_BASIC...MSR_IA32_VMX_TRUE_ENTRY_CTLS: @@ -2132,9 +2148,9 @@ gp_fault: static void vmx_do_extint(struct cpu_user_regs *regs) { - unsigned int vector; + unsigned long vector; - vector = __vmread(VM_EXIT_INTR_INFO); + __vmread(VM_EXIT_INTR_INFO, &vector); BUG_ON(!(vector & INTR_INFO_VALID_MASK)); vector &= INTR_INFO_VECTOR_MASK; @@ -2187,13 +2203,15 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); } + if ( qualification & EPT_GLA_VALID ) + __vmread(GUEST_LINEAR_ADDRESS, &gla); + else + gla = ~0ull; ret = hvm_hap_nested_page_fault(gpa, - qualification & EPT_GLA_VALID ? 1 : 0, - qualification & EPT_GLA_VALID - ? __vmread(GUEST_LINEAR_ADDRESS) : ~0ull, - qualification & EPT_READ_VIOLATION ? 1 : 0, - qualification & EPT_WRITE_VIOLATION ? 1 : 0, - qualification & EPT_EXEC_VIOLATION ? 1 : 0); + !!(qualification & EPT_GLA_VALID), gla, + !!(qualification & EPT_READ_VIOLATION), + !!(qualification & EPT_WRITE_VIOLATION), + !!(qualification & EPT_EXEC_VIOLATION)); switch ( ret ) { case 0: // Unhandled L1 EPT violation @@ -2227,10 +2245,7 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) ept_walk_table(d, gfn); if ( qualification & EPT_GLA_VALID ) - { - gla = __vmread(GUEST_LINEAR_ADDRESS); gdprintk(XENLOG_ERR, " --- GLA %#lx\n", gla); - } domain_crash(d); } @@ -2239,10 +2254,11 @@ static void vmx_failed_vmentry(unsigned int exit_reason, struct cpu_user_regs *regs) { unsigned int failed_vmentry_reason = (uint16_t)exit_reason; - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); + unsigned long exit_qualification; struct vcpu *curr = current; printk("Failed vm entry (exit reason %#x) ", exit_reason); + __vmread(EXIT_QUALIFICATION, &exit_qualification); switch ( failed_vmentry_reason ) { case EXIT_REASON_INVALID_GUEST_STATE: @@ -2305,12 +2321,13 @@ static void vmx_vmexit_ud_intercept(struct cpu_user_regs *regs) static int vmx_handle_eoi_write(void) { - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); + unsigned long exit_qualification; /* * 1. Must be a linear access data write. * 2. Data write must be to the EOI register. */ + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( (((exit_qualification >> 12) & 0xf) == 1) && ((exit_qualification & 0xfff) == APIC_EOI) ) { @@ -2335,8 +2352,12 @@ static void vmx_idtv_reinject(unsigned long idtv_info) __vmwrite(VM_ENTRY_INTR_INFO, idtv_info & ~INTR_INFO_RESVD_BITS_MASK); if ( idtv_info & INTR_INFO_DELIVER_CODE_MASK ) - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, - __vmread(IDT_VECTORING_ERROR_CODE)); + { + unsigned long ec; + + __vmread(IDT_VECTORING_ERROR_CODE, &ec); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, ec); + } } /* @@ -2344,20 +2365,24 @@ static void vmx_idtv_reinject(unsigned long idtv_info) * Re-delivery will re-set it (see SDM 3B 25.7.1.2). */ if ( (idtv_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI<<8) ) + { + unsigned long intr_info; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_info); __vmwrite(GUEST_INTERRUPTIBILITY_INFO, - __vmread(GUEST_INTERRUPTIBILITY_INFO) & - ~VMX_INTR_SHADOW_NMI); + intr_info & ~VMX_INTR_SHADOW_NMI); + } } } static int vmx_handle_apic_write(void) { - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); - unsigned int offset = exit_qualification & 0xfff; + unsigned long exit_qualification; ASSERT(cpu_has_vmx_apic_reg_virt); + __vmread(EXIT_QUALIFICATION, &exit_qualification); - return vlapic_apicv_write(current, offset); + return vlapic_apicv_write(current, exit_qualification & 0xfff); } /* @@ -2373,21 +2398,23 @@ void vmx_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) void vmx_vmexit_handler(struct cpu_user_regs *regs) { - unsigned int exit_reason, idtv_info, intr_info = 0, vector = 0; - unsigned long exit_qualification, inst_len = 0; + unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0; + unsigned int vector = 0; struct vcpu *v = current; - regs->rip = __vmread(GUEST_RIP); - regs->rsp = __vmread(GUEST_RSP); - regs->rflags = __vmread(GUEST_RFLAGS); + __vmread(GUEST_RIP, ®s->rip); + __vmread(GUEST_RSP, ®s->rsp); + __vmread(GUEST_RFLAGS, ®s->rflags); hvm_invalidate_regs_fields(regs); if ( paging_mode_hap(v->domain) && hvm_paging_enabled(v) ) - v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = - __vmread(GUEST_CR3); + { + __vmread(GUEST_CR3, &v->arch.hvm_vcpu.hw_cr[3]); + v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3]; + } - exit_reason = __vmread(VM_EXIT_REASON); + __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_enabled(v) ) HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, 3, exit_reason, @@ -2407,7 +2434,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vmx_do_extint(regs); break; case EXIT_REASON_EXCEPTION_NMI: - intr_info = __vmread(VM_EXIT_INTR_INFO); + __vmread(VM_EXIT_INTR_INFO, &intr_info); BUG_ON(!(intr_info & INTR_INFO_VALID_MASK)); vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) @@ -2485,13 +2512,15 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); - idtv_info = __vmread(IDT_VECTORING_INFO); + __vmread(IDT_VECTORING_INFO, &idtv_info); if ( !nestedhvm_vcpu_in_guestmode(v) && exit_reason != EXIT_REASON_TASK_SWITCH ) vmx_idtv_reinject(idtv_info); switch ( exit_reason ) { + unsigned long ecode; + case EXIT_REASON_EXCEPTION_NMI: { /* @@ -2508,9 +2537,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( unlikely(intr_info & INTR_INFO_NMI_UNBLOCKED_BY_IRET) && !(idtv_info & INTR_INFO_VALID_MASK) && (vector != TRAP_double_fault) ) + { + unsigned long guest_info; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &guest_info); __vmwrite(GUEST_INTERRUPTIBILITY_INFO, - __vmread(GUEST_INTERRUPTIBILITY_INFO) - | VMX_INTR_SHADOW_NMI); + guest_info | VMX_INTR_SHADOW_NMI); + } perfc_incra(cause_vector, vector); @@ -2521,7 +2554,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) * Updates DR6 where debugger can peek (See 3B 23.2.1, * Table 23-1, "Exit Qualification for Debug Exceptions"). */ - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); HVMTRACE_1D(TRAP_DEBUG, exit_qualification); write_debugreg(6, exit_qualification | 0xffff0ff0); if ( !v->domain->debugger_attached || cpu_has_monitor_trap_flag ) @@ -2547,8 +2580,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) .vector = TRAP_int3, .type = X86_EVENTTYPE_SW_EXCEPTION, .error_code = HVM_DELIVER_NO_ERROR_CODE, - .insn_len = __vmread(VM_EXIT_INSTRUCTION_LEN) }; + unsigned long insn_len; + + __vmread(VM_EXIT_INSTRUCTION_LEN, &insn_len); + trap.insn_len = insn_len; hvm_inject_trap(&trap); break; } @@ -2563,8 +2599,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vmx_fpu_dirty_intercept(); break; case TRAP_page_fault: - exit_qualification = __vmread(EXIT_QUALIFICATION); - regs->error_code = __vmread(VM_EXIT_INTR_ERROR_CODE); + __vmread(EXIT_QUALIFICATION, &exit_qualification); + __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); + regs->error_code = ecode; HVM_DBG_LOG(DBG_LEVEL_VMMU, "eax=%lx, ebx=%lx, ecx=%lx, edx=%lx, esi=%lx, edi=%lx", @@ -2628,9 +2665,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) static const enum hvm_task_switch_reason reasons[] = { TSW_call_or_int, TSW_iret, TSW_jmp, TSW_call_or_int }; - int32_t ecode = -1, source; + unsigned int inst_len, source; - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); source = (exit_qualification >> 30) & 3; /* Vectored event should fill in interrupt information. */ WARN_ON((source == 3) && !(idtv_info & INTR_INFO_VALID_MASK)); @@ -2643,7 +2680,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (idtv_info & (1u<<10))) /* IntrType > 3? */ ? get_instruction_length() /* Safe: SDM 3B 23.2.4 */ : 0; if ( (source == 3) && (idtv_info & INTR_INFO_DELIVER_CODE_MASK) ) - ecode = __vmread(IDT_VECTORING_ERROR_CODE); + __vmread(IDT_VECTORING_ERROR_CODE, &ecode); + else + ecode = -1; regs->eip += inst_len; hvm_task_switch((uint16_t)exit_qualification, reasons[source], ecode); break; @@ -2658,7 +2697,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_INVLPG: update_guest_eip(); /* Safe: INVLPG */ - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); vmx_invlpg_intercept(exit_qualification); break; case EXIT_REASON_RDTSCP: @@ -2683,13 +2722,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) } case EXIT_REASON_CR_ACCESS: { - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( vmx_cr_access(exit_qualification) == X86EMUL_OKAY ) update_guest_eip(); /* Safe: MOV Cn, LMSW, CLTS */ break; } case EXIT_REASON_DR_ACCESS: - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); vmx_dr_access(exit_qualification, regs); break; case EXIT_REASON_MSR_READ: @@ -2790,7 +2829,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_EOI_INDUCED: { int vector; - exit_qualification = __vmread(EXIT_QUALIFICATION); + + __vmread(EXIT_QUALIFICATION, &exit_qualification); vector = exit_qualification & 0xff; vmx_handle_EOI_induced_exit(vcpu_vlapic(current), vector); @@ -2798,7 +2838,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) } case EXIT_REASON_IO_INSTRUCTION: - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( exit_qualification & 0x10 ) { /* INS, OUTS */ @@ -2826,8 +2866,10 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_EPT_VIOLATION: { - paddr_t gpa = __vmread(GUEST_PHYSICAL_ADDRESS); - exit_qualification = __vmread(EXIT_QUALIFICATION); + paddr_t gpa; + + __vmread(GUEST_PHYSICAL_ADDRESS, &gpa); + __vmread(EXIT_QUALIFICATION, &exit_qualification); ept_handle_violation(exit_qualification, gpa); break; } @@ -2866,7 +2908,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#x)\n", exit_reason); + gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2682223..ee26362 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -743,7 +743,7 @@ static int core2_vpmu_do_interrupt(struct cpu_user_regs *regs) else { /* No PMC overflow but perhaps a Trace Message interrupt. */ - msr_content = __vmread(GUEST_IA32_DEBUGCTL); + __vmread(GUEST_IA32_DEBUGCTL, &msr_content); if ( !(msr_content & IA32_DEBUGCTLMSR_TR) ) return 0; } diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index f385c02..ba617fa 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -425,7 +425,8 @@ static int decode_vmx_inst(struct cpu_user_regs *regs, if ( vmx_inst_check_privilege(regs, vmxon_check) != X86EMUL_OKAY ) return X86EMUL_EXCEPTION; - info.word = __vmread(VMX_INSTRUCTION_INFO); + __vmread(VMX_INSTRUCTION_INFO, &offset); + info.word = offset; if ( info.fields.memreg ) { decode->type = VMX_INST_MEMREG_TYPE_REG; @@ -458,7 +459,7 @@ static int decode_vmx_inst(struct cpu_user_regs *regs, scale = 1 << info.fields.scaling; - disp = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &disp); size = 1 << (info.fields.addr_size + 1); @@ -950,7 +951,7 @@ static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, virtual_vmcs_enter(vvmcs); for ( i = 0; i < n; i++ ) - value[i] = __vmread(field[i]); + __vmread(field[i], &value[i]); virtual_vmcs_exit(vvmcs); for ( i = 0; i < n; i++ ) @@ -991,7 +992,7 @@ static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, } for ( i = 0; i < n; i++ ) - value[i] = __vmread(field[i]); + __vmread(field[i], &value[i]); virtual_vmcs_enter(vvmcs); for ( i = 0; i < n; i++ ) @@ -1959,11 +1960,12 @@ nvmx_hap_walk_L1_p2m(struct vcpu *v, paddr_t L2_gpa, paddr_t *L1_gpa, { int rc; unsigned long gfn; - uint64_t exit_qual = __vmread(EXIT_QUALIFICATION); + uint64_t exit_qual; uint32_t exit_reason = EXIT_REASON_EPT_VIOLATION; uint32_t rwx_rights = (access_x << 2) | (access_w << 1) | access_r; struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + __vmread(EXIT_QUALIFICATION, &exit_qual); rc = nept_translate_l2ga(v, L2_gpa, page_order, rwx_rights, &gfn, p2m_acc, &exit_qual, &exit_reason); switch ( rc ) @@ -1995,8 +1997,9 @@ void nvmx_idtv_handling(void) struct vcpu *v = current; struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - unsigned int idtv_info = __vmread(IDT_VECTORING_INFO); + unsigned long idtv_info, reason; + __vmread(IDT_VECTORING_INFO, &idtv_info); if ( likely(!(idtv_info & INTR_INFO_VALID_MASK)) ) return; @@ -2004,15 +2007,17 @@ void nvmx_idtv_handling(void) * If L0 can solve the fault that causes idt vectoring, it should * be reinjected, otherwise, pass to L1. */ - if ( (__vmread(VM_EXIT_REASON) != EXIT_REASON_EPT_VIOLATION && - !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK)) || - (__vmread(VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION && - !nvcpu->nv_vmexit_pending) ) + __vmread(VM_EXIT_REASON, &reason); + if ( reason != EXIT_REASON_EPT_VIOLATION ? + !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK) : + !nvcpu->nv_vmexit_pending ) { __vmwrite(VM_ENTRY_INTR_INFO, idtv_info & ~INTR_INFO_RESVD_BITS_MASK); if ( idtv_info & INTR_INFO_DELIVER_CODE_MASK ) - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, - __vmread(IDT_VECTORING_ERROR_CODE)); + { + __vmread(IDT_VECTORING_ERROR_CODE, &reason); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, reason); + } /* * SDM 23.2.4, if L1 tries to inject a software interrupt * and the delivery fails, VM_EXIT_INSTRUCTION_LEN receives @@ -2021,7 +2026,8 @@ void nvmx_idtv_handling(void) * This means EXIT_INSTRUCTION_LEN is always valid here, for * software interrupts both injected by L1, and generated in L2. */ - __vmwrite(VM_ENTRY_INSTRUCTION_LEN, __vmread(VM_EXIT_INSTRUCTION_LEN)); + __vmread(VM_EXIT_INSTRUCTION_LEN, &reason); + __vmwrite(VM_ENTRY_INSTRUCTION_LEN, reason); } } @@ -2039,7 +2045,6 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); u32 ctrl; - u16 port; u8 *bitmap; nvcpu->nv_vmexit_pending = 0; @@ -2049,12 +2054,14 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, switch (exit_reason) { case EXIT_REASON_EXCEPTION_NMI: { - u32 intr_info = __vmread(VM_EXIT_INTR_INFO); + unsigned long intr_info; u32 valid_mask = (X86_EVENTTYPE_HW_EXCEPTION << 8) | INTR_INFO_VALID_MASK; u64 exec_bitmap; - int vector = intr_info & INTR_INFO_VECTOR_MASK; + int vector; + __vmread(VM_EXIT_INTR_INFO, &intr_info); + vector = intr_info & INTR_INFO_VECTOR_MASK; /* * decided by L0 and L1 exception bitmap, if the vetor is set by * both, L0 has priority on #PF and #NM, L1 has priority on others @@ -2123,7 +2130,11 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, ctrl = __n2_exec_control(v); if ( ctrl & CPU_BASED_ACTIVATE_IO_BITMAP ) { - port = __vmread(EXIT_QUALIFICATION) >> 16; + unsigned long qual; + u16 port; + + __vmread(EXIT_QUALIFICATION, &qual); + port = qual >> 16; bitmap = nvmx->iobitmap[port >> 15]; if ( bitmap[(port & 0x7fff) >> 4] & (1 << (port & 0x7)) ) nvcpu->nv_vmexit_pending = 1; @@ -2220,11 +2231,13 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, break; case EXIT_REASON_CR_ACCESS: { - u64 exit_qualification = __vmread(EXIT_QUALIFICATION); - int cr = exit_qualification & 15; - int write = (exit_qualification >> 4) & 3; + unsigned long exit_qualification; + int cr, write; u32 mask = 0; + __vmread(EXIT_QUALIFICATION, &exit_qualification); + cr = exit_qualification & 0xf; + write = (exit_qualification >> 4) & 3; /* also according to guest exec_control */ ctrl = __n2_exec_control(v); @@ -2268,7 +2281,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); - old_val = __vmread(CR0_READ_SHADOW); + __vmread(CR0_READ_SHADOW, &old_val); changed_bits = old_val ^ val; if ( changed_bits & cr0_gh_mask ) nvcpu->nv_vmexit_pending = 1; @@ -2283,7 +2296,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr4_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR4_GUEST_HOST_MASK); - old_val = __vmread(CR4_READ_SHADOW); + __vmread(CR4_READ_SHADOW, &old_val); changed_bits = old_val ^ val; if ( changed_bits & cr4_gh_mask ) nvcpu->nv_vmexit_pending = 1; @@ -2315,7 +2328,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); - old_val = __vmread(CR0_READ_SHADOW) & 0xf; + __vmread(CR0_READ_SHADOW, &old_val); + old_val &= 0xf; val = (exit_qualification >> 16) & 0xf; changed_bits = old_val ^ val; if ( changed_bits & cr0_gh_mask ) diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 9816ce4..0cb6a42 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -322,21 +322,26 @@ static inline void __vmpclear(u64 addr) : "memory"); } -static inline unsigned long __vmread(unsigned long field) +static inline void __vmread(unsigned long field, unsigned long *value) { - unsigned long ecx; - - asm volatile ( VMREAD_OPCODE - MODRM_EAX_ECX + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmread %1, %0\n\t" +#else + VMREAD_OPCODE MODRM_EAX_ECX +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmread) "\tud2\n" UNLIKELY_END_SECTION - : "=c" (ecx) +#ifdef HAVE_GAS_VMX + : "=rm" (*value) + : "r" (field) +#else + : "=c" (*value) : "a" (field) +#endif : "memory"); - - return ecx; } static inline void __vmwrite(unsigned long field, unsigned long value) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 24 07:33:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 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 1VON7s-0006Rv-9d; Tue, 24 Sep 2013 07:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7q-0006Re-6d for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:38 +0000 Received: from [85.158.139.211:36535] by server-11.bemta-5.messagelabs.com id CB/2D-10409-15041425; Tue, 24 Sep 2013 07:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380008014!4191181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15706 invoked from network); 24 Sep 2013 07:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 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 1VON7l-0007LI-TM for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7l-00045W-R9 for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:33 +0000 Date: Tue, 24 Sep 2013 07:33:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: also use proper instruction mnemonic for VMREAD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 36291997b655421e1b5d3cfe5c012464b1041ba8 Author: Jan Beulich AuthorDate: Mon Sep 23 17:37:00 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 17:37:00 2013 +0200 VMX: also use proper instruction mnemonic for VMREAD ... when assembler supports it, following commit cfd54835 ("VMX: use proper instruction mnemonics if assembler supports them"). This merely got split off from the earlier change becase of the significant number of call sites needing to be changed. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/intr.c | 40 +++++- xen/arch/x86/hvm/vmx/realmode.c | 7 +- xen/arch/x86/hvm/vmx/vmcs.c | 10 +- xen/arch/x86/hvm/vmx/vmx.c | 262 +++++++++++++++++++++---------------- xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +- xen/arch/x86/hvm/vmx/vvmx.c | 60 +++++---- xen/include/asm-x86/hvm/vmx/vmx.h | 21 ++- 7 files changed, 246 insertions(+), 156 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index e6d5b46..1942e31 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -76,7 +76,9 @@ static void enable_intr_window(struct vcpu *v, struct hvm_intack intack) if ( unlikely(tb_init_done) ) { - unsigned int intr = __vmread(VM_ENTRY_INTR_INFO); + unsigned long intr; + + __vmread(VM_ENTRY_INTR_INFO, &intr); HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); } @@ -92,7 +94,9 @@ static void enable_intr_window(struct vcpu *v, struct hvm_intack intack) * we may immediately vmexit and hance make no progress! * (see SDM 3B 21.3, "Other Causes of VM Exits"). */ - u32 intr_shadow = __vmread(GUEST_INTERRUPTIBILITY_INFO); + unsigned long intr_shadow; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); if ( intr_shadow & VMX_INTR_SHADOW_STI ) { /* Having both STI-blocking and MOV-SS-blocking fails vmentry. */ @@ -151,9 +155,16 @@ enum hvm_intblk nvmx_intr_blocked(struct vcpu *v) if ( nestedhvm_vcpu_in_guestmode(v) ) { if ( nvcpu->nv_vmexit_pending || - nvcpu->nv_vmswitch_in_progress || - (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK) ) + nvcpu->nv_vmswitch_in_progress ) r = hvm_intblk_rflags_ie; + else + { + unsigned long intr_info; + + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) + r = hvm_intblk_rflags_ie; + } } else if ( nvcpu->nv_vmentry_pending ) r = hvm_intblk_rflags_ie; @@ -228,6 +239,8 @@ void vmx_intr_assist(void) pt_vector = pt_update_irq(v); do { + unsigned long intr_info; + intack = hvm_vcpu_has_pending_irq(v); if ( likely(intack.source == hvm_intsrc_none) ) goto out; @@ -247,7 +260,8 @@ void vmx_intr_assist(void) goto out; } - if ( __vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK ) + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) { if ( (intack.source == hvm_intsrc_pic) || (intack.source == hvm_intsrc_nmi) || @@ -262,12 +276,21 @@ void vmx_intr_assist(void) ASSERT(intack.source == hvm_intsrc_lapic); tpr_threshold = intack.vector >> 4; goto out; - } else if ( (intblk != hvm_intblk_none) || - (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK) ) + } + else if ( intblk != hvm_intblk_none ) { enable_intr_window(v, intack); goto out; } + else + { + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( intr_info & INTR_INFO_VALID_MASK ) + { + enable_intr_window(v, intack); + goto out; + } + } intack = hvm_vcpu_ack_pending_irq(v, intack); } while ( intack.source == hvm_intsrc_none ); @@ -284,7 +307,7 @@ void vmx_intr_assist(void) intack.source != hvm_intsrc_pic && intack.source != hvm_intsrc_vector ) { - unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned long status; unsigned int i, n; /* @@ -296,6 +319,7 @@ void vmx_intr_assist(void) vmx_set_eoi_exit_bitmap(v, pt_vector); /* we need update the RVI field */ + __vmread(GUEST_INTR_STATUS, &status); status &= ~VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK; status |= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK & intack.vector; diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c index ce7a13b..2e12e24 100644 --- a/xen/arch/x86/hvm/vmx/realmode.c +++ b/xen/arch/x86/hvm/vmx/realmode.c @@ -104,7 +104,6 @@ static void realmode_deliver_exception( static void realmode_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt) { struct vcpu *curr = current; - uint32_t intr_info; int rc; perfc_incr(realmode_emulations); @@ -121,7 +120,9 @@ static void realmode_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt) { if ( !hvmemul_ctxt->exn_pending ) { - intr_info = __vmread(VM_ENTRY_INTR_INFO); + unsigned long intr_info; + + __vmread(VM_ENTRY_INTR_INFO, &intr_info); __vmwrite(VM_ENTRY_INTR_INFO, 0); if ( !(intr_info & INTR_INFO_VALID_MASK) ) { @@ -177,7 +178,7 @@ void vmx_realmode(struct cpu_user_regs *regs) unsigned int emulations = 0; /* Get-and-clear VM_ENTRY_INTR_INFO. */ - intr_info = __vmread(VM_ENTRY_INTR_INFO); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); if ( intr_info & INTR_INFO_VALID_MASK ) __vmwrite(VM_ENTRY_INTR_INFO, 0); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 0be5616..89a22a4 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -815,7 +815,7 @@ u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding) u64 res; virtual_vmcs_enter(vvmcs); - res = __vmread(vmcs_encoding); + __vmread(vmcs_encoding, &res); virtual_vmcs_exit(vvmcs); return res; @@ -1219,14 +1219,18 @@ void vmx_destroy_vmcs(struct vcpu *v) void vm_launch_fail(void) { - unsigned long error = __vmread(VM_INSTRUCTION_ERROR); + unsigned long error; + + __vmread(VM_INSTRUCTION_ERROR, &error); printk(" error code %lx\n", error); domain_crash_synchronous(); } void vm_resume_fail(void) { - unsigned long error = __vmread(VM_INSTRUCTION_ERROR); + unsigned long error; + + __vmread(VM_INSTRUCTION_ERROR, &error); printk(" error code %lx\n", error); domain_crash_synchronous(); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d6a7710..9ca8632 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -163,11 +163,11 @@ long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) switch ( msr ) { case MSR_FS_BASE: - *msr_content = __vmread(GUEST_FS_BASE); + __vmread(GUEST_FS_BASE, msr_content); break; case MSR_GS_BASE: - *msr_content = __vmread(GUEST_GS_BASE); + __vmread(GUEST_GS_BASE, msr_content); break; case MSR_SHADOW_GS_BASE: @@ -348,13 +348,13 @@ void vmx_update_exception_bitmap(struct vcpu *v) static int vmx_guest_x86_mode(struct vcpu *v) { - unsigned int cs_ar_bytes; + unsigned long cs_ar_bytes; if ( unlikely(!(v->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE)) ) return 0; if ( unlikely(guest_cpu_user_regs()->eflags & X86_EFLAGS_VM) ) return 1; - cs_ar_bytes = __vmread(GUEST_CS_AR_BYTES); + __vmread(GUEST_CS_AR_BYTES, &cs_ar_bytes); if ( hvm_long_mode_enabled(v) && likely(cs_ar_bytes & X86_SEG_AR_CS_LM_ACTIVE) ) return 8; @@ -377,7 +377,7 @@ static void vmx_save_dr(struct vcpu *v) v->arch.debugreg[3] = read_debugreg(3); v->arch.debugreg[6] = read_debugreg(6); /* DR7 must be saved as it is used by vmx_restore_dr(). */ - v->arch.debugreg[7] = __vmread(GUEST_DR7); + __vmread(GUEST_DR7, &v->arch.debugreg[7]); } static void __restore_debug_registers(struct vcpu *v) @@ -410,7 +410,7 @@ static void vmx_restore_dr(struct vcpu *v) static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) { - uint32_t ev; + unsigned long ev; vmx_vmcs_enter(v); @@ -421,17 +421,19 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) c->msr_efer = v->arch.hvm_vcpu.guest_efer; - c->sysenter_cs = __vmread(GUEST_SYSENTER_CS); - c->sysenter_esp = __vmread(GUEST_SYSENTER_ESP); - c->sysenter_eip = __vmread(GUEST_SYSENTER_EIP); + __vmread(GUEST_SYSENTER_CS, &c->sysenter_cs); + __vmread(GUEST_SYSENTER_ESP, &c->sysenter_esp); + __vmread(GUEST_SYSENTER_EIP, &c->sysenter_eip); c->pending_event = 0; c->error_code = 0; - if ( ((ev = __vmread(VM_ENTRY_INTR_INFO)) & INTR_INFO_VALID_MASK) && + __vmread(VM_ENTRY_INTR_INFO, &ev); + if ( (ev & INTR_INFO_VALID_MASK) && hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) ) { c->pending_event = ev; - c->error_code = __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE); + __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE, &ev); + c->error_code = ev; } vmx_vmcs_exit(v); @@ -667,74 +669,78 @@ static void vmx_ctxt_switch_to(struct vcpu *v) void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, struct segment_register *reg) { - uint32_t attr = 0; + unsigned long attr = 0, sel = 0, limit; vmx_vmcs_enter(v); switch ( seg ) { case x86_seg_cs: - reg->sel = __vmread(GUEST_CS_SELECTOR); - reg->limit = __vmread(GUEST_CS_LIMIT); - reg->base = __vmread(GUEST_CS_BASE); - attr = __vmread(GUEST_CS_AR_BYTES); + __vmread(GUEST_CS_SELECTOR, &sel); + __vmread(GUEST_CS_LIMIT, &limit); + __vmread(GUEST_CS_BASE, ®->base); + __vmread(GUEST_CS_AR_BYTES, &attr); break; case x86_seg_ds: - reg->sel = __vmread(GUEST_DS_SELECTOR); - reg->limit = __vmread(GUEST_DS_LIMIT); - reg->base = __vmread(GUEST_DS_BASE); - attr = __vmread(GUEST_DS_AR_BYTES); + __vmread(GUEST_DS_SELECTOR, &sel); + __vmread(GUEST_DS_LIMIT, &limit); + __vmread(GUEST_DS_BASE, ®->base); + __vmread(GUEST_DS_AR_BYTES, &attr); break; case x86_seg_es: - reg->sel = __vmread(GUEST_ES_SELECTOR); - reg->limit = __vmread(GUEST_ES_LIMIT); - reg->base = __vmread(GUEST_ES_BASE); - attr = __vmread(GUEST_ES_AR_BYTES); + __vmread(GUEST_ES_SELECTOR, &sel); + __vmread(GUEST_ES_LIMIT, &limit); + __vmread(GUEST_ES_BASE, ®->base); + __vmread(GUEST_ES_AR_BYTES, &attr); break; case x86_seg_fs: - reg->sel = __vmread(GUEST_FS_SELECTOR); - reg->limit = __vmread(GUEST_FS_LIMIT); - reg->base = __vmread(GUEST_FS_BASE); - attr = __vmread(GUEST_FS_AR_BYTES); + __vmread(GUEST_FS_SELECTOR, &sel); + __vmread(GUEST_FS_LIMIT, &limit); + __vmread(GUEST_FS_BASE, ®->base); + __vmread(GUEST_FS_AR_BYTES, &attr); break; case x86_seg_gs: - reg->sel = __vmread(GUEST_GS_SELECTOR); - reg->limit = __vmread(GUEST_GS_LIMIT); - reg->base = __vmread(GUEST_GS_BASE); - attr = __vmread(GUEST_GS_AR_BYTES); + __vmread(GUEST_GS_SELECTOR, &sel); + __vmread(GUEST_GS_LIMIT, &limit); + __vmread(GUEST_GS_BASE, ®->base); + __vmread(GUEST_GS_AR_BYTES, &attr); break; case x86_seg_ss: - reg->sel = __vmread(GUEST_SS_SELECTOR); - reg->limit = __vmread(GUEST_SS_LIMIT); - reg->base = __vmread(GUEST_SS_BASE); - attr = __vmread(GUEST_SS_AR_BYTES); + __vmread(GUEST_SS_SELECTOR, &sel); + __vmread(GUEST_SS_LIMIT, &limit); + __vmread(GUEST_SS_BASE, ®->base); + __vmread(GUEST_SS_AR_BYTES, &attr); break; case x86_seg_tr: - reg->sel = __vmread(GUEST_TR_SELECTOR); - reg->limit = __vmread(GUEST_TR_LIMIT); - reg->base = __vmread(GUEST_TR_BASE); - attr = __vmread(GUEST_TR_AR_BYTES); + __vmread(GUEST_TR_SELECTOR, &sel); + __vmread(GUEST_TR_LIMIT, &limit); + __vmread(GUEST_TR_BASE, ®->base); + __vmread(GUEST_TR_AR_BYTES, &attr); break; case x86_seg_gdtr: - reg->limit = __vmread(GUEST_GDTR_LIMIT); - reg->base = __vmread(GUEST_GDTR_BASE); + __vmread(GUEST_GDTR_LIMIT, &limit); + __vmread(GUEST_GDTR_BASE, ®->base); break; case x86_seg_idtr: - reg->limit = __vmread(GUEST_IDTR_LIMIT); - reg->base = __vmread(GUEST_IDTR_BASE); + __vmread(GUEST_IDTR_LIMIT, &limit); + __vmread(GUEST_IDTR_BASE, ®->base); break; case x86_seg_ldtr: - reg->sel = __vmread(GUEST_LDTR_SELECTOR); - reg->limit = __vmread(GUEST_LDTR_LIMIT); - reg->base = __vmread(GUEST_LDTR_BASE); - attr = __vmread(GUEST_LDTR_AR_BYTES); + __vmread(GUEST_LDTR_SELECTOR, &sel); + __vmread(GUEST_LDTR_LIMIT, &limit); + __vmread(GUEST_LDTR_BASE, ®->base); + __vmread(GUEST_LDTR_AR_BYTES, &attr); break; default: BUG(); + return; } vmx_vmcs_exit(v); + reg->sel = sel; + reg->limit = limit; + reg->attr.bytes = (attr & 0xff) | ((attr >> 4) & 0xf00); /* Unusable flag is folded into Present flag. */ if ( attr & (1u<<16) ) @@ -917,7 +923,7 @@ static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) return 0; vmx_vmcs_enter(v); - *gpat = __vmread(GUEST_PAT); + __vmread(GUEST_PAT, gpat); vmx_vmcs_exit(v); return 1; } @@ -968,7 +974,11 @@ static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) static unsigned int vmx_get_interrupt_shadow(struct vcpu *v) { - return __vmread(GUEST_INTERRUPTIBILITY_INFO); + unsigned long intr_shadow; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); + + return intr_shadow; } static void vmx_set_interrupt_shadow(struct vcpu *v, unsigned int intr_shadow) @@ -1193,7 +1203,7 @@ static void vmx_update_guest_efer(struct vcpu *v) vmx_vmcs_enter(v); - vm_entry_value = __vmread(VM_ENTRY_CONTROLS); + __vmread(VM_ENTRY_CONTROLS, &vm_entry_value); if ( v->arch.hvm_vcpu.guest_efer & EFER_LMA ) vm_entry_value |= VM_ENTRY_IA32E_MODE; else @@ -1319,7 +1329,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) if ( nestedhvm_vcpu_in_guestmode(curr) ) intr_info = vcpu_2_nvmx(curr).intr.intr_info; else - intr_info = __vmread(VM_ENTRY_INTR_INFO); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); switch ( _trap.vector ) { @@ -1374,8 +1384,12 @@ static void vmx_inject_trap(struct hvm_trap *trap) static int vmx_event_pending(struct vcpu *v) { + unsigned long intr_info; + ASSERT(v == current); - return (__vmread(VM_ENTRY_INTR_INFO) & INTR_INFO_VALID_MASK); + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + + return intr_info & INTR_INFO_VALID_MASK; } static void vmx_set_uc_mode(struct vcpu *v) @@ -1402,7 +1416,7 @@ static void vmx_set_info_guest(struct vcpu *v) * to set the GUEST_PENDING_DBG_EXCEPTIONS.BS here incurs * immediately vmexit and hence make no progress. */ - intr_shadow = __vmread(GUEST_INTERRUPTIBILITY_INFO); + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_shadow); if ( v->domain->debugger_attached && (v->arch.user_regs.eflags & X86_EFLAGS_TF) && (intr_shadow & VMX_INTR_SHADOW_STI) ) @@ -1436,7 +1450,7 @@ static void vmx_process_isr(int isr, struct vcpu *v) isr = 0; vmx_vmcs_enter(v); - status = __vmread(GUEST_INTR_STATUS); + __vmread(GUEST_INTR_STATUS, &status); old = status >> VMX_GUEST_INTR_STATUS_SVI_OFFSET; if ( isr != old ) { @@ -1503,9 +1517,10 @@ static void vmx_sync_pir_to_irr(struct vcpu *v) static void vmx_handle_eoi(u8 vector) { - unsigned long status = __vmread(GUEST_INTR_STATUS); + unsigned long status; /* We need to clear the SVI field. */ + __vmread(GUEST_INTR_STATUS, &status); status &= VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK; __vmwrite(GUEST_INTR_STATUS, status); } @@ -1616,8 +1631,9 @@ const struct hvm_function_table * __init start_vmx(void) */ static int get_instruction_length(void) { - int len; - len = __vmread(VM_EXIT_INSTRUCTION_LEN); /* Safe: callers audited */ + unsigned long len; + + __vmread(VM_EXIT_INSTRUCTION_LEN, &len); /* Safe: callers audited */ BUG_ON((len < 1) || (len > 15)); return len; } @@ -1630,7 +1646,7 @@ void update_guest_eip(void) regs->eip += get_instruction_length(); /* Safe: callers audited */ regs->eflags &= ~X86_EFLAGS_RF; - x = __vmread(GUEST_INTERRUPTIBILITY_INFO); + __vmread(GUEST_INTERRUPTIBILITY_INFO, &x); if ( x & (VMX_INTR_SHADOW_STI | VMX_INTR_SHADOW_MOV_SS) ) { x &= ~(VMX_INTR_SHADOW_STI | VMX_INTR_SHADOW_MOV_SS); @@ -1860,16 +1876,16 @@ static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) switch ( msr ) { case MSR_IA32_SYSENTER_CS: - *msr_content = (u32)__vmread(GUEST_SYSENTER_CS); + __vmread(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: - *msr_content = __vmread(GUEST_SYSENTER_ESP); + __vmread(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: - *msr_content = __vmread(GUEST_SYSENTER_EIP); + __vmread(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: - *msr_content = __vmread(GUEST_IA32_DEBUGCTL); + __vmread(GUEST_IA32_DEBUGCTL, msr_content); break; case IA32_FEATURE_CONTROL_MSR: case MSR_IA32_VMX_BASIC...MSR_IA32_VMX_TRUE_ENTRY_CTLS: @@ -2132,9 +2148,9 @@ gp_fault: static void vmx_do_extint(struct cpu_user_regs *regs) { - unsigned int vector; + unsigned long vector; - vector = __vmread(VM_EXIT_INTR_INFO); + __vmread(VM_EXIT_INTR_INFO, &vector); BUG_ON(!(vector & INTR_INFO_VALID_MASK)); vector &= INTR_INFO_VECTOR_MASK; @@ -2187,13 +2203,15 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); } + if ( qualification & EPT_GLA_VALID ) + __vmread(GUEST_LINEAR_ADDRESS, &gla); + else + gla = ~0ull; ret = hvm_hap_nested_page_fault(gpa, - qualification & EPT_GLA_VALID ? 1 : 0, - qualification & EPT_GLA_VALID - ? __vmread(GUEST_LINEAR_ADDRESS) : ~0ull, - qualification & EPT_READ_VIOLATION ? 1 : 0, - qualification & EPT_WRITE_VIOLATION ? 1 : 0, - qualification & EPT_EXEC_VIOLATION ? 1 : 0); + !!(qualification & EPT_GLA_VALID), gla, + !!(qualification & EPT_READ_VIOLATION), + !!(qualification & EPT_WRITE_VIOLATION), + !!(qualification & EPT_EXEC_VIOLATION)); switch ( ret ) { case 0: // Unhandled L1 EPT violation @@ -2227,10 +2245,7 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) ept_walk_table(d, gfn); if ( qualification & EPT_GLA_VALID ) - { - gla = __vmread(GUEST_LINEAR_ADDRESS); gdprintk(XENLOG_ERR, " --- GLA %#lx\n", gla); - } domain_crash(d); } @@ -2239,10 +2254,11 @@ static void vmx_failed_vmentry(unsigned int exit_reason, struct cpu_user_regs *regs) { unsigned int failed_vmentry_reason = (uint16_t)exit_reason; - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); + unsigned long exit_qualification; struct vcpu *curr = current; printk("Failed vm entry (exit reason %#x) ", exit_reason); + __vmread(EXIT_QUALIFICATION, &exit_qualification); switch ( failed_vmentry_reason ) { case EXIT_REASON_INVALID_GUEST_STATE: @@ -2305,12 +2321,13 @@ static void vmx_vmexit_ud_intercept(struct cpu_user_regs *regs) static int vmx_handle_eoi_write(void) { - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); + unsigned long exit_qualification; /* * 1. Must be a linear access data write. * 2. Data write must be to the EOI register. */ + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( (((exit_qualification >> 12) & 0xf) == 1) && ((exit_qualification & 0xfff) == APIC_EOI) ) { @@ -2335,8 +2352,12 @@ static void vmx_idtv_reinject(unsigned long idtv_info) __vmwrite(VM_ENTRY_INTR_INFO, idtv_info & ~INTR_INFO_RESVD_BITS_MASK); if ( idtv_info & INTR_INFO_DELIVER_CODE_MASK ) - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, - __vmread(IDT_VECTORING_ERROR_CODE)); + { + unsigned long ec; + + __vmread(IDT_VECTORING_ERROR_CODE, &ec); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, ec); + } } /* @@ -2344,20 +2365,24 @@ static void vmx_idtv_reinject(unsigned long idtv_info) * Re-delivery will re-set it (see SDM 3B 25.7.1.2). */ if ( (idtv_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI<<8) ) + { + unsigned long intr_info; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &intr_info); __vmwrite(GUEST_INTERRUPTIBILITY_INFO, - __vmread(GUEST_INTERRUPTIBILITY_INFO) & - ~VMX_INTR_SHADOW_NMI); + intr_info & ~VMX_INTR_SHADOW_NMI); + } } } static int vmx_handle_apic_write(void) { - unsigned long exit_qualification = __vmread(EXIT_QUALIFICATION); - unsigned int offset = exit_qualification & 0xfff; + unsigned long exit_qualification; ASSERT(cpu_has_vmx_apic_reg_virt); + __vmread(EXIT_QUALIFICATION, &exit_qualification); - return vlapic_apicv_write(current, offset); + return vlapic_apicv_write(current, exit_qualification & 0xfff); } /* @@ -2373,21 +2398,23 @@ void vmx_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) void vmx_vmexit_handler(struct cpu_user_regs *regs) { - unsigned int exit_reason, idtv_info, intr_info = 0, vector = 0; - unsigned long exit_qualification, inst_len = 0; + unsigned long exit_qualification, exit_reason, idtv_info, intr_info = 0; + unsigned int vector = 0; struct vcpu *v = current; - regs->rip = __vmread(GUEST_RIP); - regs->rsp = __vmread(GUEST_RSP); - regs->rflags = __vmread(GUEST_RFLAGS); + __vmread(GUEST_RIP, ®s->rip); + __vmread(GUEST_RSP, ®s->rsp); + __vmread(GUEST_RFLAGS, ®s->rflags); hvm_invalidate_regs_fields(regs); if ( paging_mode_hap(v->domain) && hvm_paging_enabled(v) ) - v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3] = - __vmread(GUEST_CR3); + { + __vmread(GUEST_CR3, &v->arch.hvm_vcpu.hw_cr[3]); + v->arch.hvm_vcpu.guest_cr[3] = v->arch.hvm_vcpu.hw_cr[3]; + } - exit_reason = __vmread(VM_EXIT_REASON); + __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_enabled(v) ) HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, 3, exit_reason, @@ -2407,7 +2434,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vmx_do_extint(regs); break; case EXIT_REASON_EXCEPTION_NMI: - intr_info = __vmread(VM_EXIT_INTR_INFO); + __vmread(VM_EXIT_INTR_INFO, &intr_info); BUG_ON(!(intr_info & INTR_INFO_VALID_MASK)); vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) @@ -2485,13 +2512,15 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); - idtv_info = __vmread(IDT_VECTORING_INFO); + __vmread(IDT_VECTORING_INFO, &idtv_info); if ( !nestedhvm_vcpu_in_guestmode(v) && exit_reason != EXIT_REASON_TASK_SWITCH ) vmx_idtv_reinject(idtv_info); switch ( exit_reason ) { + unsigned long ecode; + case EXIT_REASON_EXCEPTION_NMI: { /* @@ -2508,9 +2537,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( unlikely(intr_info & INTR_INFO_NMI_UNBLOCKED_BY_IRET) && !(idtv_info & INTR_INFO_VALID_MASK) && (vector != TRAP_double_fault) ) + { + unsigned long guest_info; + + __vmread(GUEST_INTERRUPTIBILITY_INFO, &guest_info); __vmwrite(GUEST_INTERRUPTIBILITY_INFO, - __vmread(GUEST_INTERRUPTIBILITY_INFO) - | VMX_INTR_SHADOW_NMI); + guest_info | VMX_INTR_SHADOW_NMI); + } perfc_incra(cause_vector, vector); @@ -2521,7 +2554,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) * Updates DR6 where debugger can peek (See 3B 23.2.1, * Table 23-1, "Exit Qualification for Debug Exceptions"). */ - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); HVMTRACE_1D(TRAP_DEBUG, exit_qualification); write_debugreg(6, exit_qualification | 0xffff0ff0); if ( !v->domain->debugger_attached || cpu_has_monitor_trap_flag ) @@ -2547,8 +2580,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) .vector = TRAP_int3, .type = X86_EVENTTYPE_SW_EXCEPTION, .error_code = HVM_DELIVER_NO_ERROR_CODE, - .insn_len = __vmread(VM_EXIT_INSTRUCTION_LEN) }; + unsigned long insn_len; + + __vmread(VM_EXIT_INSTRUCTION_LEN, &insn_len); + trap.insn_len = insn_len; hvm_inject_trap(&trap); break; } @@ -2563,8 +2599,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) vmx_fpu_dirty_intercept(); break; case TRAP_page_fault: - exit_qualification = __vmread(EXIT_QUALIFICATION); - regs->error_code = __vmread(VM_EXIT_INTR_ERROR_CODE); + __vmread(EXIT_QUALIFICATION, &exit_qualification); + __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); + regs->error_code = ecode; HVM_DBG_LOG(DBG_LEVEL_VMMU, "eax=%lx, ebx=%lx, ecx=%lx, edx=%lx, esi=%lx, edi=%lx", @@ -2628,9 +2665,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) static const enum hvm_task_switch_reason reasons[] = { TSW_call_or_int, TSW_iret, TSW_jmp, TSW_call_or_int }; - int32_t ecode = -1, source; + unsigned int inst_len, source; - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); source = (exit_qualification >> 30) & 3; /* Vectored event should fill in interrupt information. */ WARN_ON((source == 3) && !(idtv_info & INTR_INFO_VALID_MASK)); @@ -2643,7 +2680,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) (idtv_info & (1u<<10))) /* IntrType > 3? */ ? get_instruction_length() /* Safe: SDM 3B 23.2.4 */ : 0; if ( (source == 3) && (idtv_info & INTR_INFO_DELIVER_CODE_MASK) ) - ecode = __vmread(IDT_VECTORING_ERROR_CODE); + __vmread(IDT_VECTORING_ERROR_CODE, &ecode); + else + ecode = -1; regs->eip += inst_len; hvm_task_switch((uint16_t)exit_qualification, reasons[source], ecode); break; @@ -2658,7 +2697,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_INVLPG: update_guest_eip(); /* Safe: INVLPG */ - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); vmx_invlpg_intercept(exit_qualification); break; case EXIT_REASON_RDTSCP: @@ -2683,13 +2722,13 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) } case EXIT_REASON_CR_ACCESS: { - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( vmx_cr_access(exit_qualification) == X86EMUL_OKAY ) update_guest_eip(); /* Safe: MOV Cn, LMSW, CLTS */ break; } case EXIT_REASON_DR_ACCESS: - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); vmx_dr_access(exit_qualification, regs); break; case EXIT_REASON_MSR_READ: @@ -2790,7 +2829,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_EOI_INDUCED: { int vector; - exit_qualification = __vmread(EXIT_QUALIFICATION); + + __vmread(EXIT_QUALIFICATION, &exit_qualification); vector = exit_qualification & 0xff; vmx_handle_EOI_induced_exit(vcpu_vlapic(current), vector); @@ -2798,7 +2838,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) } case EXIT_REASON_IO_INSTRUCTION: - exit_qualification = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &exit_qualification); if ( exit_qualification & 0x10 ) { /* INS, OUTS */ @@ -2826,8 +2866,10 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_EPT_VIOLATION: { - paddr_t gpa = __vmread(GUEST_PHYSICAL_ADDRESS); - exit_qualification = __vmread(EXIT_QUALIFICATION); + paddr_t gpa; + + __vmread(GUEST_PHYSICAL_ADDRESS, &gpa); + __vmread(EXIT_QUALIFICATION, &exit_qualification); ept_handle_violation(exit_qualification, gpa); break; } @@ -2866,7 +2908,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#x)\n", exit_reason); + gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 2682223..ee26362 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -743,7 +743,7 @@ static int core2_vpmu_do_interrupt(struct cpu_user_regs *regs) else { /* No PMC overflow but perhaps a Trace Message interrupt. */ - msr_content = __vmread(GUEST_IA32_DEBUGCTL); + __vmread(GUEST_IA32_DEBUGCTL, &msr_content); if ( !(msr_content & IA32_DEBUGCTLMSR_TR) ) return 0; } diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index f385c02..ba617fa 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -425,7 +425,8 @@ static int decode_vmx_inst(struct cpu_user_regs *regs, if ( vmx_inst_check_privilege(regs, vmxon_check) != X86EMUL_OKAY ) return X86EMUL_EXCEPTION; - info.word = __vmread(VMX_INSTRUCTION_INFO); + __vmread(VMX_INSTRUCTION_INFO, &offset); + info.word = offset; if ( info.fields.memreg ) { decode->type = VMX_INST_MEMREG_TYPE_REG; @@ -458,7 +459,7 @@ static int decode_vmx_inst(struct cpu_user_regs *regs, scale = 1 << info.fields.scaling; - disp = __vmread(EXIT_QUALIFICATION); + __vmread(EXIT_QUALIFICATION, &disp); size = 1 << (info.fields.addr_size + 1); @@ -950,7 +951,7 @@ static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, virtual_vmcs_enter(vvmcs); for ( i = 0; i < n; i++ ) - value[i] = __vmread(field[i]); + __vmread(field[i], &value[i]); virtual_vmcs_exit(vvmcs); for ( i = 0; i < n; i++ ) @@ -991,7 +992,7 @@ static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, } for ( i = 0; i < n; i++ ) - value[i] = __vmread(field[i]); + __vmread(field[i], &value[i]); virtual_vmcs_enter(vvmcs); for ( i = 0; i < n; i++ ) @@ -1959,11 +1960,12 @@ nvmx_hap_walk_L1_p2m(struct vcpu *v, paddr_t L2_gpa, paddr_t *L1_gpa, { int rc; unsigned long gfn; - uint64_t exit_qual = __vmread(EXIT_QUALIFICATION); + uint64_t exit_qual; uint32_t exit_reason = EXIT_REASON_EPT_VIOLATION; uint32_t rwx_rights = (access_x << 2) | (access_w << 1) | access_r; struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + __vmread(EXIT_QUALIFICATION, &exit_qual); rc = nept_translate_l2ga(v, L2_gpa, page_order, rwx_rights, &gfn, p2m_acc, &exit_qual, &exit_reason); switch ( rc ) @@ -1995,8 +1997,9 @@ void nvmx_idtv_handling(void) struct vcpu *v = current; struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - unsigned int idtv_info = __vmread(IDT_VECTORING_INFO); + unsigned long idtv_info, reason; + __vmread(IDT_VECTORING_INFO, &idtv_info); if ( likely(!(idtv_info & INTR_INFO_VALID_MASK)) ) return; @@ -2004,15 +2007,17 @@ void nvmx_idtv_handling(void) * If L0 can solve the fault that causes idt vectoring, it should * be reinjected, otherwise, pass to L1. */ - if ( (__vmread(VM_EXIT_REASON) != EXIT_REASON_EPT_VIOLATION && - !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK)) || - (__vmread(VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION && - !nvcpu->nv_vmexit_pending) ) + __vmread(VM_EXIT_REASON, &reason); + if ( reason != EXIT_REASON_EPT_VIOLATION ? + !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK) : + !nvcpu->nv_vmexit_pending ) { __vmwrite(VM_ENTRY_INTR_INFO, idtv_info & ~INTR_INFO_RESVD_BITS_MASK); if ( idtv_info & INTR_INFO_DELIVER_CODE_MASK ) - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, - __vmread(IDT_VECTORING_ERROR_CODE)); + { + __vmread(IDT_VECTORING_ERROR_CODE, &reason); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, reason); + } /* * SDM 23.2.4, if L1 tries to inject a software interrupt * and the delivery fails, VM_EXIT_INSTRUCTION_LEN receives @@ -2021,7 +2026,8 @@ void nvmx_idtv_handling(void) * This means EXIT_INSTRUCTION_LEN is always valid here, for * software interrupts both injected by L1, and generated in L2. */ - __vmwrite(VM_ENTRY_INSTRUCTION_LEN, __vmread(VM_EXIT_INSTRUCTION_LEN)); + __vmread(VM_EXIT_INSTRUCTION_LEN, &reason); + __vmwrite(VM_ENTRY_INSTRUCTION_LEN, reason); } } @@ -2039,7 +2045,6 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); u32 ctrl; - u16 port; u8 *bitmap; nvcpu->nv_vmexit_pending = 0; @@ -2049,12 +2054,14 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, switch (exit_reason) { case EXIT_REASON_EXCEPTION_NMI: { - u32 intr_info = __vmread(VM_EXIT_INTR_INFO); + unsigned long intr_info; u32 valid_mask = (X86_EVENTTYPE_HW_EXCEPTION << 8) | INTR_INFO_VALID_MASK; u64 exec_bitmap; - int vector = intr_info & INTR_INFO_VECTOR_MASK; + int vector; + __vmread(VM_EXIT_INTR_INFO, &intr_info); + vector = intr_info & INTR_INFO_VECTOR_MASK; /* * decided by L0 and L1 exception bitmap, if the vetor is set by * both, L0 has priority on #PF and #NM, L1 has priority on others @@ -2123,7 +2130,11 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, ctrl = __n2_exec_control(v); if ( ctrl & CPU_BASED_ACTIVATE_IO_BITMAP ) { - port = __vmread(EXIT_QUALIFICATION) >> 16; + unsigned long qual; + u16 port; + + __vmread(EXIT_QUALIFICATION, &qual); + port = qual >> 16; bitmap = nvmx->iobitmap[port >> 15]; if ( bitmap[(port & 0x7fff) >> 4] & (1 << (port & 0x7)) ) nvcpu->nv_vmexit_pending = 1; @@ -2220,11 +2231,13 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, break; case EXIT_REASON_CR_ACCESS: { - u64 exit_qualification = __vmread(EXIT_QUALIFICATION); - int cr = exit_qualification & 15; - int write = (exit_qualification >> 4) & 3; + unsigned long exit_qualification; + int cr, write; u32 mask = 0; + __vmread(EXIT_QUALIFICATION, &exit_qualification); + cr = exit_qualification & 0xf; + write = (exit_qualification >> 4) & 3; /* also according to guest exec_control */ ctrl = __n2_exec_control(v); @@ -2268,7 +2281,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); - old_val = __vmread(CR0_READ_SHADOW); + __vmread(CR0_READ_SHADOW, &old_val); changed_bits = old_val ^ val; if ( changed_bits & cr0_gh_mask ) nvcpu->nv_vmexit_pending = 1; @@ -2283,7 +2296,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr4_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR4_GUEST_HOST_MASK); - old_val = __vmread(CR4_READ_SHADOW); + __vmread(CR4_READ_SHADOW, &old_val); changed_bits = old_val ^ val; if ( changed_bits & cr4_gh_mask ) nvcpu->nv_vmexit_pending = 1; @@ -2315,7 +2328,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); - old_val = __vmread(CR0_READ_SHADOW) & 0xf; + __vmread(CR0_READ_SHADOW, &old_val); + old_val &= 0xf; val = (exit_qualification >> 16) & 0xf; changed_bits = old_val ^ val; if ( changed_bits & cr0_gh_mask ) diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 9816ce4..0cb6a42 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -322,21 +322,26 @@ static inline void __vmpclear(u64 addr) : "memory"); } -static inline unsigned long __vmread(unsigned long field) +static inline void __vmread(unsigned long field, unsigned long *value) { - unsigned long ecx; - - asm volatile ( VMREAD_OPCODE - MODRM_EAX_ECX + asm volatile ( +#ifdef HAVE_GAS_VMX + "vmread %1, %0\n\t" +#else + VMREAD_OPCODE MODRM_EAX_ECX +#endif /* CF==1 or ZF==1 --> crash (ud2) */ UNLIKELY_START(be, vmread) "\tud2\n" UNLIKELY_END_SECTION - : "=c" (ecx) +#ifdef HAVE_GAS_VMX + : "=rm" (*value) + : "r" (field) +#else + : "=c" (*value) : "a" (field) +#endif : "memory"); - - return ecx; } static inline void __vmwrite(unsigned long field, unsigned long value) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 24 07:33:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33: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 1VON80-0006TI-Fk; Tue, 24 Sep 2013 07:33:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7y-0006Sr-Gs for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:46 +0000 Received: from [85.158.143.35:16722] by server-2.bemta-4.messagelabs.com id DA/E7-26052-95041425; Tue, 24 Sep 2013 07:33:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380008024!6274225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17104 invoked from network); 24 Sep 2013 07:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7w-0007LO-1L for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7v-00045s-W5 for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:44 +0000 Date: Tue, 24 Sep 2013 07:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: drop memory clobbers from vmread/vmwrite wrappers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fc2176d9b3c5988c041fa5926fdd2da2ad560b9 Author: Jan Beulich AuthorDate: Mon Sep 23 17:37:50 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 17:37:50 2013 +0200 VMX: drop memory clobbers from vmread/vmwrite wrappers All effects are properly being described by the asm() constraints. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima --- xen/include/asm-x86/hvm/vmx/vmx.h | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 0cb6a42..6f6b672 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -336,12 +336,11 @@ static inline void __vmread(unsigned long field, unsigned long *value) UNLIKELY_END_SECTION #ifdef HAVE_GAS_VMX : "=rm" (*value) - : "r" (field) + : "r" (field)); #else : "=c" (*value) - : "a" (field) + : "a" (field)); #endif - : "memory"); } static inline void __vmwrite(unsigned long field, unsigned long value) @@ -358,11 +357,10 @@ static inline void __vmwrite(unsigned long field, unsigned long value) UNLIKELY_END_SECTION : #ifdef HAVE_GAS_VMX - : "r" (field) , "rm" (value) + : "r" (field) , "rm" (value)); #else - : "a" (field) , "c" (value) + : "a" (field) , "c" (value)); #endif - : "memory"); } static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) @@ -379,12 +377,11 @@ static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) "setnbe %0" #ifdef HAVE_GAS_VMX : "=qm" (okay), "=rm" (*value) - : "r" (field) + : "r" (field)); #else : "=qm" (okay), "=c" (*value) - : "a" (field) + : "a" (field)); #endif - : "memory"); return okay; } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 24 07:33:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Sep 2013 07:33: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 1VON80-0006TI-Fk; Tue, 24 Sep 2013 07:33:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7y-0006Sr-Gs for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:46 +0000 Received: from [85.158.143.35:16722] by server-2.bemta-4.messagelabs.com id DA/E7-26052-95041425; Tue, 24 Sep 2013 07:33:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380008024!6274225!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17104 invoked from network); 24 Sep 2013 07:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2013 07:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VON7w-0007LO-1L for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VON7v-00045s-W5 for xen-changelog@lists.xensource.com; Tue, 24 Sep 2013 07:33:44 +0000 Date: Tue, 24 Sep 2013 07:33:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: drop memory clobbers from vmread/vmwrite wrappers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fc2176d9b3c5988c041fa5926fdd2da2ad560b9 Author: Jan Beulich AuthorDate: Mon Sep 23 17:37:50 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 23 17:37:50 2013 +0200 VMX: drop memory clobbers from vmread/vmwrite wrappers All effects are properly being described by the asm() constraints. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima --- xen/include/asm-x86/hvm/vmx/vmx.h | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 0cb6a42..6f6b672 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -336,12 +336,11 @@ static inline void __vmread(unsigned long field, unsigned long *value) UNLIKELY_END_SECTION #ifdef HAVE_GAS_VMX : "=rm" (*value) - : "r" (field) + : "r" (field)); #else : "=c" (*value) - : "a" (field) + : "a" (field)); #endif - : "memory"); } static inline void __vmwrite(unsigned long field, unsigned long value) @@ -358,11 +357,10 @@ static inline void __vmwrite(unsigned long field, unsigned long value) UNLIKELY_END_SECTION : #ifdef HAVE_GAS_VMX - : "r" (field) , "rm" (value) + : "r" (field) , "rm" (value)); #else - : "a" (field) , "c" (value) + : "a" (field) , "c" (value)); #endif - : "memory"); } static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) @@ -379,12 +377,11 @@ static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) "setnbe %0" #ifdef HAVE_GAS_VMX : "=qm" (okay), "=rm" (*value) - : "r" (field) + : "r" (field)); #else : "=qm" (okay), "=c" (*value) - : "a" (field) + : "a" (field)); #endif - : "memory"); return okay; } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 01:44:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 01:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6E-00058V-4K; Fri, 27 Sep 2013 01:44:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6D-00058N-6j for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:05 +0000 Received: from [193.109.254.147:24910] by server-13.bemta-14.messagelabs.com id DE/EE-01215-4E2E4425; Fri, 27 Sep 2013 01:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380246242!1374765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26931 invoked from network); 27 Sep 2013 01:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 01:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6A-00073P-NA for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPN6A-0005kP-Jr for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:02 +0000 Date: Fri, 27 Sep 2013 01:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12b0ee04a16194f064d5b895a844fcdc6414bfc0 Author: Jan Beulich AuthorDate: Wed Sep 25 10:55:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:55:42 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b0ac1ff..37c5225 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -348,6 +348,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -361,9 +362,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + 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 Fri Sep 27 01:44:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 01:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6E-00058V-4K; Fri, 27 Sep 2013 01:44:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6D-00058N-6j for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:05 +0000 Received: from [193.109.254.147:24910] by server-13.bemta-14.messagelabs.com id DE/EE-01215-4E2E4425; Fri, 27 Sep 2013 01:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380246242!1374765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26931 invoked from network); 27 Sep 2013 01:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 01:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPN6A-00073P-NA for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPN6A-0005kP-Jr for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 01:44:02 +0000 Date: Fri, 27 Sep 2013 01:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12b0ee04a16194f064d5b895a844fcdc6414bfc0 Author: Jan Beulich AuthorDate: Wed Sep 25 10:55:42 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:55:42 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b0ac1ff..37c5225 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -348,6 +348,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -361,9 +362,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + 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 Fri Sep 27 08:22:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 08:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJQ-0004yV-6U; Fri, 27 Sep 2013 08:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJN-0004yN-Q0 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:06 +0000 Received: from [85.158.137.68:44823] by server-16.bemta-3.messagelabs.com id 36/D7-30005-C2045425; Fri, 27 Sep 2013 08:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1380270122!5097169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18956 invoked from network); 27 Sep 2013 08:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 08:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJK-0003nS-Am for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPTJK-0000DO-72 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:02 +0000 Date: Fri, 27 Sep 2013 08:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 945b86cb98713cd6039de14597d1bd11bae58314 Author: Jan Beulich AuthorDate: Wed Sep 25 10:54:30 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:54:30 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index a64a832..1cc3e37 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -342,6 +342,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -355,9 +356,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 08:22:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 08:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJQ-0004yV-6U; Fri, 27 Sep 2013 08:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJN-0004yN-Q0 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:06 +0000 Received: from [85.158.137.68:44823] by server-16.bemta-3.messagelabs.com id 36/D7-30005-C2045425; Fri, 27 Sep 2013 08:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1380270122!5097169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18956 invoked from network); 27 Sep 2013 08:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 08:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPTJK-0003nS-Am for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPTJK-0000DO-72 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 08:22:02 +0000 Date: Fri, 27 Sep 2013 08:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 945b86cb98713cd6039de14597d1bd11bae58314 Author: Jan Beulich AuthorDate: Wed Sep 25 10:54:30 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:54:30 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index a64a832..1cc3e37 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -342,6 +342,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -355,9 +356,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:44: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 1VPaDA-00048m-7P; Fri, 27 Sep 2013 15:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaD9-00048e-IW for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:07 +0000 Received: from [85.158.139.211:43852] by server-8.bemta-5.messagelabs.com id 48/30-17437-6C7A5425; Fri, 27 Sep 2013 15:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380296645!5026412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25603 invoked from network); 27 Sep 2013 15:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaD6-0000AW-TD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaD6-0004uL-PS for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:04 +0000 Date: Fri, 27 Sep 2013 15:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a75ba0de817d6f384f96d25427a05c313e2179 Author: Jan Beulich AuthorDate: Wed Sep 25 10:41:25 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:41:25 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index c6b8dcc..9e74929 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -346,6 +346,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -359,9 +360,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + 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 Sep 27 15:44:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:44: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 1VPaDA-00048m-7P; Fri, 27 Sep 2013 15:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaD9-00048e-IW for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:07 +0000 Received: from [85.158.139.211:43852] by server-8.bemta-5.messagelabs.com id 48/30-17437-6C7A5425; Fri, 27 Sep 2013 15:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380296645!5026412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25603 invoked from network); 27 Sep 2013 15:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaD6-0000AW-TD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaD6-0004uL-PS for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:04 +0000 Date: Fri, 27 Sep 2013 15:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: initialize extended register state when guests enable it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a75ba0de817d6f384f96d25427a05c313e2179 Author: Jan Beulich AuthorDate: Wed Sep 25 10:41:25 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:41:25 2013 +0200 x86/xsave: initialize extended register state when guests enable it Till now, when setting previously unset bits in XCR0 we wouldn't touch the active register state, thus leaving in the newly enabled registers whatever a prior user of it left there, i.e. potentially leaking information between guests. This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index c6b8dcc..9e74929 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -346,6 +346,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_accum, u64 xstate_bv, u64 xfeat_mask) int handle_xsetbv(u32 index, u64 new_bv) { struct vcpu *curr = current; + u64 mask; if ( index != XCR_XFEATURE_ENABLED_MASK ) return -EOPNOTSUPP; @@ -359,9 +360,23 @@ int handle_xsetbv(u32 index, u64 new_bv) if ( !set_xcr0(new_bv) ) return -EFAULT; + mask = new_bv & ~curr->arch.xcr0_accum; curr->arch.xcr0 = new_bv; curr->arch.xcr0_accum |= new_bv; + mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY; + if ( mask ) + { + unsigned long cr0 = read_cr0(); + + clts(); + if ( curr->fpu_dirtied ) + asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) ); + xrstor(curr, mask); + if ( cr0 & X86_CR0_TS ) + write_cr0(cr0); + } + 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 Sep 27 15:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDK-00049T-AM; Fri, 27 Sep 2013 15:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDJ-00049K-SP for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:17 +0000 Received: from [193.109.254.147:19317] by server-9.bemta-14.messagelabs.com id E5/F2-30026-1D7A5425; Fri, 27 Sep 2013 15:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380296655!4779873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29273 invoked from network); 27 Sep 2013 15:44:16 -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; 27 Sep 2013 15:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDH-0000AZ-GG for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDH-0004vS-1k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:15 +0000 Date: Fri, 27 Sep 2013 15:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: Use correct #define symbol for HAS_IOPORTS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 688eeb878cc58150bf6e729c9c1836b8c1e4cc8f Author: Andrew Cooper AuthorDate: Wed Sep 25 10:44:21 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:44:21 2013 +0200 ns16550: Use correct #define symbol for HAS_IOPORTS CID 1091471, Regression caused by 7c1de0038895cbc75ebd0caffc5b0f3f03c5ad51 This appears to be a typo which causes check_existence() to unconditionally return 1 in all cases. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/drivers/char/ns16550.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 5892eb7..9c2cded 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -503,7 +503,7 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; -#ifdef HAS_IO_PORTS +#ifdef HAS_IOPORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:44:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDK-00049T-AM; Fri, 27 Sep 2013 15:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDJ-00049K-SP for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:17 +0000 Received: from [193.109.254.147:19317] by server-9.bemta-14.messagelabs.com id E5/F2-30026-1D7A5425; Fri, 27 Sep 2013 15:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380296655!4779873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29273 invoked from network); 27 Sep 2013 15:44:16 -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; 27 Sep 2013 15:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDH-0000AZ-GG for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDH-0004vS-1k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:15 +0000 Date: Fri, 27 Sep 2013 15:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ns16550: Use correct #define symbol for HAS_IOPORTS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 688eeb878cc58150bf6e729c9c1836b8c1e4cc8f Author: Andrew Cooper AuthorDate: Wed Sep 25 10:44:21 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:44:21 2013 +0200 ns16550: Use correct #define symbol for HAS_IOPORTS CID 1091471, Regression caused by 7c1de0038895cbc75ebd0caffc5b0f3f03c5ad51 This appears to be a typo which causes check_existence() to unconditionally return 1 in all cases. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- xen/drivers/char/ns16550.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 5892eb7..9c2cded 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -503,7 +503,7 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; -#ifdef HAS_IO_PORTS +#ifdef HAS_IOPORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDV-0004AX-Ef; Fri, 27 Sep 2013 15:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDU-0004AM-FH for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:28 +0000 Received: from [85.158.139.211:2765] by server-12.bemta-5.messagelabs.com id 06/98-18373-BD7A5425; Fri, 27 Sep 2013 15:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1380296666!3150348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11542 invoked from network); 27 Sep 2013 15:44:26 -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; 27 Sep 2013 15:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDR-0000Af-Mp for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDR-0004vo-KZ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:25 +0000 Date: Fri, 27 Sep 2013 15:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: Remove bogus assertion in hap_free_p2m_page() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae7c6b64c063a755097806e30dc24b94fabbda09 Author: Andrew Cooper AuthorDate: Wed Sep 25 10:45:53 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:45:53 2013 +0200 x86/hap: Remove bogus assertion in hap_free_p2m_page() Coverity ID: 1055622 Coverity correctly points out that this ASSERT() is unconditionally true as an unsigned integer is always >= 0. Judging from the shadow counterpart and p2m callsites, there is nothing invalid about freeing the final p2m page. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index bff05d9..d3f64bd 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -289,7 +289,6 @@ static void hap_free_p2m_page(struct domain *d, struct page_info *pg) d->arch.paging.hap.p2m_pages--; d->arch.paging.hap.total_pages++; hap_free(d, page_to_mfn(pg)); - ASSERT(d->arch.paging.hap.p2m_pages >= 0); paging_unlock(d); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDV-0004AX-Ef; Fri, 27 Sep 2013 15:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDU-0004AM-FH for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:28 +0000 Received: from [85.158.139.211:2765] by server-12.bemta-5.messagelabs.com id 06/98-18373-BD7A5425; Fri, 27 Sep 2013 15:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1380296666!3150348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11542 invoked from network); 27 Sep 2013 15:44:26 -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; 27 Sep 2013 15:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDR-0000Af-Mp for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDR-0004vo-KZ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:25 +0000 Date: Fri, 27 Sep 2013 15:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: Remove bogus assertion in hap_free_p2m_page() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae7c6b64c063a755097806e30dc24b94fabbda09 Author: Andrew Cooper AuthorDate: Wed Sep 25 10:45:53 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:45:53 2013 +0200 x86/hap: Remove bogus assertion in hap_free_p2m_page() Coverity ID: 1055622 Coverity correctly points out that this ASSERT() is unconditionally true as an unsigned integer is always >= 0. Judging from the shadow counterpart and p2m callsites, there is nothing invalid about freeing the final p2m page. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index bff05d9..d3f64bd 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -289,7 +289,6 @@ static void hap_free_p2m_page(struct domain *d, struct page_info *pg) d->arch.paging.hap.p2m_pages--; d->arch.paging.hap.total_pages++; hap_free(d, page_to_mfn(pg)); - ASSERT(d->arch.paging.hap.p2m_pages >= 0); paging_unlock(d); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDg-0004Bs-Mf; Fri, 27 Sep 2013 15: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 1VPaDf-0004BV-0z for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:39 +0000 Received: from [85.158.137.68:17586] by server-17.bemta-3.messagelabs.com id 08/D8-03449-6E7A5425; Fri, 27 Sep 2013 15:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1380296676!5185253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24934 invoked from network); 27 Sep 2013 15:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDc-0000Aq-0s for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDb-0004wE-RL for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:35 +0000 Date: Fri, 27 Sep 2013 15:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix DOMID_IO mapping permission checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145ae98bfab8280744ad5e800cc036e1c84c0486 Author: Daniel De Graaf AuthorDate: Wed Sep 25 10:48:20 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:48:20 2013 +0200 fix DOMID_IO mapping permission checks When the permission checks for memory mapping were moved from get_pg_owner to xsm_mmu_update in aaba7a677, the exception for DOMID_IO was not taken into account. This will cause IO memory mappings by PV domains (mini-os in particular) to fail when XSM/FLASK is not being used. This patch reintroduces the exception for DOMID_IO; the actual restrictions on IO memory mappings have always been checked separately using iomem_access_permitted, so this change should not break existing access control. Reported-by: Eduardo Peixoto Macedo Signed-off-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index cc0a5a8..f831bc4 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -570,6 +570,8 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do int rc; XSM_ASSERT_ACTION(XSM_TARGET); rc = xsm_default_action(action, d, f); + if ( t == dom_io ) + return rc; if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDg-0004Bs-Mf; Fri, 27 Sep 2013 15: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 1VPaDf-0004BV-0z for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:39 +0000 Received: from [85.158.137.68:17586] by server-17.bemta-3.messagelabs.com id 08/D8-03449-6E7A5425; Fri, 27 Sep 2013 15:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1380296676!5185253!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24934 invoked from network); 27 Sep 2013 15:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDc-0000Aq-0s for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDb-0004wE-RL for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:35 +0000 Date: Fri, 27 Sep 2013 15:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix DOMID_IO mapping permission checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145ae98bfab8280744ad5e800cc036e1c84c0486 Author: Daniel De Graaf AuthorDate: Wed Sep 25 10:48:20 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 10:48:20 2013 +0200 fix DOMID_IO mapping permission checks When the permission checks for memory mapping were moved from get_pg_owner to xsm_mmu_update in aaba7a677, the exception for DOMID_IO was not taken into account. This will cause IO memory mappings by PV domains (mini-os in particular) to fail when XSM/FLASK is not being used. This patch reintroduces the exception for DOMID_IO; the actual restrictions on IO memory mappings have always been checked separately using iomem_access_permitted, so this change should not break existing access control. Reported-by: Eduardo Peixoto Macedo Signed-off-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index cc0a5a8..f831bc4 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -570,6 +570,8 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do int rc; XSM_ASSERT_ACTION(XSM_TARGET); rc = xsm_default_action(action, d, f); + if ( t == dom_io ) + return rc; if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDq-0004E5-Er; Fri, 27 Sep 2013 15:44:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDo-0004DQ-F2 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:48 +0000 Received: from [193.109.254.147:6132] by server-6.bemta-14.messagelabs.com id 43/6A-20235-FE7A5425; Fri, 27 Sep 2013 15:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1380296686!1904942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21519 invoked from network); 27 Sep 2013 15:44:47 -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; 27 Sep 2013 15:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDm-0000Av-70 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDm-0004wa-4k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:46 +0000 Date: Fri, 27 Sep 2013 15:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix memory leak in load_p2m_frame_list error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b8782d95d03b40bfa255b61b224eeef614f09d2 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:38 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:35:24 2013 +0100 libxc: fix memory leak in load_p2m_frame_list error handling Coverity-ID: 1055885 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b418963..939a76b 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -368,6 +368,7 @@ static xen_pfn_t *load_p2m_frame_list( (P2M_FL_ENTRIES - 1) * sizeof(xen_pfn_t)) ) { PERROR("read p2m_frame_list failed"); + free(p2m_frame_list); return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:44:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaDq-0004E5-Er; Fri, 27 Sep 2013 15:44:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDo-0004DQ-F2 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:48 +0000 Received: from [193.109.254.147:6132] by server-6.bemta-14.messagelabs.com id 43/6A-20235-FE7A5425; Fri, 27 Sep 2013 15:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1380296686!1904942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21519 invoked from network); 27 Sep 2013 15:44:47 -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; 27 Sep 2013 15:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDm-0000Av-70 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDm-0004wa-4k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:46 +0000 Date: Fri, 27 Sep 2013 15:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix memory leak in load_p2m_frame_list error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b8782d95d03b40bfa255b61b224eeef614f09d2 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:38 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:35:24 2013 +0100 libxc: fix memory leak in load_p2m_frame_list error handling Coverity-ID: 1055885 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b418963..939a76b 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -368,6 +368,7 @@ static xen_pfn_t *load_p2m_frame_list( (P2M_FL_ENTRIES - 1) * sizeof(xen_pfn_t)) ) { PERROR("read p2m_frame_list failed"); + free(p2m_frame_list); return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaE0-0004GD-I0; Fri, 27 Sep 2013 15:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDz-0004Ft-2e for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:59 +0000 Received: from [85.158.139.211:53164] by server-9.bemta-5.messagelabs.com id 10/4E-24493-AF7A5425; Fri, 27 Sep 2013 15:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380296696!5026590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29243 invoked from network); 27 Sep 2013 15:44:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDw-0000B8-Cp for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDw-0004ww-BL for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:56 +0000 Date: Fri, 27 Sep 2013 15:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl_string_list_length and its only caller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0be2b126ea75a83a3778b4e1710d248f92cf528 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:40 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:42:02 2013 +0100 libxl: fix libxl_string_list_length and its only caller The wrong amount of indirections were being taken in libxl_string_list_length, and its only caller was miscounting the amount of initial non-list arguments, seemingly since the initial commit (599c784). This has been seen and reported in the wild (##xen): < Trixboxer> Hi, any idea why would I get < Trixboxer> xl: libxl_bootloader.c:42: bootloader_arg: Assertion `bl->nargs < bl->argsspace' failed. < Trixboxer> 4.2.2-23.el6 Coverity-ID: 1054954 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_bootloader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0879f23..ca24ca3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -202,7 +202,7 @@ int libxl_string_list_length(const libxl_string_list *psl) { if (!psl) return 0; int i = 0; - while (*psl++) i++; + while ((*psl)[i]) i++; return i; } diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index ed12b2c..3287bf7 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -48,7 +48,7 @@ static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl, { const libxl_domain_build_info *info = bl->info; - bl->argsspace = 7 + libxl_string_list_length(&info->u.pv.bootloader_args); + bl->argsspace = 9 + libxl_string_list_length(&info->u.pv.bootloader_args); GCNEW_ARRAY(bl->args, bl->argsspace); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaE0-0004GD-I0; Fri, 27 Sep 2013 15:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDz-0004Ft-2e for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:59 +0000 Received: from [85.158.139.211:53164] by server-9.bemta-5.messagelabs.com id 10/4E-24493-AF7A5425; Fri, 27 Sep 2013 15:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380296696!5026590!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29243 invoked from network); 27 Sep 2013 15:44:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaDw-0000B8-Cp for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaDw-0004ww-BL for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:44:56 +0000 Date: Fri, 27 Sep 2013 15:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl_string_list_length and its only caller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0be2b126ea75a83a3778b4e1710d248f92cf528 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:40 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:42:02 2013 +0100 libxl: fix libxl_string_list_length and its only caller The wrong amount of indirections were being taken in libxl_string_list_length, and its only caller was miscounting the amount of initial non-list arguments, seemingly since the initial commit (599c784). This has been seen and reported in the wild (##xen): < Trixboxer> Hi, any idea why would I get < Trixboxer> xl: libxl_bootloader.c:42: bootloader_arg: Assertion `bl->nargs < bl->argsspace' failed. < Trixboxer> 4.2.2-23.el6 Coverity-ID: 1054954 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_bootloader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0879f23..ca24ca3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -202,7 +202,7 @@ int libxl_string_list_length(const libxl_string_list *psl) { if (!psl) return 0; int i = 0; - while (*psl++) i++; + while ((*psl)[i]) i++; return i; } diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index ed12b2c..3287bf7 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -48,7 +48,7 @@ static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl, { const libxl_domain_build_info *info = bl->info; - bl->argsspace = 7 + libxl_string_list_length(&info->u.pv.bootloader_args); + bl->argsspace = 9 + libxl_string_list_length(&info->u.pv.bootloader_args); GCNEW_ARRAY(bl->args, bl->argsspace); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEC-0004Hs-Rh; Fri, 27 Sep 2013 15:45:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEA-0004Gf-P7 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:11 +0000 Received: from [193.109.254.147:64030] by server-6.bemta-14.messagelabs.com id 33/DA-20235-508A5425; Fri, 27 Sep 2013 15:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1380296707!4773543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1252 invoked from network); 27 Sep 2013 15:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaE7-0000CG-0l for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaE6-0004xg-HE for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:06 +0000 Date: Fri, 27 Sep 2013 15:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix dispose without init of disk in cd_insert X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 736491d1558dc97be4b8fac8957f3b5c7c0254f6 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:41 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:44:24 2013 +0100 libxl: fix dispose without init of disk in cd_insert Coverity-ID: 1056078 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3d7eaad..a609b98 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2529,18 +2529,16 @@ int main_memset(int argc, char **argv) static int cd_insert(uint32_t domid, const char *virtdev, char *phys) { - libxl_device_disk disk; /* we don't free disk's contents */ + libxl_device_disk disk; char *buf = NULL; XLU_Config *config = 0; struct stat b; int rc = 0; - if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); - rc = 1; - goto out; + return 1; } parse_disk_config(&config, buf, &disk); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEC-0004Hs-Rh; Fri, 27 Sep 2013 15:45:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEA-0004Gf-P7 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:11 +0000 Received: from [193.109.254.147:64030] by server-6.bemta-14.messagelabs.com id 33/DA-20235-508A5425; Fri, 27 Sep 2013 15:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1380296707!4773543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1252 invoked from network); 27 Sep 2013 15:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaE7-0000CG-0l for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaE6-0004xg-HE for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:06 +0000 Date: Fri, 27 Sep 2013 15:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix dispose without init of disk in cd_insert X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 736491d1558dc97be4b8fac8957f3b5c7c0254f6 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:41 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:44:24 2013 +0100 libxl: fix dispose without init of disk in cd_insert Coverity-ID: 1056078 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3d7eaad..a609b98 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2529,18 +2529,16 @@ int main_memset(int argc, char **argv) static int cd_insert(uint32_t domid, const char *virtdev, char *phys) { - libxl_device_disk disk; /* we don't free disk's contents */ + libxl_device_disk disk; char *buf = NULL; XLU_Config *config = 0; struct stat b; int rc = 0; - if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); - rc = 1; - goto out; + return 1; } parse_disk_config(&config, buf, &disk); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEM-0004Kg-2q; Fri, 27 Sep 2013 15:45:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEK-0004KB-Pc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:20 +0000 Received: from [85.158.143.35:25645] by server-2.bemta-4.messagelabs.com id 31/DF-31802-018A5425; Fri, 27 Sep 2013 15:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296718!2190521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7462 invoked from network); 27 Sep 2013 15:45:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEI-0000CT-D1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEI-0004ya-5k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:18 +0000 Date: Fri, 27 Sep 2013 15:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of corename in handle_domain_death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12eaa1b4d2ae7b2e8c5f7d820bd9ec0476ead0f7 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:42 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:45:39 2013 +0100 libxl: fix leak of corename in handle_domain_death Coverity-ID: 1087192 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a609b98..211bdea 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1621,6 +1621,7 @@ static int handle_domain_death(uint32_t *r_domid, LOG("dumping core to %s", corefile); rc=libxl_domain_core_dump(ctx, *r_domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); + free(corefile); } /* No point crying over spilled milk, continue on failure. */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEM-0004Kg-2q; Fri, 27 Sep 2013 15:45:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEK-0004KB-Pc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:20 +0000 Received: from [85.158.143.35:25645] by server-2.bemta-4.messagelabs.com id 31/DF-31802-018A5425; Fri, 27 Sep 2013 15:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296718!2190521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7462 invoked from network); 27 Sep 2013 15:45:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEI-0000CT-D1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEI-0004ya-5k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:18 +0000 Date: Fri, 27 Sep 2013 15:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of corename in handle_domain_death X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12eaa1b4d2ae7b2e8c5f7d820bd9ec0476ead0f7 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:42 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:45:39 2013 +0100 libxl: fix leak of corename in handle_domain_death Coverity-ID: 1087192 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a609b98..211bdea 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1621,6 +1621,7 @@ static int handle_domain_death(uint32_t *r_domid, LOG("dumping core to %s", corefile); rc=libxl_domain_core_dump(ctx, *r_domid, corefile, NULL); if (rc) LOG("core dump failed (rc=%d).", rc); + free(corefile); } /* No point crying over spilled milk, continue on failure. */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:45:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEY-0004Ni-6t; Fri, 27 Sep 2013 15:45:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEX-0004NI-8x for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:33 +0000 Received: from [85.158.139.211:16274] by server-17.bemta-5.messagelabs.com id D0/91-19396-A18A5425; Fri, 27 Sep 2013 15:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1380296728!5058641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4729 invoked from network); 27 Sep 2013 15:45:29 -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; 27 Sep 2013 15:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaES-0000Cd-KN for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaES-0004yw-Hg for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:28 +0000 Date: Fri, 27 Sep 2013 15:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7737ecb20c5babff45445d27fff91894b43a2d28 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:01 2013 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 211bdea..b05763f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6554,6 +6554,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEY-0004Ni-6t; Fri, 27 Sep 2013 15:45:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEX-0004NI-8x for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:33 +0000 Received: from [85.158.139.211:16274] by server-17.bemta-5.messagelabs.com id D0/91-19396-A18A5425; Fri, 27 Sep 2013 15:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1380296728!5058641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4729 invoked from network); 27 Sep 2013 15:45:29 -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; 27 Sep 2013 15:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaES-0000Cd-KN for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaES-0004yw-Hg for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:28 +0000 Date: Fri, 27 Sep 2013 15:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7737ecb20c5babff45445d27fff91894b43a2d28 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:01 2013 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 211bdea..b05763f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6554,6 +6554,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEg-0004Px-Cb; Fri, 27 Sep 2013 15:45:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEf-0004PV-Hj for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:41 +0000 Received: from [85.158.137.68:37894] by server-14.bemta-3.messagelabs.com id D3/89-00990-428A5425; Fri, 27 Sep 2013 15:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1380296739!5198267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28790 invoked from network); 27 Sep 2013 15:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEc-0000Cj-QQ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEc-0004zM-P1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:38 +0000 Date: Fri, 27 Sep 2013 15:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of rune in main_remus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2989ef904236c941ed61f587e9ed5e0827e7a81b Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:44 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:12 2013 +0100 libxl: fix leak of rune in main_remus Coverity-ID: 1087194 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index b05763f..81ec66c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7125,6 +7125,9 @@ int main_remus(int argc, char **argv) migrate_do_preamble(send_fd, recv_fd, child, config_data, config_len, rune); + + if (ssh_command[0]) + free(rune); } /* Point of no return */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEg-0004Px-Cb; Fri, 27 Sep 2013 15:45:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEf-0004PV-Hj for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:41 +0000 Received: from [85.158.137.68:37894] by server-14.bemta-3.messagelabs.com id D3/89-00990-428A5425; Fri, 27 Sep 2013 15:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1380296739!5198267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28790 invoked from network); 27 Sep 2013 15:45:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEc-0000Cj-QQ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEc-0004zM-P1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:38 +0000 Date: Fri, 27 Sep 2013 15:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix leak of rune in main_remus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2989ef904236c941ed61f587e9ed5e0827e7a81b Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:44 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:12 2013 +0100 libxl: fix leak of rune in main_remus Coverity-ID: 1087194 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index b05763f..81ec66c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7125,6 +7125,9 @@ int main_remus(int argc, char **argv) migrate_do_preamble(send_fd, recv_fd, child, config_data, config_len, rune); + + if (ssh_command[0]) + free(rune); } /* Point of no return */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEq-0004Sc-Fh; Fri, 27 Sep 2013 15:45:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEp-0004SK-PB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:51 +0000 Received: from [193.109.254.147:43261] by server-2.bemta-14.messagelabs.com id 86/D3-18933-E28A5425; Fri, 27 Sep 2013 15:45:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1380296749!2496146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3098 invoked from network); 27 Sep 2013 15:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEn-0000Cp-13 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEm-0004zi-Uz for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:48 +0000 Date: Fri, 27 Sep 2013 15:45:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix out-of-memory check in parse_global_config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96c0061c0168de4e322b0b869f9c7f3b907b53ce Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:45 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:15 2013 +0100 libxl: fix out-of-memory check in parse_global_config Coverity-ID: 1055174 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index b965cab..657610b 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -117,8 +117,8 @@ static void parse_global_config(const char *configfile, lockfile = strdup(XL_LOCK_FILE); } - if (!lockfile < 0) { - fprintf(stderr, "failed to allocate lockdir \n"); + if (!lockfile) { + fprintf(stderr, "failed to allocate lockdir\n"); exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:45: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 1VPaEq-0004Sc-Fh; Fri, 27 Sep 2013 15:45:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEp-0004SK-PB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:51 +0000 Received: from [193.109.254.147:43261] by server-2.bemta-14.messagelabs.com id 86/D3-18933-E28A5425; Fri, 27 Sep 2013 15:45:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1380296749!2496146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3098 invoked from network); 27 Sep 2013 15:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEn-0000Cp-13 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEm-0004zi-Uz for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:48 +0000 Date: Fri, 27 Sep 2013 15:45:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix out-of-memory check in parse_global_config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96c0061c0168de4e322b0b869f9c7f3b907b53ce Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:45 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:49:15 2013 +0100 libxl: fix out-of-memory check in parse_global_config Coverity-ID: 1055174 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index b965cab..657610b 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -117,8 +117,8 @@ static void parse_global_config(const char *configfile, lockfile = strdup(XL_LOCK_FILE); } - if (!lockfile < 0) { - fprintf(stderr, "failed to allocate lockdir \n"); + if (!lockfile) { + fprintf(stderr, "failed to allocate lockdir\n"); exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaF1-0004V6-J5; Fri, 27 Sep 2013 15: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 1VPaF0-0004Ub-8D for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:02 +0000 Received: from [85.158.139.211:24363] by server-15.bemta-5.messagelabs.com id 6C/AD-01145-938A5425; Fri, 27 Sep 2013 15:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380296759!5050070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10101 invoked from network); 27 Sep 2013 15:46:00 -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; 27 Sep 2013 15:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEx-0000Cy-HD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEx-000504-FP for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:59 +0000 Date: Fri, 27 Sep 2013 15:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: only free console reader if it was allocated in main_dmesg X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e979531e51bafe3dbf9a36546a90176a6bd11e5 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:50 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:00 2013 +0100 libxl: only free console reader if it was allocated in main_dmesg Coverity-ID: 1055304 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 81ec66c..642b130 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5537,7 +5537,8 @@ int main_dmesg(int argc, char **argv) printf("%s", line); finish: - libxl_xen_console_read_finish(ctx, cr); + if (cr) + libxl_xen_console_read_finish(ctx, cr); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaF1-0004V6-J5; Fri, 27 Sep 2013 15: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 1VPaF0-0004Ub-8D for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:02 +0000 Received: from [85.158.139.211:24363] by server-15.bemta-5.messagelabs.com id 6C/AD-01145-938A5425; Fri, 27 Sep 2013 15:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380296759!5050070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10101 invoked from network); 27 Sep 2013 15:46:00 -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; 27 Sep 2013 15:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaEx-0000Cy-HD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaEx-000504-FP for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:45:59 +0000 Date: Fri, 27 Sep 2013 15:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: only free console reader if it was allocated in main_dmesg X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2e979531e51bafe3dbf9a36546a90176a6bd11e5 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:50 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:00 2013 +0100 libxl: only free console reader if it was allocated in main_dmesg Coverity-ID: 1055304 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 81ec66c..642b130 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5537,7 +5537,8 @@ int main_dmesg(int argc, char **argv) printf("%s", line); finish: - libxl_xen_console_read_finish(ctx, cr); + if (cr) + libxl_xen_console_read_finish(ctx, cr); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFB-0004XW-M5; Fri, 27 Sep 2013 15:46:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFA-0004X9-Hu for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:12 +0000 Received: from [85.158.139.211:27105] by server-2.bemta-5.messagelabs.com id F2/FC-26841-348A5425; Fri, 27 Sep 2013 15:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1380296770!5057764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22754 invoked from network); 27 Sep 2013 15:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaF7-0000DX-RG for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaF7-00051L-OS for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:09 +0000 Date: Fri, 27 Sep 2013 15:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix typo in libxl__hotplug_nic error checking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b2b15ead2152fd541e2de494f50cf99e63bfb3d Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:51 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:05 2013 +0100 libxl: fix typo in libxl__hotplug_nic error checking Coverity-ID: 1055945 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 37815eb..ea5d8c1 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -170,7 +170,7 @@ static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, } *env = get_hotplug_env(gc, script, dev); - if (!env) { + if (!*env) { rc = ERROR_FAIL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFB-0004XW-M5; Fri, 27 Sep 2013 15:46:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFA-0004X9-Hu for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:12 +0000 Received: from [85.158.139.211:27105] by server-2.bemta-5.messagelabs.com id F2/FC-26841-348A5425; Fri, 27 Sep 2013 15:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1380296770!5057764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22754 invoked from network); 27 Sep 2013 15:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaF7-0000DX-RG for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaF7-00051L-OS for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:09 +0000 Date: Fri, 27 Sep 2013 15:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix typo in libxl__hotplug_nic error checking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b2b15ead2152fd541e2de494f50cf99e63bfb3d Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:51 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:05 2013 +0100 libxl: fix typo in libxl__hotplug_nic error checking Coverity-ID: 1055945 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 37815eb..ea5d8c1 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -170,7 +170,7 @@ static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, } *env = get_hotplug_env(gc, script, dev); - if (!env) { + if (!*env) { rc = ERROR_FAIL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:46: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 1VPaFN-0004a0-6z; Fri, 27 Sep 2013 15:46:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFL-0004ZX-4i for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:23 +0000 Received: from [85.158.139.211:7231] by server-17.bemta-5.messagelabs.com id 50/F2-19396-E48A5425; Fri, 27 Sep 2013 15:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1380296780!2367640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29719 invoked from network); 27 Sep 2013 15:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFI-0000Dg-3E for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFI-00051h-0W for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:20 +0000 Date: Fri, 27 Sep 2013 15:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix file open failure check in libxl__file_reference_map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a0f10a8c8673ed62c7b0cff8f8de5b97c402b7d Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:52 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:08 2013 +0100 libxl: fix file open failure check in libxl__file_reference_map Coverity-ID: 1055567 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 5a8cd38..cf17658 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -228,7 +228,7 @@ int libxl__file_reference_map(libxl__file_reference *f) return 0; fd = open(f->path, O_RDONLY); - if (f < 0) + if (fd < 0) return ERROR_FAIL; ret = fstat(fd, &st_buf); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:46: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 1VPaFN-0004a0-6z; Fri, 27 Sep 2013 15:46:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFL-0004ZX-4i for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:23 +0000 Received: from [85.158.139.211:7231] by server-17.bemta-5.messagelabs.com id 50/F2-19396-E48A5425; Fri, 27 Sep 2013 15:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1380296780!2367640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29719 invoked from network); 27 Sep 2013 15:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFI-0000Dg-3E for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFI-00051h-0W for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:20 +0000 Date: Fri, 27 Sep 2013 15:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix file open failure check in libxl__file_reference_map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a0f10a8c8673ed62c7b0cff8f8de5b97c402b7d Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:52 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 12:56:08 2013 +0100 libxl: fix file open failure check in libxl__file_reference_map Coverity-ID: 1055567 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 5a8cd38..cf17658 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -228,7 +228,7 @@ int libxl__file_reference_map(libxl__file_reference *f) return 0; fd = open(f->path, O_RDONLY); - if (f < 0) + if (fd < 0) return ERROR_FAIL; ret = fstat(fd, &st_buf); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFW-0004cD-A9; Fri, 27 Sep 2013 15:46:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFU-0004bt-M7 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:32 +0000 Received: from [85.158.143.35:35368] by server-2.bemta-4.messagelabs.com id 62/31-31802-758A5425; Fri, 27 Sep 2013 15:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296790!2190854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19584 invoked from network); 27 Sep 2013 15:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFS-0000Do-AY for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFS-000524-7k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:30 +0000 Date: Fri, 27 Sep 2013 15:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: handle unlikely failure better in ask_parents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b865bda00f7cf5b0703e3d23ca22c8d1f607a1dd Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:54 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstored: handle unlikely failure better in ask_parents Coverity-ID: 1055277 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a2cf2a6..0f8ba64 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -523,8 +523,10 @@ static enum xs_perm_type ask_parents(struct connection *conn, const char *name) } while (!streq(name, "/")); /* No permission at root? We're in trouble. */ - if (!node) + if (!node) { corrupt(conn, "No permissions file at root"); + return XS_PERM_NONE; + } return perm_for_conn(conn, node->perms, node->num_perms); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:46:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFW-0004cD-A9; Fri, 27 Sep 2013 15:46:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFU-0004bt-M7 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:32 +0000 Received: from [85.158.143.35:35368] by server-2.bemta-4.messagelabs.com id 62/31-31802-758A5425; Fri, 27 Sep 2013 15:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296790!2190854!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19584 invoked from network); 27 Sep 2013 15:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFS-0000Do-AY for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFS-000524-7k for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:30 +0000 Date: Fri, 27 Sep 2013 15:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: handle unlikely failure better in ask_parents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b865bda00f7cf5b0703e3d23ca22c8d1f607a1dd Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:54 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstored: handle unlikely failure better in ask_parents Coverity-ID: 1055277 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a2cf2a6..0f8ba64 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -523,8 +523,10 @@ static enum xs_perm_type ask_parents(struct connection *conn, const char *name) } while (!streq(name, "/")); /* No permission at root? We're in trouble. */ - if (!node) + if (!node) { corrupt(conn, "No permissions file at root"); + return XS_PERM_NONE; + } return perm_for_conn(conn, node->perms, node->num_perms); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFg-0004ev-DN; Fri, 27 Sep 2013 15: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 1VPaFf-0004eT-KN for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:43 +0000 Received: from [85.158.139.211:33062] by server-1.bemta-5.messagelabs.com id CD/01-26518-268A5425; Fri, 27 Sep 2013 15:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1380296800!5054066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14200 invoked from network); 27 Sep 2013 15: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; 27 Sep 2013 15:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFc-0000Du-Ni for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFc-00052T-Lh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:40 +0000 Date: Fri, 27 Sep 2013 15:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: fix faulty check for bad handle in domain_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07fa854a43bfb52fb4abfe7865ef1fb0467bdba7 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:55 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstored: fix faulty check for bad handle in domain_init Coverity-ID: 1054975 Coverity-ID: 1055196 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xenstored_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index bf83d58..f24bd6b 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -640,7 +640,7 @@ void domain_init(void) barf_perror("Failed to allocate domain gnttab handle"); *xcg_handle = xc_gnttab_open(NULL, 0); - if (*xcg_handle < 0) + if (*xcg_handle == NULL) xprintf("WARNING: Failed to open connection to gnttab\n"); else talloc_set_destructor(xcg_handle, close_xcg_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15: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 1VPaFg-0004ev-DN; Fri, 27 Sep 2013 15: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 1VPaFf-0004eT-KN for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:43 +0000 Received: from [85.158.139.211:33062] by server-1.bemta-5.messagelabs.com id CD/01-26518-268A5425; Fri, 27 Sep 2013 15:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1380296800!5054066!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14200 invoked from network); 27 Sep 2013 15: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; 27 Sep 2013 15:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFc-0000Du-Ni for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFc-00052T-Lh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:40 +0000 Date: Fri, 27 Sep 2013 15:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstored: fix faulty check for bad handle in domain_init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07fa854a43bfb52fb4abfe7865ef1fb0467bdba7 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:55 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstored: fix faulty check for bad handle in domain_init Coverity-ID: 1054975 Coverity-ID: 1055196 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xenstored_domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index bf83d58..f24bd6b 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -640,7 +640,7 @@ void domain_init(void) barf_perror("Failed to allocate domain gnttab handle"); *xcg_handle = xc_gnttab_open(NULL, 0); - if (*xcg_handle < 0) + if (*xcg_handle == NULL) xprintf("WARNING: Failed to open connection to gnttab\n"); else talloc_set_destructor(xcg_handle, close_xcg_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:46:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:46: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 1VPaFq-0004hL-GE; Fri, 27 Sep 2013 15:46:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFp-0004h1-8A for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:53 +0000 Received: from [85.158.143.35:36960] by server-2.bemta-4.messagelabs.com id 58/81-31802-C68A5425; Fri, 27 Sep 2013 15:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1380296811!1061049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28939 invoked from network); 27 Sep 2013 15:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFn-0000E0-0K for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFm-00052p-TC for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:50 +0000 Date: Fri, 27 Sep 2013 15:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: check socket path length before copying it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f220279c14f5bcbaeb520c4f2498f25d795213e6 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:56 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstore: check socket path length before copying it Coverity-ID: 1055997 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index 86ef6c7..b1e6820 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -196,6 +196,10 @@ static int get_socket(const char *connect_to) goto error; addr.sun_family = AF_UNIX; + if(strlen(connect_to) >= sizeof(addr.sun_path)) { + errno = EINVAL; + goto error; + } strcpy(addr.sun_path, connect_to); if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 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 Sep 27 15:46:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:46: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 1VPaFq-0004hL-GE; Fri, 27 Sep 2013 15:46:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFp-0004h1-8A for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:53 +0000 Received: from [85.158.143.35:36960] by server-2.bemta-4.messagelabs.com id 58/81-31802-C68A5425; Fri, 27 Sep 2013 15:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1380296811!1061049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28939 invoked from network); 27 Sep 2013 15:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFn-0000E0-0K for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFm-00052p-TC for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:46:50 +0000 Date: Fri, 27 Sep 2013 15:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: check socket path length before copying it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f220279c14f5bcbaeb520c4f2498f25d795213e6 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:56 2013 +1200 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:12 2013 +0100 xenstore: check socket path length before copying it Coverity-ID: 1055997 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/xenstore/xs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index 86ef6c7..b1e6820 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -196,6 +196,10 @@ static int get_socket(const char *connect_to) goto error; addr.sun_family = AF_UNIX; + if(strlen(connect_to) >= sizeof(addr.sun_path)) { + errno = EINVAL; + goto error; + } strcpy(addr.sun_path, connect_to); if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 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 Sep 27 15:47:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaG1-0004jn-Iv; Fri, 27 Sep 2013 15:47:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaG0-0004jN-5Q for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:04 +0000 Received: from [85.158.139.211:38610] by server-4.bemta-5.messagelabs.com id CF/C4-17194-778A5425; Fri, 27 Sep 2013 15:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1380296821!5040692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3889 invoked from network); 27 Sep 2013 15:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFx-0000Ec-8S for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFx-00053D-5h for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:01 +0000 Date: Fri, 27 Sep 2013 15:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xm-test: add a missing %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 e435ac69be3ac47eff648cbf29c4920f7f1e7450 Author: Zhu Yanhai AuthorDate: Mon Sep 23 18:02:33 2013 +0800 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:23 2013 +0100 xm-test: add a missing %s Obviously we need a %s here. Signed-off-by: Zhu Yanhai Acked-by: Ian Campbell --- tools/xm-test/lib/XmTestLib/Console.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xm-test/lib/XmTestLib/Console.py b/tools/xm-test/lib/XmTestLib/Console.py index b92f32b..e05cf0d 100755 --- a/tools/xm-test/lib/XmTestLib/Console.py +++ b/tools/xm-test/lib/XmTestLib/Console.py @@ -291,7 +291,7 @@ if __name__ == "__main__": try: run = t.runCmd(sys.argv[2]) except ConsoleError, e: - print "Console failed (%)" % str(e) + print "Console failed (%s)" % str(e) sys.exit(255) t._XmConsole__closeConsole() -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaG1-0004jn-Iv; Fri, 27 Sep 2013 15:47:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaG0-0004jN-5Q for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:04 +0000 Received: from [85.158.139.211:38610] by server-4.bemta-5.messagelabs.com id CF/C4-17194-778A5425; Fri, 27 Sep 2013 15:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1380296821!5040692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3889 invoked from network); 27 Sep 2013 15:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaFx-0000Ec-8S for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaFx-00053D-5h for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:01 +0000 Date: Fri, 27 Sep 2013 15:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xm-test: add a missing %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 e435ac69be3ac47eff648cbf29c4920f7f1e7450 Author: Zhu Yanhai AuthorDate: Mon Sep 23 18:02:33 2013 +0800 Commit: Ian Campbell CommitDate: Wed Sep 25 13:23:23 2013 +0100 xm-test: add a missing %s Obviously we need a %s here. Signed-off-by: Zhu Yanhai Acked-by: Ian Campbell --- tools/xm-test/lib/XmTestLib/Console.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xm-test/lib/XmTestLib/Console.py b/tools/xm-test/lib/XmTestLib/Console.py index b92f32b..e05cf0d 100755 --- a/tools/xm-test/lib/XmTestLib/Console.py +++ b/tools/xm-test/lib/XmTestLib/Console.py @@ -291,7 +291,7 @@ if __name__ == "__main__": try: run = t.runCmd(sys.argv[2]) except ConsoleError, e: - print "Console failed (%)" % str(e) + print "Console failed (%s)" % str(e) sys.exit(255) t._XmConsole__closeConsole() -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGB-0004mG-MS; Fri, 27 Sep 2013 15:47:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGA-0004lr-7T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:14 +0000 Received: from [85.158.137.68:48227] by server-13.bemta-3.messagelabs.com id E5/4E-25971-188A5425; Fri, 27 Sep 2013 15:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1380296831!5199175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8979 invoked from network); 27 Sep 2013 15:47:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaG7-0000Ei-IB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaG7-00054K-Ek for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:11 +0000 Date: Fri, 27 Sep 2013 15:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "fix DOMID_IO mapping permission checks" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7099bd90e1b84cb6a0143835ba050a445161715d Author: Jan Beulich AuthorDate: Wed Sep 25 18:13:06 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 18:13:06 2013 +0200 Revert "fix DOMID_IO mapping permission checks" This reverts commit 145ae98bfab8280744ad5e800cc036e1c84c0486. --- xen/include/xsm/dummy.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index f831bc4..cc0a5a8 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -570,8 +570,6 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do int rc; XSM_ASSERT_ACTION(XSM_TARGET); rc = xsm_default_action(action, d, f); - if ( t == dom_io ) - return rc; if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:47:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGB-0004mG-MS; Fri, 27 Sep 2013 15:47:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGA-0004lr-7T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:14 +0000 Received: from [85.158.137.68:48227] by server-13.bemta-3.messagelabs.com id E5/4E-25971-188A5425; Fri, 27 Sep 2013 15:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1380296831!5199175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8979 invoked from network); 27 Sep 2013 15:47:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaG7-0000Ei-IB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaG7-00054K-Ek for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:11 +0000 Date: Fri, 27 Sep 2013 15:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "fix DOMID_IO mapping permission checks" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7099bd90e1b84cb6a0143835ba050a445161715d Author: Jan Beulich AuthorDate: Wed Sep 25 18:13:06 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 18:13:06 2013 +0200 Revert "fix DOMID_IO mapping permission checks" This reverts commit 145ae98bfab8280744ad5e800cc036e1c84c0486. --- xen/include/xsm/dummy.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index f831bc4..cc0a5a8 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -570,8 +570,6 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do int rc; XSM_ASSERT_ACTION(XSM_TARGET); rc = xsm_default_action(action, d, f); - if ( t == dom_io ) - return rc; if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:47:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGK-0004oj-RN; Fri, 27 Sep 2013 15:47:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGJ-0004oK-TU for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:24 +0000 Received: from [85.158.143.35:41632] by server-1.bemta-4.messagelabs.com id 46/2C-11076-B88A5425; Fri, 27 Sep 2013 15:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1380296841!2904944!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26781 invoked from network); 27 Sep 2013 15:47:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGH-0000Em-QM for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGH-00054h-NY for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:21 +0000 Date: Fri, 27 Sep 2013 15:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix rdrand asm() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 573fd5bd2d8bd068a6cea7ae5fcc58b962d43a78 Author: Jan Beulich AuthorDate: Thu Sep 26 10:11:00 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:11:00 2013 +0200 x86: fix rdrand asm() Just learned the hard way that at least for non-volatile asm()s gcc indeed does what the documentation says: It may move it across jumps (i.e. ahead of the cpu_has() check). While the documentation claims that this can also happen for volatile asm()s, if that was the case we'd have many more problems in our code (and e,g, Linux would too). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/include/asm-x86/random.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/random.h b/xen/include/asm-x86/random.h index 6198e72..9e1fe0b 100644 --- a/xen/include/asm-x86/random.h +++ b/xen/include/asm-x86/random.h @@ -8,7 +8,7 @@ static inline unsigned int arch_get_random(void) unsigned int val = 0; if ( cpu_has(¤t_cpu_data, X86_FEATURE_RDRAND) ) - asm ( ".byte 0x0f,0xc7,0xf0" : "+a" (val) ); + asm volatile ( ".byte 0x0f,0xc7,0xf0" : "+a" (val) ); return val; } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGK-0004oj-RN; Fri, 27 Sep 2013 15:47:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGJ-0004oK-TU for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:24 +0000 Received: from [85.158.143.35:41632] by server-1.bemta-4.messagelabs.com id 46/2C-11076-B88A5425; Fri, 27 Sep 2013 15:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1380296841!2904944!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26781 invoked from network); 27 Sep 2013 15:47:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGH-0000Em-QM for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGH-00054h-NY for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:21 +0000 Date: Fri, 27 Sep 2013 15:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix rdrand asm() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 573fd5bd2d8bd068a6cea7ae5fcc58b962d43a78 Author: Jan Beulich AuthorDate: Thu Sep 26 10:11:00 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:11:00 2013 +0200 x86: fix rdrand asm() Just learned the hard way that at least for non-volatile asm()s gcc indeed does what the documentation says: It may move it across jumps (i.e. ahead of the cpu_has() check). While the documentation claims that this can also happen for volatile asm()s, if that was the case we'd have many more problems in our code (and e,g, Linux would too). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/include/asm-x86/random.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/random.h b/xen/include/asm-x86/random.h index 6198e72..9e1fe0b 100644 --- a/xen/include/asm-x86/random.h +++ b/xen/include/asm-x86/random.h @@ -8,7 +8,7 @@ static inline unsigned int arch_get_random(void) unsigned int val = 0; if ( cpu_has(¤t_cpu_data, X86_FEATURE_RDRAND) ) - asm ( ".byte 0x0f,0xc7,0xf0" : "+a" (val) ); + asm volatile ( ".byte 0x0f,0xc7,0xf0" : "+a" (val) ); return val; } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGV-0004qu-Ug; Fri, 27 Sep 2013 15:47:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGU-0004qZ-Oc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:34 +0000 Received: from [85.158.137.68:53352] by server-5.bemta-3.messagelabs.com id 23/35-23058-598A5425; Fri, 27 Sep 2013 15:47:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1380296852!5199948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24821 invoked from network); 27 Sep 2013 15:47:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGS-0000Ew-2R for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGR-000554-Uw for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:32 +0000 Date: Fri, 27 Sep 2013 15:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: Indicate how well nmi_shootdown_cpus() managed to do X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f12c1f0b09205cdf18a2c4a615fdc3e7357ce704 Author: Andrew Cooper AuthorDate: Thu Sep 26 10:14:51 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:14:51 2013 +0200 x86/crash: Indicate how well nmi_shootdown_cpus() managed to do Having nmi_shootdown_cpus() report which pcpus failed to be shot down is a useful debugging hint as to what possibly went wrong (especially when the crash logs seem to indicate that an NMI timeout occurred while waiting for one of the problematic pcpus to perform an action). This is achieved by swapping an atomic_t count of unreported pcpus with a cpumask. In the case that the 1 second timeout occurs, use the cpumask to identify the problematic pcpus. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/crash.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 0a807d1..4ef379b 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,7 @@ #include #include -static atomic_t waiting_for_crash_ipi; +static cpumask_t waiting_to_crash; static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); @@ -65,7 +66,7 @@ void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) __stop_this_cpu(); this_cpu(crash_save_done) = 1; - atomic_dec(&waiting_for_crash_ipi); + cpumask_clear_cpu(cpu, &waiting_to_crash); } /* Poor mans self_nmi(). __stop_this_cpu() has reverted the LAPIC @@ -122,7 +123,7 @@ static void nmi_shootdown_cpus(void) crashing_cpu = cpu; local_irq_count(crashing_cpu) = 0; - atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1); + cpumask_andnot(&waiting_to_crash, &cpu_online_map, cpumask_of(cpu)); /* Change NMI trap handlers. Non-crashing pcpus get nmi_crash which * invokes do_nmi_crash (above), which cause them to write state and @@ -162,12 +163,22 @@ static void nmi_shootdown_cpus(void) smp_send_nmi_allbutself(); msecs = 1000; /* Wait at most a second for the other cpus to stop */ - while ( (atomic_read(&waiting_for_crash_ipi) > 0) && msecs ) + while ( !cpumask_empty(&waiting_to_crash) && msecs ) { mdelay(1); msecs--; } + /* Leave a hint of how well we did trying to shoot down the other cpus */ + if ( cpumask_empty(&waiting_to_crash) ) + printk("Shot down all CPUs\n"); + else + { + cpulist_scnprintf(keyhandler_scratch, sizeof keyhandler_scratch, + &waiting_to_crash); + printk("Failed to shoot down CPUs {%s}\n", keyhandler_scratch); + } + /* Crash shutdown any IOMMU functionality as the crashdump kernel is not * happy when booting if interrupt/dma remapping is still enabled */ iommu_crash_shutdown(); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGV-0004qu-Ug; Fri, 27 Sep 2013 15:47:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGU-0004qZ-Oc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:34 +0000 Received: from [85.158.137.68:53352] by server-5.bemta-3.messagelabs.com id 23/35-23058-598A5425; Fri, 27 Sep 2013 15:47:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1380296852!5199948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24821 invoked from network); 27 Sep 2013 15:47:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGS-0000Ew-2R for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGR-000554-Uw for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:32 +0000 Date: Fri, 27 Sep 2013 15:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: Indicate how well nmi_shootdown_cpus() managed to do X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f12c1f0b09205cdf18a2c4a615fdc3e7357ce704 Author: Andrew Cooper AuthorDate: Thu Sep 26 10:14:51 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:14:51 2013 +0200 x86/crash: Indicate how well nmi_shootdown_cpus() managed to do Having nmi_shootdown_cpus() report which pcpus failed to be shot down is a useful debugging hint as to what possibly went wrong (especially when the crash logs seem to indicate that an NMI timeout occurred while waiting for one of the problematic pcpus to perform an action). This is achieved by swapping an atomic_t count of unreported pcpus with a cpumask. In the case that the 1 second timeout occurs, use the cpumask to identify the problematic pcpus. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/crash.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 0a807d1..4ef379b 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,7 @@ #include #include -static atomic_t waiting_for_crash_ipi; +static cpumask_t waiting_to_crash; static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); @@ -65,7 +66,7 @@ void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) __stop_this_cpu(); this_cpu(crash_save_done) = 1; - atomic_dec(&waiting_for_crash_ipi); + cpumask_clear_cpu(cpu, &waiting_to_crash); } /* Poor mans self_nmi(). __stop_this_cpu() has reverted the LAPIC @@ -122,7 +123,7 @@ static void nmi_shootdown_cpus(void) crashing_cpu = cpu; local_irq_count(crashing_cpu) = 0; - atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1); + cpumask_andnot(&waiting_to_crash, &cpu_online_map, cpumask_of(cpu)); /* Change NMI trap handlers. Non-crashing pcpus get nmi_crash which * invokes do_nmi_crash (above), which cause them to write state and @@ -162,12 +163,22 @@ static void nmi_shootdown_cpus(void) smp_send_nmi_allbutself(); msecs = 1000; /* Wait at most a second for the other cpus to stop */ - while ( (atomic_read(&waiting_for_crash_ipi) > 0) && msecs ) + while ( !cpumask_empty(&waiting_to_crash) && msecs ) { mdelay(1); msecs--; } + /* Leave a hint of how well we did trying to shoot down the other cpus */ + if ( cpumask_empty(&waiting_to_crash) ) + printk("Shot down all CPUs\n"); + else + { + cpulist_scnprintf(keyhandler_scratch, sizeof keyhandler_scratch, + &waiting_to_crash); + printk("Failed to shoot down CPUs {%s}\n", keyhandler_scratch); + } + /* Crash shutdown any IOMMU functionality as the crashdump kernel is not * happy when booting if interrupt/dma remapping is still enabled */ iommu_crash_shutdown(); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:47:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGg-0004tA-1t; Fri, 27 Sep 2013 15:47:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGe-0004sn-Ks for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:44 +0000 Received: from [193.109.254.147:11445] by server-6.bemta-14.messagelabs.com id 6A/CD-20235-F98A5425; Fri, 27 Sep 2013 15:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1380296862!1912617!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16741 invoked from network); 27 Sep 2013 15:47:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGc-0000F2-CV for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGc-00055T-6p for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:42 +0000 Date: Fri, 27 Sep 2013 15:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix DOMID_IO mapping permission checks (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07344c0f33be13bf9232a113681ef9087557f706 Author: Daniel De Graaf AuthorDate: Thu Sep 26 10:15:47 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:15:47 2013 +0200 fix DOMID_IO mapping permission checks (try 2) When the permission checks for memory mapping were moved from get_pg_owner to xsm_mmu_update in aaba7a677, the exception for DOMID_IO was not taken into account. This will cause IO memory mappings by PV domains (mini-os in particular) to fail when XSM/FLASK is not being used. This patch reintroduces the exception for DOMID_IO; the actual restrictions on IO memory mappings have always been checked separately using iomem_access_permitted, so this change should not break existing access control. Reported-by: Eduardo Peixoto Macedo Signed-off-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index cc0a5a8..052f3e0 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -567,9 +567,10 @@ static XSM_INLINE int xsm_domain_memory_map(XSM_DEFAULT_ARG struct domain *d) static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct domain *t, struct domain *f, uint32_t flags) { - int rc; + int rc = 0; XSM_ASSERT_ACTION(XSM_TARGET); - rc = xsm_default_action(action, d, f); + if ( f != dom_io ) + rc = xsm_default_action(action, d, f); if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:47:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGg-0004tA-1t; Fri, 27 Sep 2013 15:47:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGe-0004sn-Ks for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:44 +0000 Received: from [193.109.254.147:11445] by server-6.bemta-14.messagelabs.com id 6A/CD-20235-F98A5425; Fri, 27 Sep 2013 15:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1380296862!1912617!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16741 invoked from network); 27 Sep 2013 15:47:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGc-0000F2-CV for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGc-00055T-6p for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:42 +0000 Date: Fri, 27 Sep 2013 15:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix DOMID_IO mapping permission checks (try 2) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07344c0f33be13bf9232a113681ef9087557f706 Author: Daniel De Graaf AuthorDate: Thu Sep 26 10:15:47 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:15:47 2013 +0200 fix DOMID_IO mapping permission checks (try 2) When the permission checks for memory mapping were moved from get_pg_owner to xsm_mmu_update in aaba7a677, the exception for DOMID_IO was not taken into account. This will cause IO memory mappings by PV domains (mini-os in particular) to fail when XSM/FLASK is not being used. This patch reintroduces the exception for DOMID_IO; the actual restrictions on IO memory mappings have always been checked separately using iomem_access_permitted, so this change should not break existing access control. Reported-by: Eduardo Peixoto Macedo Signed-off-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index cc0a5a8..052f3e0 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -567,9 +567,10 @@ static XSM_INLINE int xsm_domain_memory_map(XSM_DEFAULT_ARG struct domain *d) static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct domain *t, struct domain *f, uint32_t flags) { - int rc; + int rc = 0; XSM_ASSERT_ACTION(XSM_TARGET); - rc = xsm_default_action(action, d, f); + if ( f != dom_io ) + rc = xsm_default_action(action, d, f); if ( t && !rc ) rc = xsm_default_action(action, d, t); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:47:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGq-0004vz-Jq; Fri, 27 Sep 2013 15:47:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGo-0004vW-V8 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:55 +0000 Received: from [193.109.254.147:18037] by server-5.bemta-14.messagelabs.com id 8B/95-04931-AA8A5425; Fri, 27 Sep 2013 15:47:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1380296872!1731354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30845 invoked from network); 27 Sep 2013 15:47:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGm-0000FC-It for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGm-00055p-Gu for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:52 +0000 Date: Fri, 27 Sep 2013 15:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix compat guest handling of XENPF_enter_acpi_sleep X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec206e8ee4833c87746b0ef1e2e7ceeddc53e5f7 Author: Jan Beulich AuthorDate: Thu Sep 26 10:23:39 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:23:39 2013 +0200 x86: fix compat guest handling of XENPF_enter_acpi_sleep Rather than blindly defining the native name to the compat one, when we want to pass the compat structure to a native function we ought to verify that their layouts match. With a respective xlat.lst entry there's then also no need anymore to do such aliasing. While cleaaning up that file I also noticed that the Cx and Px interface handling here has quite a few unnecessary #define-s - delete them. Signed-off-by: Jan Beulich --- xen/arch/x86/x86_64/platform_hypercall.c | 18 +++++++----------- xen/include/xlat.lst | 1 + 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index aa2ad54..b6f380e 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -14,17 +14,11 @@ DEFINE_XEN_GUEST_HANDLE(compat_platform_op_t); #define efi_get_info efi_compat_get_info #define efi_runtime_call(x) efi_compat_runtime_call(x) -#define xen_processor_px compat_processor_px -#define xen_processor_px_t compat_processor_px_t -#define xen_processor_performance compat_processor_performance -#define xen_processor_performance_t compat_processor_performance_t -#define xenpf_set_processor_pminfo compat_pf_set_processor_pminfo +#define xen_processor_performance compat_processor_performance +#define set_px_pminfo compat_set_px_pminfo -#define set_px_pminfo compat_set_px_pminfo - -#define xen_processor_power compat_processor_power -#define xen_processor_power_t compat_processor_power_t -#define set_cx_pminfo compat_set_cx_pminfo +#define xen_processor_power compat_processor_power +#define set_cx_pminfo compat_set_cx_pminfo #define xen_pf_pcpuinfo xenpf_pcpuinfo CHECK_pf_pcpuinfo; @@ -34,7 +28,9 @@ CHECK_pf_pcpuinfo; CHECK_pf_pcpu_version; #undef xen_pf_pcpu_version -#define xenpf_enter_acpi_sleep compat_pf_enter_acpi_sleep +#define xen_pf_enter_acpi_sleep xenpf_enter_acpi_sleep +CHECK_pf_enter_acpi_sleep; +#undef xen_pf_enter_acpi_sleep #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index d832110..f00cef3 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -83,6 +83,7 @@ ! processor_power platform.h ? processor_px platform.h ! psd_package platform.h +? xenpf_enter_acpi_sleep platform.h ? xenpf_pcpuinfo platform.h ? xenpf_pcpu_version platform.h ! sched_poll sched.h -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:47:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:47: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 1VPaGq-0004vz-Jq; Fri, 27 Sep 2013 15:47:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGo-0004vW-V8 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:55 +0000 Received: from [193.109.254.147:18037] by server-5.bemta-14.messagelabs.com id 8B/95-04931-AA8A5425; Fri, 27 Sep 2013 15:47:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1380296872!1731354!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30845 invoked from network); 27 Sep 2013 15:47:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGm-0000FC-It for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGm-00055p-Gu for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:47:52 +0000 Date: Fri, 27 Sep 2013 15:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix compat guest handling of XENPF_enter_acpi_sleep X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec206e8ee4833c87746b0ef1e2e7ceeddc53e5f7 Author: Jan Beulich AuthorDate: Thu Sep 26 10:23:39 2013 +0200 Commit: Jan Beulich CommitDate: Thu Sep 26 10:23:39 2013 +0200 x86: fix compat guest handling of XENPF_enter_acpi_sleep Rather than blindly defining the native name to the compat one, when we want to pass the compat structure to a native function we ought to verify that their layouts match. With a respective xlat.lst entry there's then also no need anymore to do such aliasing. While cleaaning up that file I also noticed that the Cx and Px interface handling here has quite a few unnecessary #define-s - delete them. Signed-off-by: Jan Beulich --- xen/arch/x86/x86_64/platform_hypercall.c | 18 +++++++----------- xen/include/xlat.lst | 1 + 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index aa2ad54..b6f380e 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -14,17 +14,11 @@ DEFINE_XEN_GUEST_HANDLE(compat_platform_op_t); #define efi_get_info efi_compat_get_info #define efi_runtime_call(x) efi_compat_runtime_call(x) -#define xen_processor_px compat_processor_px -#define xen_processor_px_t compat_processor_px_t -#define xen_processor_performance compat_processor_performance -#define xen_processor_performance_t compat_processor_performance_t -#define xenpf_set_processor_pminfo compat_pf_set_processor_pminfo +#define xen_processor_performance compat_processor_performance +#define set_px_pminfo compat_set_px_pminfo -#define set_px_pminfo compat_set_px_pminfo - -#define xen_processor_power compat_processor_power -#define xen_processor_power_t compat_processor_power_t -#define set_cx_pminfo compat_set_cx_pminfo +#define xen_processor_power compat_processor_power +#define set_cx_pminfo compat_set_cx_pminfo #define xen_pf_pcpuinfo xenpf_pcpuinfo CHECK_pf_pcpuinfo; @@ -34,7 +28,9 @@ CHECK_pf_pcpuinfo; CHECK_pf_pcpu_version; #undef xen_pf_pcpu_version -#define xenpf_enter_acpi_sleep compat_pf_enter_acpi_sleep +#define xen_pf_enter_acpi_sleep xenpf_enter_acpi_sleep +CHECK_pf_enter_acpi_sleep; +#undef xen_pf_enter_acpi_sleep #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index d832110..f00cef3 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -83,6 +83,7 @@ ! processor_power platform.h ? processor_px platform.h ! psd_package platform.h +? xenpf_enter_acpi_sleep platform.h ? xenpf_pcpuinfo platform.h ? xenpf_pcpu_version platform.h ! sched_poll sched.h -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:48:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH0-0004yJ-N5; Fri, 27 Sep 2013 15:48:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGz-0004xp-1R for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:05 +0000 Received: from [85.158.143.35:50136] by server-2.bemta-4.messagelabs.com id 0B/D2-31802-4B8A5425; Fri, 27 Sep 2013 15:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296882!2191243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30018 invoked from network); 27 Sep 2013 15:48:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGw-0000Fo-ON for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGw-00056L-Mx for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:02 +0000 Date: Fri, 27 Sep 2013 15:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce init_info 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 f70263755ae0741d351caac0517b1ffaca646182 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:41:50 2013 +0100 xen/arm: Introduce init_info structure This structure will gather all information to boot a secondary cpus. For now it just contains the initial stack. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/asm-offsets.c | 4 ++++ xen/arch/arm/arm32/head.S | 3 ++- xen/arch/arm/arm64/asm-offsets.c | 3 +++ xen/arch/arm/arm64/head.S | 3 ++- xen/arch/arm/smpboot.c | 9 ++++++--- xen/include/asm-arm/init.h | 6 ++++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c index 263fff3..ac628c0 100644 --- a/xen/arch/arm/arm32/asm-offsets.c +++ b/xen/arch/arm/arm32/asm-offsets.c @@ -69,6 +69,10 @@ void __dummy__(void) OFFSET(PROCINFO_cpu_val, struct proc_info_list, cpu_val); OFFSET(PROCINFO_cpu_mask, struct proc_info_list, cpu_mask); OFFSET(PROCINFO_cpu_init, struct proc_info_list, cpu_init); + + BLANK(); + OFFSET(INITINFO_stack, struct init_info, stack); + } /* diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 79e95b6..fce18a2 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -366,7 +366,8 @@ paging: bne 1b launch: - ldr r0, =init_stack /* Find the boot-time stack */ + ldr r0, =init_data + add r0, #INITINFO_stack /* Find the boot-time stack */ ldr sp, [r0] add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c index 2a225b6..d7572fa 100644 --- a/xen/arch/arm/arm64/asm-offsets.c +++ b/xen/arch/arm/arm64/asm-offsets.c @@ -46,6 +46,9 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); OFFSET(VCPU_arch_saved_context, struct vcpu, arch.saved_context); + + BLANK(); + OFFSET(INITINFO_stack, struct init_info, stack); } /* diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 21b7e4d..e0831b6 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -313,7 +313,8 @@ paging: b.ne 1b launch: - ldr x0, =init_stack /* Find the boot-time stack */ + ldr x0, =init_data + add x0, x0, #INITINFO_stack /* Find the boot-time stack */ ldr x0, [x0] add x0, x0, #STACK_SIZE /* (which grows down from the top). */ sub x0, x0, #CPUINFO_sizeof /* Make room for CPU save record */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index b6aea63..945f473 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -46,8 +46,11 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; static unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __attribute__((__aligned__(STACK_SIZE))); -/* Pointer to the stack, used by head.S when entering C */ -unsigned char *init_stack = cpu0_boot_stack; +/* Initial boot cpu data */ +struct init_info __initdata init_data = +{ + .stack = cpu0_boot_stack, +}; /* Shared state for coordinating CPU bringup */ unsigned long smp_up_cpu = 0; @@ -224,7 +227,7 @@ int __cpu_up(unsigned int cpu) return rc; /* Tell the remote CPU which stack to boot on. */ - init_stack = idle_vcpu[cpu]->arch.stack; + init_data.stack = idle_vcpu[cpu]->arch.stack; /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ diff --git a/xen/include/asm-arm/init.h b/xen/include/asm-arm/init.h index 237ec25..7a07136 100644 --- a/xen/include/asm-arm/init.h +++ b/xen/include/asm-arm/init.h @@ -1,6 +1,12 @@ #ifndef _XEN_ASM_INIT_H #define _XEN_ASM_INIT_H +struct init_info +{ + /* Pointer to the stack, used by head.S when entering in C */ + unsigned char *stack; +}; + #endif /* _XEN_ASM_INIT_H */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH0-0004yJ-N5; Fri, 27 Sep 2013 15:48:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGz-0004xp-1R for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:05 +0000 Received: from [85.158.143.35:50136] by server-2.bemta-4.messagelabs.com id 0B/D2-31802-4B8A5425; Fri, 27 Sep 2013 15:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1380296882!2191243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30018 invoked from network); 27 Sep 2013 15:48:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaGw-0000Fo-ON for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaGw-00056L-Mx for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:02 +0000 Date: Fri, 27 Sep 2013 15:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce init_info 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 f70263755ae0741d351caac0517b1ffaca646182 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:41:50 2013 +0100 xen/arm: Introduce init_info structure This structure will gather all information to boot a secondary cpus. For now it just contains the initial stack. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm32/asm-offsets.c | 4 ++++ xen/arch/arm/arm32/head.S | 3 ++- xen/arch/arm/arm64/asm-offsets.c | 3 +++ xen/arch/arm/arm64/head.S | 3 ++- xen/arch/arm/smpboot.c | 9 ++++++--- xen/include/asm-arm/init.h | 6 ++++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c index 263fff3..ac628c0 100644 --- a/xen/arch/arm/arm32/asm-offsets.c +++ b/xen/arch/arm/arm32/asm-offsets.c @@ -69,6 +69,10 @@ void __dummy__(void) OFFSET(PROCINFO_cpu_val, struct proc_info_list, cpu_val); OFFSET(PROCINFO_cpu_mask, struct proc_info_list, cpu_mask); OFFSET(PROCINFO_cpu_init, struct proc_info_list, cpu_init); + + BLANK(); + OFFSET(INITINFO_stack, struct init_info, stack); + } /* diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 79e95b6..fce18a2 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -366,7 +366,8 @@ paging: bne 1b launch: - ldr r0, =init_stack /* Find the boot-time stack */ + ldr r0, =init_data + add r0, #INITINFO_stack /* Find the boot-time stack */ ldr sp, [r0] add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c index 2a225b6..d7572fa 100644 --- a/xen/arch/arm/arm64/asm-offsets.c +++ b/xen/arch/arm/arm64/asm-offsets.c @@ -46,6 +46,9 @@ void __dummy__(void) DEFINE(CPUINFO_sizeof, sizeof(struct cpu_info)); OFFSET(VCPU_arch_saved_context, struct vcpu, arch.saved_context); + + BLANK(); + OFFSET(INITINFO_stack, struct init_info, stack); } /* diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 21b7e4d..e0831b6 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -313,7 +313,8 @@ paging: b.ne 1b launch: - ldr x0, =init_stack /* Find the boot-time stack */ + ldr x0, =init_data + add x0, x0, #INITINFO_stack /* Find the boot-time stack */ ldr x0, [x0] add x0, x0, #STACK_SIZE /* (which grows down from the top). */ sub x0, x0, #CPUINFO_sizeof /* Make room for CPU save record */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index b6aea63..945f473 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -46,8 +46,11 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; static unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __attribute__((__aligned__(STACK_SIZE))); -/* Pointer to the stack, used by head.S when entering C */ -unsigned char *init_stack = cpu0_boot_stack; +/* Initial boot cpu data */ +struct init_info __initdata init_data = +{ + .stack = cpu0_boot_stack, +}; /* Shared state for coordinating CPU bringup */ unsigned long smp_up_cpu = 0; @@ -224,7 +227,7 @@ int __cpu_up(unsigned int cpu) return rc; /* Tell the remote CPU which stack to boot on. */ - init_stack = idle_vcpu[cpu]->arch.stack; + init_data.stack = idle_vcpu[cpu]->arch.stack; /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ diff --git a/xen/include/asm-arm/init.h b/xen/include/asm-arm/init.h index 237ec25..7a07136 100644 --- a/xen/include/asm-arm/init.h +++ b/xen/include/asm-arm/init.h @@ -1,6 +1,12 @@ #ifndef _XEN_ASM_INIT_H #define _XEN_ASM_INIT_H +struct init_info +{ + /* Pointer to the stack, used by head.S when entering in C */ + unsigned char *stack; +}; + #endif /* _XEN_ASM_INIT_H */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHA-00053t-Qg; Fri, 27 Sep 2013 15:48:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH9-000537-F4 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:15 +0000 Received: from [85.158.143.35:47949] by server-3.bemta-4.messagelabs.com id 07/C5-24907-EB8A5425; Fri, 27 Sep 2013 15:48:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1380296893!2905166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31983 invoked from network); 27 Sep 2013 15:48:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH6-0000Fu-VO for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaH6-00057Z-Sm for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:12 +0000 Date: Fri, 27 Sep 2013 15:48:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use cpumask_t to describe cpu mask in gic_route_dt_irq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4e681a59bf2b90acb44044c0f236bce26697e0c Author: Julien Grall AuthorDate: Thu Sep 26 12:09:36 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:45 2013 +0100 xen/arm: use cpumask_t to describe cpu mask in gic_route_dt_irq Replace by cpumask_t to take advantage of cpumask_* helpers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 20 ++++++++++++-------- xen/arch/arm/time.c | 6 +++--- xen/include/asm-arm/gic.h | 3 ++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index aff57b9..091eb36 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -184,10 +184,14 @@ static hw_irq_controller gic_guest_irq_type = { /* needs to be called with gic.lock held */ static void gic_set_irq_properties(unsigned int irq, bool_t level, - unsigned int cpu_mask, unsigned int priority) + const cpumask_t *cpu_mask, + unsigned int priority) { volatile unsigned char *bytereg; uint32_t cfg, edgebit; + unsigned int mask = cpumask_bits(cpu_mask)[0]; + + ASSERT(!(mask & ~0xff)); /* Target bitmap only support 8 CPUS */ /* Set edge / level */ cfg = GICD[GICD_ICFGR + irq / 16]; @@ -200,7 +204,7 @@ static void gic_set_irq_properties(unsigned int irq, bool_t level, /* Set target CPU mask (RAZ/WI on uniprocessor) */ bytereg = (unsigned char *) (GICD + GICD_ITARGETSR); - bytereg[irq] = cpu_mask; + bytereg[irq] = mask; /* Set priority */ bytereg = (unsigned char *) (GICD + GICD_IPRIORITYR); @@ -210,12 +214,11 @@ static void gic_set_irq_properties(unsigned int irq, bool_t level, /* Program the GIC to route an interrupt */ static int gic_route_irq(unsigned int irq, bool_t level, - unsigned int cpu_mask, unsigned int priority) + const cpumask_t *cpu_mask, unsigned int priority) { struct irq_desc *desc = irq_to_desc(irq); unsigned long flags; - ASSERT(!(cpu_mask & ~0xff)); /* Targets bitmap only supports 8 CPUs */ ASSERT(priority <= 0xff); /* Only 8 bits of priority */ ASSERT(irq < gic.lines); /* Can't route interrupts that don't exist */ @@ -242,7 +245,7 @@ static int gic_route_irq(unsigned int irq, bool_t level, } /* Program the GIC to route an interrupt with a dt_irq */ -void gic_route_dt_irq(const struct dt_irq *irq, unsigned int cpu_mask, +void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, unsigned int priority) { bool_t level; @@ -496,7 +499,7 @@ void gic_disable_cpu(void) void gic_route_ppis(void) { /* GIC maintenance */ - gic_route_dt_irq(&gic.maintenance, 1u << smp_processor_id(), 0xa0); + gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), 0xa0); /* Route timer interrupt */ route_timer_interrupt(); } @@ -511,7 +514,7 @@ void gic_route_spis(void) if ( (irq = serial_dt_irq(seridx)) == NULL ) continue; - gic_route_dt_irq(irq, 1u << smp_processor_id(), 0xa0); + gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), 0xa0); } } @@ -718,7 +721,8 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, level = dt_irq_is_level_triggered(irq); - gic_set_irq_properties(irq->irq, level, 1u << smp_processor_id(), 0xa0); + gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), + 0xa0); retval = __setup_irq(desc, irq->irq, action); if (retval) { diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index eb3ad5c..a30d422 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -222,11 +222,11 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) void __cpuinit route_timer_interrupt(void) { gic_route_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); gic_route_dt_irq(&timer_irq[TIMER_HYP_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); gic_route_dt_irq(&timer_irq[TIMER_VIRT_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 2bc4219..0a890be 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -148,7 +148,8 @@ extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt with a dt_irq */ -extern void gic_route_dt_irq(const struct dt_irq *irq, unsigned int cpu_mask, +extern void gic_route_dt_irq(const struct dt_irq *irq, + const cpumask_t *cpu_mask, unsigned int priority); extern void gic_route_ppis(void); extern void gic_route_spis(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:48:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHA-00053t-Qg; Fri, 27 Sep 2013 15:48:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH9-000537-F4 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:15 +0000 Received: from [85.158.143.35:47949] by server-3.bemta-4.messagelabs.com id 07/C5-24907-EB8A5425; Fri, 27 Sep 2013 15:48:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1380296893!2905166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31983 invoked from network); 27 Sep 2013 15:48:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaH6-0000Fu-VO for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaH6-00057Z-Sm for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:12 +0000 Date: Fri, 27 Sep 2013 15:48:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: use cpumask_t to describe cpu mask in gic_route_dt_irq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4e681a59bf2b90acb44044c0f236bce26697e0c Author: Julien Grall AuthorDate: Thu Sep 26 12:09:36 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:45 2013 +0100 xen/arm: use cpumask_t to describe cpu mask in gic_route_dt_irq Replace by cpumask_t to take advantage of cpumask_* helpers. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 20 ++++++++++++-------- xen/arch/arm/time.c | 6 +++--- xen/include/asm-arm/gic.h | 3 ++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index aff57b9..091eb36 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -184,10 +184,14 @@ static hw_irq_controller gic_guest_irq_type = { /* needs to be called with gic.lock held */ static void gic_set_irq_properties(unsigned int irq, bool_t level, - unsigned int cpu_mask, unsigned int priority) + const cpumask_t *cpu_mask, + unsigned int priority) { volatile unsigned char *bytereg; uint32_t cfg, edgebit; + unsigned int mask = cpumask_bits(cpu_mask)[0]; + + ASSERT(!(mask & ~0xff)); /* Target bitmap only support 8 CPUS */ /* Set edge / level */ cfg = GICD[GICD_ICFGR + irq / 16]; @@ -200,7 +204,7 @@ static void gic_set_irq_properties(unsigned int irq, bool_t level, /* Set target CPU mask (RAZ/WI on uniprocessor) */ bytereg = (unsigned char *) (GICD + GICD_ITARGETSR); - bytereg[irq] = cpu_mask; + bytereg[irq] = mask; /* Set priority */ bytereg = (unsigned char *) (GICD + GICD_IPRIORITYR); @@ -210,12 +214,11 @@ static void gic_set_irq_properties(unsigned int irq, bool_t level, /* Program the GIC to route an interrupt */ static int gic_route_irq(unsigned int irq, bool_t level, - unsigned int cpu_mask, unsigned int priority) + const cpumask_t *cpu_mask, unsigned int priority) { struct irq_desc *desc = irq_to_desc(irq); unsigned long flags; - ASSERT(!(cpu_mask & ~0xff)); /* Targets bitmap only supports 8 CPUs */ ASSERT(priority <= 0xff); /* Only 8 bits of priority */ ASSERT(irq < gic.lines); /* Can't route interrupts that don't exist */ @@ -242,7 +245,7 @@ static int gic_route_irq(unsigned int irq, bool_t level, } /* Program the GIC to route an interrupt with a dt_irq */ -void gic_route_dt_irq(const struct dt_irq *irq, unsigned int cpu_mask, +void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, unsigned int priority) { bool_t level; @@ -496,7 +499,7 @@ void gic_disable_cpu(void) void gic_route_ppis(void) { /* GIC maintenance */ - gic_route_dt_irq(&gic.maintenance, 1u << smp_processor_id(), 0xa0); + gic_route_dt_irq(&gic.maintenance, cpumask_of(smp_processor_id()), 0xa0); /* Route timer interrupt */ route_timer_interrupt(); } @@ -511,7 +514,7 @@ void gic_route_spis(void) if ( (irq = serial_dt_irq(seridx)) == NULL ) continue; - gic_route_dt_irq(irq, 1u << smp_processor_id(), 0xa0); + gic_route_dt_irq(irq, cpumask_of(smp_processor_id()), 0xa0); } } @@ -718,7 +721,8 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, level = dt_irq_is_level_triggered(irq); - gic_set_irq_properties(irq->irq, level, 1u << smp_processor_id(), 0xa0); + gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), + 0xa0); retval = __setup_irq(desc, irq->irq, action); if (retval) { diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index eb3ad5c..a30d422 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -222,11 +222,11 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) void __cpuinit route_timer_interrupt(void) { gic_route_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); gic_route_dt_irq(&timer_irq[TIMER_HYP_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); gic_route_dt_irq(&timer_irq[TIMER_VIRT_PPI], - 1u << smp_processor_id(), 0xa0); + cpumask_of(smp_processor_id()), 0xa0); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 2bc4219..0a890be 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -148,7 +148,8 @@ extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt with a dt_irq */ -extern void gic_route_dt_irq(const struct dt_irq *irq, unsigned int cpu_mask, +extern void gic_route_dt_irq(const struct dt_irq *irq, + const cpumask_t *cpu_mask, unsigned int priority); extern void gic_route_ppis(void); extern void gic_route_spis(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:48:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHJ-0005BO-Vn; Fri, 27 Sep 2013 15:48:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHJ-0005Am-I3 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:25 +0000 Received: from [193.109.254.147:41602] by server-4.bemta-14.messagelabs.com id 59/37-05823-8C8A5425; Fri, 27 Sep 2013 15:48:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1380296903!3526221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16599 invoked from network); 27 Sep 2013 15:48:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHH-0000G1-53 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHH-00057z-33 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:23 +0000 Date: Fri, 27 Sep 2013 15:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Initialize correctly IRQ routing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9760939c0cea28c7cbaacd3f893fc6cefc09bef Author: Julien Grall AuthorDate: Thu Sep 26 12:09:37 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:45 2013 +0100 xen/arm: Initialize correctly IRQ routing When Xen initialize the GIC distributor, we need to route all the IRQs to the boot CPU. The CPU ID can differ between Xen and the GIC. When ITARGETSR0 is read, each field will return a value that corresponds only to the processor reading the register. So Xen can use the PPI 0 to initialize correctly the routing. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 091eb36..b969d23 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -258,9 +258,10 @@ void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, static void __init gic_dist_init(void) { uint32_t type; - uint32_t cpumask = 1 << smp_processor_id(); + uint32_t cpumask; int i; + cpumask = GICD[GICD_ITARGETSR] & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHJ-0005BO-Vn; Fri, 27 Sep 2013 15:48:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHJ-0005Am-I3 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:25 +0000 Received: from [193.109.254.147:41602] by server-4.bemta-14.messagelabs.com id 59/37-05823-8C8A5425; Fri, 27 Sep 2013 15:48:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1380296903!3526221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16599 invoked from network); 27 Sep 2013 15:48:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHH-0000G1-53 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHH-00057z-33 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:23 +0000 Date: Fri, 27 Sep 2013 15:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Initialize correctly IRQ routing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9760939c0cea28c7cbaacd3f893fc6cefc09bef Author: Julien Grall AuthorDate: Thu Sep 26 12:09:37 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:45 2013 +0100 xen/arm: Initialize correctly IRQ routing When Xen initialize the GIC distributor, we need to route all the IRQs to the boot CPU. The CPU ID can differ between Xen and the GIC. When ITARGETSR0 is read, each field will return a value that corresponds only to the processor reading the register. So Xen can use the PPI 0 to initialize correctly the routing. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 091eb36..b969d23 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -258,9 +258,10 @@ void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, static void __init gic_dist_init(void) { uint32_t type; - uint32_t cpumask = 1 << smp_processor_id(); + uint32_t cpumask; int i; + cpumask = GICD[GICD_ITARGETSR] & 0xff; cpumask |= cpumask << 8; cpumask |= cpumask << 16; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHV-0005KE-2X; Fri, 27 Sep 2013 15:48:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHU-0005J7-57 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:36 +0000 Received: from [85.158.139.211:28684] by server-10.bemta-5.messagelabs.com id 69/1C-23973-3D8A5425; Fri, 27 Sep 2013 15:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1380296913!5047155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23124 invoked from network); 27 Sep 2013 15:48:34 -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; 27 Sep 2013 15:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHR-0000GC-B4 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHR-00058M-9C for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:33 +0000 Date: Fri, 27 Sep 2013 15:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Use the correct CPU ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1113482036638cb245782631b6d92c2039a7f207 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:38 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:46 2013 +0100 xen/arm: gic: Use the correct CPU ID The GIC mapping of CPU interfaces does not necessarily match the logical CPU numbering. When Xen wants to send an SGI to specific CPU, it needs to use the GIC CPU ID. It can be retrieved from ITARGETSR0, in fact when this field is read, the GIC will return a value that corresponds only to the processor reading the register. So Xen can use the PPI 0 to initialize the mapping. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b969d23..05685cd 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -57,6 +57,31 @@ static DEFINE_PER_CPU(uint64_t, lr_mask); static unsigned nr_lrs; +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static unsigned int gic_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu(cpu, &possible_mask) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + unsigned int gic_number_lines(void) { return gic.lines; @@ -182,16 +207,18 @@ static hw_irq_controller gic_guest_irq_type = { .set_affinity = gic_irq_set_affinity, }; -/* needs to be called with gic.lock held */ +/* + * - needs to be called with gic.lock held + * - needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ static void gic_set_irq_properties(unsigned int irq, bool_t level, const cpumask_t *cpu_mask, unsigned int priority) { volatile unsigned char *bytereg; uint32_t cfg, edgebit; - unsigned int mask = cpumask_bits(cpu_mask)[0]; - - ASSERT(!(mask & ~0xff)); /* Target bitmap only support 8 CPUS */ + unsigned int mask = gic_cpu_mask(cpu_mask); /* Set edge / level */ cfg = GICD[GICD_ICFGR + irq / 16]; @@ -300,6 +327,8 @@ static void __cpuinit gic_cpu_init(void) { int i; + this_cpu(gic_cpu_id) = GICD[GICD_ITARGETSR] & 0xff; + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ @@ -431,13 +460,13 @@ void __init gic_init(void) void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) { - unsigned long mask = cpumask_bits(cpumask)[0]; + unsigned int mask = 0; + cpumask_t online_mask; ASSERT(sgi < 16); /* There are only 16 SGIs */ - mask &= cpumask_bits(&cpu_online_map)[0]; - - ASSERT(mask < 0x100); /* The target bitmap only supports 8 CPUs */ + cpumask_and(&online_mask, cpumask, &cpu_online_map); + mask = gic_cpu_mask(&online_mask); dsb(); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48: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 1VPaHV-0005KE-2X; Fri, 27 Sep 2013 15:48:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHU-0005J7-57 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:36 +0000 Received: from [85.158.139.211:28684] by server-10.bemta-5.messagelabs.com id 69/1C-23973-3D8A5425; Fri, 27 Sep 2013 15:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1380296913!5047155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23124 invoked from network); 27 Sep 2013 15:48:34 -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; 27 Sep 2013 15:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHR-0000GC-B4 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHR-00058M-9C for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:33 +0000 Date: Fri, 27 Sep 2013 15:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Use the correct CPU ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1113482036638cb245782631b6d92c2039a7f207 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:38 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:46 2013 +0100 xen/arm: gic: Use the correct CPU ID The GIC mapping of CPU interfaces does not necessarily match the logical CPU numbering. When Xen wants to send an SGI to specific CPU, it needs to use the GIC CPU ID. It can be retrieved from ITARGETSR0, in fact when this field is read, the GIC will return a value that corresponds only to the processor reading the register. So Xen can use the PPI 0 to initialize the mapping. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index b969d23..05685cd 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -57,6 +57,31 @@ static DEFINE_PER_CPU(uint64_t, lr_mask); static unsigned nr_lrs; +/* The GIC mapping of CPU interfaces does not necessarily match the + * logical CPU numbering. Let's use mapping as returned by the GIC + * itself + */ +static DEFINE_PER_CPU(u8, gic_cpu_id); + +/* Maximum cpu interface per GIC */ +#define NR_GIC_CPU_IF 8 + +static unsigned int gic_cpu_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + unsigned int mask = 0; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + for_each_cpu(cpu, &possible_mask) + { + ASSERT(cpu < NR_GIC_CPU_IF); + mask |= per_cpu(gic_cpu_id, cpu); + } + + return mask; +} + unsigned int gic_number_lines(void) { return gic.lines; @@ -182,16 +207,18 @@ static hw_irq_controller gic_guest_irq_type = { .set_affinity = gic_irq_set_affinity, }; -/* needs to be called with gic.lock held */ +/* + * - needs to be called with gic.lock held + * - needs to be called with a valid cpu_mask, ie each cpu in the mask has + * already called gic_cpu_init + */ static void gic_set_irq_properties(unsigned int irq, bool_t level, const cpumask_t *cpu_mask, unsigned int priority) { volatile unsigned char *bytereg; uint32_t cfg, edgebit; - unsigned int mask = cpumask_bits(cpu_mask)[0]; - - ASSERT(!(mask & ~0xff)); /* Target bitmap only support 8 CPUS */ + unsigned int mask = gic_cpu_mask(cpu_mask); /* Set edge / level */ cfg = GICD[GICD_ICFGR + irq / 16]; @@ -300,6 +327,8 @@ static void __cpuinit gic_cpu_init(void) { int i; + this_cpu(gic_cpu_id) = GICD[GICD_ITARGETSR] & 0xff; + /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ @@ -431,13 +460,13 @@ void __init gic_init(void) void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) { - unsigned long mask = cpumask_bits(cpumask)[0]; + unsigned int mask = 0; + cpumask_t online_mask; ASSERT(sgi < 16); /* There are only 16 SGIs */ - mask &= cpumask_bits(&cpu_online_map)[0]; - - ASSERT(mask < 0x100); /* The target bitmap only supports 8 CPUs */ + cpumask_and(&online_mask, cpumask, &cpu_online_map); + mask = gic_cpu_mask(&online_mask); dsb(); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHf-0005Mw-5k; Fri, 27 Sep 2013 15:48:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHe-0005Mk-KU for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:46 +0000 Received: from [85.158.143.35:52571] by server-2.bemta-4.messagelabs.com id 03/A3-31802-DD8A5425; Fri, 27 Sep 2013 15:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1380296924!7261802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29212 invoked from network); 27 Sep 2013 15:48:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHc-0000GI-Ep for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHc-00058q-C6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:44 +0000 Date: Fri, 27 Sep 2013 15:48:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix assert in send_SGI_one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a22a8e48eee4d1157eeef2b9c1b81ef9124dda4e Author: Julien Grall AuthorDate: Thu Sep 26 12:09:39 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Fix assert in send_SGI_one The GIC can handle maximum 8 cpus (0...7). The CPU id 7 is still valid. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 05685cd..74575cd 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -477,7 +477,7 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) void send_SGI_one(unsigned int cpu, enum gic_sgi sgi) { - ASSERT(cpu < 7); /* Targets bitmap only supports 8 CPUs */ + ASSERT(cpu < NR_GIC_CPU_IF); /* Targets bitmap only supports 8 CPUs */ send_SGI_mask(cpumask_of(cpu), sgi); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:48:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:48:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHf-0005Mw-5k; Fri, 27 Sep 2013 15:48:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHe-0005Mk-KU for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:46 +0000 Received: from [85.158.143.35:52571] by server-2.bemta-4.messagelabs.com id 03/A3-31802-DD8A5425; Fri, 27 Sep 2013 15:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1380296924!7261802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29212 invoked from network); 27 Sep 2013 15:48:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:48:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHc-0000GI-Ep for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHc-00058q-C6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:44 +0000 Date: Fri, 27 Sep 2013 15:48:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix assert in send_SGI_one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a22a8e48eee4d1157eeef2b9c1b81ef9124dda4e Author: Julien Grall AuthorDate: Thu Sep 26 12:09:39 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Fix assert in send_SGI_one The GIC can handle maximum 8 cpus (0...7). The CPU id 7 is still valid. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 05685cd..74575cd 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -477,7 +477,7 @@ void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) void send_SGI_one(unsigned int cpu, enum gic_sgi sgi) { - ASSERT(cpu < 7); /* Targets bitmap only supports 8 CPUs */ + ASSERT(cpu < NR_GIC_CPU_IF); /* Targets bitmap only supports 8 CPUs */ send_SGI_mask(cpumask_of(cpu), sgi); } -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHs-0005Qd-8j; Fri, 27 Sep 2013 15:49:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHr-0005QF-18 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:59 +0000 Received: from [193.109.254.147:44868] by server-12.bemta-14.messagelabs.com id 55/8E-27329-AE8A5425; Fri, 27 Sep 2013 15:48:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1380296934!3755057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11831 invoked from network); 27 Sep 2013 15:48:55 -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; 27 Sep 2013 15:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHm-0000GR-MQ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHm-00059C-JJ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:54 +0000 Date: Fri, 27 Sep 2013 15:48:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Dissociate logical and hardware CPU ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff9b41bb347b08114dd89cdc8e45bfc1d1b12511 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:40 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Dissociate logical and hardware CPU ID Introduce cpu_logical_map to associate a logical CPU ID to an hardware CPU ID. This map will be filled during Xen boot via the device tree. Each CPU node contains a "reg" property which contains the hardware ID (ie MPIDR[0:23]). Also move /cpus parsing later so we can use the dt_* API. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 112 ++++++++++++++++++++++++++++++++++++++- xen/arch/arm/smpboot.c | 4 ++ xen/common/device_tree.c | 48 ----------------- xen/include/asm-arm/processor.h | 4 ++ 4 files changed, 119 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 62147b2..1d0b5e9 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -498,6 +498,114 @@ void __init setup_cache(void) cacheline_bytes = 1U << (4 + (ccsid & 0x7)); } +/* Parse the device tree and build the logical map array containing + * MPIDR values related to logical cpus + * Code base on Linux arch/arm/kernel/devtree.c + */ +static void __init init_cpus_maps(void) +{ + register_t mpidr; + struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + struct dt_device_node *cpu; + unsigned int i, j; + unsigned int cpuidx = 1; + static u32 tmp_map[NR_CPUS] __initdata = + { + [0 ... NR_CPUS - 1] = MPIDR_INVALID + }; + bool_t bootcpu_valid = 0; + + mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; + + if ( !cpus ) + { + printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" + "Using only 1 CPU\n"); + return; + } + + dt_for_each_child_node( cpus, cpu ) + { + u32 hwid; + + if ( !dt_device_type_is_equal(cpu, "cpu") ) + continue; + + if ( !dt_property_read_u32(cpu, "reg", &hwid) ) + { + printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", + dt_node_full_name(cpu)); + continue; + } + + /* + * 8 MSBs must be set to 0 in the DT since the reg property + * defines the MPIDR[23:0] + */ + if ( hwid & ~MPIDR_HWID_MASK ) + { + printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", + dt_node_full_name(cpu), hwid); + continue; + } + + /* + * Duplicate MPIDRs are a recipe for disaster. Scan all initialized + * entries and check for duplicates. If any found just skip the node. + * temp values values are initialized to MPIDR_INVALID to avoid + * matching valid MPIDR[23:0] values. + */ + for ( j = 0; j < cpuidx; j++ ) + { + if ( tmp_map[j] == hwid ) + { + printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", + dt_node_full_name(cpu)); + continue; + } + } + + /* + * Build a stashed array of MPIDR values. Numbering scheme requires + * that if detected the boot CPU must be assigned logical id 0. Other + * CPUs get sequential indexes starting from 1. If a CPU node + * with a reg property matching the boot CPU MPIDR is detected, + * this is recorded and so that the logical map build from DT is + * validated and can be used to set the map. + */ + if ( hwid == mpidr ) + { + i = 0; + bootcpu_valid = 1; + } + else + i = cpuidx++; + + if ( cpuidx > NR_CPUS ) + { + printk(XENLOG_WARNING "DT /cpu %u node greater than max cores %u, capping them\n", + cpuidx, NR_CPUS); + cpuidx = NR_CPUS; + break; + } + + tmp_map[i] = hwid; + } + + if ( !bootcpu_valid ) + { + printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" + "Using only 1 CPU\n"); + return; + } + + for ( i = 0; i < cpuidx; i++ ) + { + cpumask_set_cpu(i, &cpu_possible_map); + cpu_logical_map(i) = tmp_map[i]; + } +} + /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, unsigned long fdt_paddr, @@ -517,7 +625,6 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened); - cpus = smp_get_max_cpus(); cmdline_parse(device_tree_bootargs(device_tree_flattened)); setup_pagetables(boot_phys_offset, get_xen_paddr()); @@ -534,6 +641,9 @@ void __init start_xen(unsigned long boot_phys_offset, processor_id(); + init_cpus_maps(); + cpus = smp_get_max_cpus(); + platform_init(); init_xen_time(); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 945f473..8ea4750 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -39,6 +39,9 @@ EXPORT_SYMBOL(cpu_possible_map); struct cpuinfo_arm cpu_data[NR_CPUS]; +/* CPU logical map: map xen cpuid to an MPIDR */ +u32 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID }; + /* Fake one node for now. See also include/asm-arm/numa.h */ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; @@ -85,6 +88,7 @@ smp_clear_cpu_maps (void) cpumask_clear(&cpu_online_map); cpumask_set_cpu(0, &cpu_online_map); cpumask_set_cpu(0, &cpu_possible_map); + cpu_logical_map(0) = READ_SYSREG(MPIDR_EL1) & MPIDR_HWID_MASK; } int __init diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 0ece249..9a16650 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -118,18 +118,6 @@ static bool_t __init device_tree_node_matches(const void *fdt, int node, && (name[match_len] == '@' || name[match_len] == '\0'); } -static bool_t __init device_tree_type_matches(const void *fdt, int node, - const char *match) -{ - const void *prop; - - prop = fdt_getprop(fdt, node, "device_type", NULL); - if ( prop == NULL ) - return 0; - - return !dt_node_cmp(prop, match); -} - static bool_t __init device_tree_node_compatible(const void *fdt, int node, const char *match) { @@ -348,40 +336,6 @@ static void __init process_memory_node(const void *fdt, int node, } } -static void __init process_cpu_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - u32 cpuid; - int len; - - prop = fdt_get_property(fdt, node, "reg", &len); - if ( !prop ) - { - early_printk("fdt: node `%s': missing `reg' property\n", name); - return; - } - - if ( len < sizeof (cpuid) ) - { - dt_printk("fdt: node `%s': `reg` property length is too short\n", - name); - return; - } - - cpuid = dt_read_number((const __be32 *)prop->data, 1); - - /* TODO: handle non-contiguous CPU ID */ - if ( cpuid >= NR_CPUS ) - { - dt_printk("fdt: node `%s': reg(0x%x) >= NR_CPUS(%d)\n", - name, cpuid, NR_CPUS); - return; - } - cpumask_set_cpu(cpuid, &cpu_possible_map); -} - static void __init process_multiboot_node(const void *fdt, int node, const char *name, u32 address_cells, u32 size_cells) @@ -435,8 +389,6 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_type_matches(fdt, node, "cpu") ) - process_cpu_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); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 808567e..0646422 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -13,6 +13,7 @@ #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) #define MPIDR_HWID_MASK 0xffffff +#define MPIDR_INVALID (~MPIDR_HWID_MASK) /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 @@ -230,6 +231,9 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] +extern u32 __cpu_logical_map[]; +#define cpu_logical_map(cpu) __cpu_logical_map[cpu] + union hsr { uint32_t bits; struct { -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHs-0005Qd-8j; Fri, 27 Sep 2013 15:49:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHr-0005QF-18 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:59 +0000 Received: from [193.109.254.147:44868] by server-12.bemta-14.messagelabs.com id 55/8E-27329-AE8A5425; Fri, 27 Sep 2013 15:48:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1380296934!3755057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11831 invoked from network); 27 Sep 2013 15:48:55 -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; 27 Sep 2013 15:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHm-0000GR-MQ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHm-00059C-JJ for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:48:54 +0000 Date: Fri, 27 Sep 2013 15:48:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Dissociate logical and hardware CPU ID X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff9b41bb347b08114dd89cdc8e45bfc1d1b12511 Author: Julien Grall AuthorDate: Thu Sep 26 12:09:40 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Dissociate logical and hardware CPU ID Introduce cpu_logical_map to associate a logical CPU ID to an hardware CPU ID. This map will be filled during Xen boot via the device tree. Each CPU node contains a "reg" property which contains the hardware ID (ie MPIDR[0:23]). Also move /cpus parsing later so we can use the dt_* API. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 112 ++++++++++++++++++++++++++++++++++++++- xen/arch/arm/smpboot.c | 4 ++ xen/common/device_tree.c | 48 ----------------- xen/include/asm-arm/processor.h | 4 ++ 4 files changed, 119 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 62147b2..1d0b5e9 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -498,6 +498,114 @@ void __init setup_cache(void) cacheline_bytes = 1U << (4 + (ccsid & 0x7)); } +/* Parse the device tree and build the logical map array containing + * MPIDR values related to logical cpus + * Code base on Linux arch/arm/kernel/devtree.c + */ +static void __init init_cpus_maps(void) +{ + register_t mpidr; + struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + struct dt_device_node *cpu; + unsigned int i, j; + unsigned int cpuidx = 1; + static u32 tmp_map[NR_CPUS] __initdata = + { + [0 ... NR_CPUS - 1] = MPIDR_INVALID + }; + bool_t bootcpu_valid = 0; + + mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; + + if ( !cpus ) + { + printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" + "Using only 1 CPU\n"); + return; + } + + dt_for_each_child_node( cpus, cpu ) + { + u32 hwid; + + if ( !dt_device_type_is_equal(cpu, "cpu") ) + continue; + + if ( !dt_property_read_u32(cpu, "reg", &hwid) ) + { + printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", + dt_node_full_name(cpu)); + continue; + } + + /* + * 8 MSBs must be set to 0 in the DT since the reg property + * defines the MPIDR[23:0] + */ + if ( hwid & ~MPIDR_HWID_MASK ) + { + printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", + dt_node_full_name(cpu), hwid); + continue; + } + + /* + * Duplicate MPIDRs are a recipe for disaster. Scan all initialized + * entries and check for duplicates. If any found just skip the node. + * temp values values are initialized to MPIDR_INVALID to avoid + * matching valid MPIDR[23:0] values. + */ + for ( j = 0; j < cpuidx; j++ ) + { + if ( tmp_map[j] == hwid ) + { + printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", + dt_node_full_name(cpu)); + continue; + } + } + + /* + * Build a stashed array of MPIDR values. Numbering scheme requires + * that if detected the boot CPU must be assigned logical id 0. Other + * CPUs get sequential indexes starting from 1. If a CPU node + * with a reg property matching the boot CPU MPIDR is detected, + * this is recorded and so that the logical map build from DT is + * validated and can be used to set the map. + */ + if ( hwid == mpidr ) + { + i = 0; + bootcpu_valid = 1; + } + else + i = cpuidx++; + + if ( cpuidx > NR_CPUS ) + { + printk(XENLOG_WARNING "DT /cpu %u node greater than max cores %u, capping them\n", + cpuidx, NR_CPUS); + cpuidx = NR_CPUS; + break; + } + + tmp_map[i] = hwid; + } + + if ( !bootcpu_valid ) + { + printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" + "Using only 1 CPU\n"); + return; + } + + for ( i = 0; i < cpuidx; i++ ) + { + cpumask_set_cpu(i, &cpu_possible_map); + cpu_logical_map(i) = tmp_map[i]; + } +} + /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, unsigned long fdt_paddr, @@ -517,7 +625,6 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened); - cpus = smp_get_max_cpus(); cmdline_parse(device_tree_bootargs(device_tree_flattened)); setup_pagetables(boot_phys_offset, get_xen_paddr()); @@ -534,6 +641,9 @@ void __init start_xen(unsigned long boot_phys_offset, processor_id(); + init_cpus_maps(); + cpus = smp_get_max_cpus(); + platform_init(); init_xen_time(); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 945f473..8ea4750 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -39,6 +39,9 @@ EXPORT_SYMBOL(cpu_possible_map); struct cpuinfo_arm cpu_data[NR_CPUS]; +/* CPU logical map: map xen cpuid to an MPIDR */ +u32 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID }; + /* Fake one node for now. See also include/asm-arm/numa.h */ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; @@ -85,6 +88,7 @@ smp_clear_cpu_maps (void) cpumask_clear(&cpu_online_map); cpumask_set_cpu(0, &cpu_online_map); cpumask_set_cpu(0, &cpu_possible_map); + cpu_logical_map(0) = READ_SYSREG(MPIDR_EL1) & MPIDR_HWID_MASK; } int __init diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 0ece249..9a16650 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -118,18 +118,6 @@ static bool_t __init device_tree_node_matches(const void *fdt, int node, && (name[match_len] == '@' || name[match_len] == '\0'); } -static bool_t __init device_tree_type_matches(const void *fdt, int node, - const char *match) -{ - const void *prop; - - prop = fdt_getprop(fdt, node, "device_type", NULL); - if ( prop == NULL ) - return 0; - - return !dt_node_cmp(prop, match); -} - static bool_t __init device_tree_node_compatible(const void *fdt, int node, const char *match) { @@ -348,40 +336,6 @@ static void __init process_memory_node(const void *fdt, int node, } } -static void __init process_cpu_node(const void *fdt, int node, - const char *name, - u32 address_cells, u32 size_cells) -{ - const struct fdt_property *prop; - u32 cpuid; - int len; - - prop = fdt_get_property(fdt, node, "reg", &len); - if ( !prop ) - { - early_printk("fdt: node `%s': missing `reg' property\n", name); - return; - } - - if ( len < sizeof (cpuid) ) - { - dt_printk("fdt: node `%s': `reg` property length is too short\n", - name); - return; - } - - cpuid = dt_read_number((const __be32 *)prop->data, 1); - - /* TODO: handle non-contiguous CPU ID */ - if ( cpuid >= NR_CPUS ) - { - dt_printk("fdt: node `%s': reg(0x%x) >= NR_CPUS(%d)\n", - name, cpuid, NR_CPUS); - return; - } - cpumask_set_cpu(cpuid, &cpu_possible_map); -} - static void __init process_multiboot_node(const void *fdt, int node, const char *name, u32 address_cells, u32 size_cells) @@ -435,8 +389,6 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_type_matches(fdt, node, "cpu") ) - process_cpu_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); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 808567e..0646422 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -13,6 +13,7 @@ #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) #define MPIDR_HWID_MASK 0xffffff +#define MPIDR_INVALID (~MPIDR_HWID_MASK) /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 @@ -230,6 +231,9 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] +extern u32 __cpu_logical_map[]; +#define cpu_logical_map(cpu) __cpu_logical_map[cpu] + union hsr { uint32_t bits; struct { -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI2-0005TC-CC; Fri, 27 Sep 2013 15:49:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI0-0005SS-SM for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:09 +0000 Received: from [85.158.137.68:12311] by server-3.bemta-3.messagelabs.com id 37/75-11625-4F8A5425; Fri, 27 Sep 2013 15:49:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1380296946!5198988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11168 invoked from network); 27 Sep 2013 15:49:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHy-0000Gz-2M for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHx-00059i-Q1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:06 +0000 Date: Fri, 27 Sep 2013 15:49:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Use the hardware ID to boot correctly secondary cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b8684682785531f8a347c476357eaececc2526c Author: Julien Grall AuthorDate: Thu Sep 26 12:09:41 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Use the hardware ID to boot correctly secondary cpus Secondary CPUs will spin in head.S until their MPIDR[23:0] correspond to the smp_up_cpu. Actually Xen will set the value with the logical CPU ID which is wrong. Use the cpu_logical_map to get the correct CPU ID. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/smpboot.c | 13 ++++++++----- xen/include/asm-arm/init.h | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 8ea4750..234748e 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -127,8 +127,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) for ( i = 1; i < max_cpus; i++ ) { /* Tell the next CPU to get ready */ - /* TODO: handle boards where CPUIDs are not contiguous */ - *gate = i; + *gate = cpu_logical_map(i); flush_xen_dcache(*gate); isb(); sev(); @@ -142,11 +141,12 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, unsigned long fdt_paddr, - unsigned long cpuid) + unsigned long hwid) { + unsigned int cpuid = init_data.cpuid; + memset(get_cpu_info(), 0, sizeof (struct cpu_info)); - /* TODO: handle boards where CPUIDs are not contiguous */ set_processor_id(cpuid); current_cpu_data = boot_cpu_data; @@ -233,9 +233,12 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU which stack to boot on. */ init_data.stack = idle_vcpu[cpu]->arch.stack; + /* Tell the remote CPU what is it's logical CPU ID */ + init_data.cpuid = cpu; + /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ - smp_up_cpu = cpu; + smp_up_cpu = cpu_logical_map(cpu); /* we need to make sure that the change to smp_up_cpu is visible to * secondary cpus with D-cache off */ flush_xen_dcache(smp_up_cpu); diff --git a/xen/include/asm-arm/init.h b/xen/include/asm-arm/init.h index 7a07136..5ac8cf8 100644 --- a/xen/include/asm-arm/init.h +++ b/xen/include/asm-arm/init.h @@ -5,6 +5,8 @@ struct init_info { /* Pointer to the stack, used by head.S when entering in C */ unsigned char *stack; + /* Logical CPU ID, used by start_secondary */ + unsigned int cpuid; }; #endif /* _XEN_ASM_INIT_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:49:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI2-0005TC-CC; Fri, 27 Sep 2013 15:49:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI0-0005SS-SM for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:09 +0000 Received: from [85.158.137.68:12311] by server-3.bemta-3.messagelabs.com id 37/75-11625-4F8A5425; Fri, 27 Sep 2013 15:49:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1380296946!5198988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11168 invoked from network); 27 Sep 2013 15:49:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaHy-0000Gz-2M for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaHx-00059i-Q1 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:06 +0000 Date: Fri, 27 Sep 2013 15:49:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Use the hardware ID to boot correctly secondary cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b8684682785531f8a347c476357eaececc2526c Author: Julien Grall AuthorDate: Thu Sep 26 12:09:41 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:44:58 2013 +0100 xen/arm: Use the hardware ID to boot correctly secondary cpus Secondary CPUs will spin in head.S until their MPIDR[23:0] correspond to the smp_up_cpu. Actually Xen will set the value with the logical CPU ID which is wrong. Use the cpu_logical_map to get the correct CPU ID. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/smpboot.c | 13 ++++++++----- xen/include/asm-arm/init.h | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 8ea4750..234748e 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -127,8 +127,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) for ( i = 1; i < max_cpus; i++ ) { /* Tell the next CPU to get ready */ - /* TODO: handle boards where CPUIDs are not contiguous */ - *gate = i; + *gate = cpu_logical_map(i); flush_xen_dcache(*gate); isb(); sev(); @@ -142,11 +141,12 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, unsigned long fdt_paddr, - unsigned long cpuid) + unsigned long hwid) { + unsigned int cpuid = init_data.cpuid; + memset(get_cpu_info(), 0, sizeof (struct cpu_info)); - /* TODO: handle boards where CPUIDs are not contiguous */ set_processor_id(cpuid); current_cpu_data = boot_cpu_data; @@ -233,9 +233,12 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU which stack to boot on. */ init_data.stack = idle_vcpu[cpu]->arch.stack; + /* Tell the remote CPU what is it's logical CPU ID */ + init_data.cpuid = cpu; + /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ - smp_up_cpu = cpu; + smp_up_cpu = cpu_logical_map(cpu); /* we need to make sure that the change to smp_up_cpu is visible to * secondary cpus with D-cache off */ flush_xen_dcache(smp_up_cpu); diff --git a/xen/include/asm-arm/init.h b/xen/include/asm-arm/init.h index 7a07136..5ac8cf8 100644 --- a/xen/include/asm-arm/init.h +++ b/xen/include/asm-arm/init.h @@ -5,6 +5,8 @@ struct init_info { /* Pointer to the stack, used by head.S when entering in C */ unsigned char *stack; + /* Logical CPU ID, used by start_secondary */ + unsigned int cpuid; }; #endif /* _XEN_ASM_INIT_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:49:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIB-0005WM-FJ; Fri, 27 Sep 2013 15:49:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIA-0005W8-Lo for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:18 +0000 Received: from [193.109.254.147:52012] by server-14.bemta-14.messagelabs.com id 16/14-07546-DF8A5425; Fri, 27 Sep 2013 15:49:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296956!1595953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14930 invoked from network); 27 Sep 2013 15:49:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI8-0000H5-As for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaI8-0005Ai-6M for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:16 +0000 Date: Fri, 27 Sep 2013 15:49:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix syntax error in xl.cfg.pod X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f69f8bf8b9c9a293a100e63e0cbe882c97ed6b0 Author: Olaf Hering AuthorDate: Wed Sep 25 23:10:09 2013 +0200 Commit: Ian Campbell CommitDate: Thu Sep 26 15:46:04 2013 +0100 docs: fix syntax error in xl.cfg.pod man/xl.cfg.pod.5 around line 1193: '=item' outside of any '=over' POD document had syntax errors at /usr/bin/pod2man line 71. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 769767b..d57cd4d 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1188,8 +1188,6 @@ The form usbdevice=DEVICE is also accepted for backwards compatibility. More valid options can be found in the "usbdevice" section of the qemu documentation. -=back - =item B Selects which variant of the QEMU xen-pvdevice should be used for this -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIB-0005WM-FJ; Fri, 27 Sep 2013 15:49:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIA-0005W8-Lo for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:18 +0000 Received: from [193.109.254.147:52012] by server-14.bemta-14.messagelabs.com id 16/14-07546-DF8A5425; Fri, 27 Sep 2013 15:49:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296956!1595953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14930 invoked from network); 27 Sep 2013 15:49:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaI8-0000H5-As for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaI8-0005Ai-6M for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:16 +0000 Date: Fri, 27 Sep 2013 15:49:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix syntax error in xl.cfg.pod X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f69f8bf8b9c9a293a100e63e0cbe882c97ed6b0 Author: Olaf Hering AuthorDate: Wed Sep 25 23:10:09 2013 +0200 Commit: Ian Campbell CommitDate: Thu Sep 26 15:46:04 2013 +0100 docs: fix syntax error in xl.cfg.pod man/xl.cfg.pod.5 around line 1193: '=item' outside of any '=over' POD document had syntax errors at /usr/bin/pod2man line 71. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 769767b..d57cd4d 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1188,8 +1188,6 @@ The form usbdevice=DEVICE is also accepted for backwards compatibility. More valid options can be found in the "usbdevice" section of the qemu documentation. -=back - =item B Selects which variant of the QEMU xen-pvdevice should be used for this -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIM-0005Yf-Ke; Fri, 27 Sep 2013 15:49:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIK-0005YH-UE for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:29 +0000 Received: from [193.109.254.147:42089] by server-9.bemta-14.messagelabs.com id 47/89-30026-809A5425; Fri, 27 Sep 2013 15:49:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1380296966!2018256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11951 invoked from network); 27 Sep 2013 15:49:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaII-0000HF-Il for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaII-0005BC-FA for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:26 +0000 Date: Fri, 27 Sep 2013 15:49:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle new 64-bit zImage magic numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53059bda06c14a8fb559e4b6c42de2c9dd9ce3f8 Author: Ian Campbell AuthorDate: Wed Sep 25 12:21:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:46:40 2013 +0100 xen: arm: handle new 64-bit zImage magic numbers Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended up changing the zImage magic (which was actually the initial branch instruction encoding!). The new header has a proper magic number at a fixed location. Support that as well as the original magic. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/kernel.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7a91d60..6d2c164 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -27,7 +27,8 @@ #define ZIMAGE32_MAGIC 0x016f2818 -#define ZIMAGE64_MAGIC 0x14000008 +#define ZIMAGE64_MAGIC_V0 0x14000008 +#define ZIMAGE64_MAGIC_V1 0x644d5241 /* "ARM\x64" */ struct minimal_dtb_header { uint32_t magic; @@ -126,11 +127,16 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, { /* linux/Documentation/arm64/booting.txt */ struct { - uint32_t magic; + uint32_t magic0; uint32_t res0; uint64_t text_offset; /* Image load offset */ uint64_t res1; uint64_t res2; + uint64_t res3; + uint64_t res4; + uint64_t res5; + uint32_t magic1; + uint32_t res6; } zimage; uint64_t start, end; @@ -139,7 +145,8 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, copy_from_paddr(&zimage, addr, sizeof(zimage), DEV_SHARED); - if (zimage.magic != ZIMAGE64_MAGIC) + if ( zimage.magic0 != ZIMAGE64_MAGIC_V0 && + zimage.magic1 != ZIMAGE64_MAGIC_V1 ) return -EINVAL; /* Currently there is no length in the header, so just use the size */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:49:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIM-0005Yf-Ke; Fri, 27 Sep 2013 15:49:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIK-0005YH-UE for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:29 +0000 Received: from [193.109.254.147:42089] by server-9.bemta-14.messagelabs.com id 47/89-30026-809A5425; Fri, 27 Sep 2013 15:49:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1380296966!2018256!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11951 invoked from network); 27 Sep 2013 15:49:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaII-0000HF-Il for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaII-0005BC-FA for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:26 +0000 Date: Fri, 27 Sep 2013 15:49:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle new 64-bit zImage magic numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53059bda06c14a8fb559e4b6c42de2c9dd9ce3f8 Author: Ian Campbell AuthorDate: Wed Sep 25 12:21:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:46:40 2013 +0100 xen: arm: handle new 64-bit zImage magic numbers Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended up changing the zImage magic (which was actually the initial branch instruction encoding!). The new header has a proper magic number at a fixed location. Support that as well as the original magic. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/kernel.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7a91d60..6d2c164 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -27,7 +27,8 @@ #define ZIMAGE32_MAGIC 0x016f2818 -#define ZIMAGE64_MAGIC 0x14000008 +#define ZIMAGE64_MAGIC_V0 0x14000008 +#define ZIMAGE64_MAGIC_V1 0x644d5241 /* "ARM\x64" */ struct minimal_dtb_header { uint32_t magic; @@ -126,11 +127,16 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, { /* linux/Documentation/arm64/booting.txt */ struct { - uint32_t magic; + uint32_t magic0; uint32_t res0; uint64_t text_offset; /* Image load offset */ uint64_t res1; uint64_t res2; + uint64_t res3; + uint64_t res4; + uint64_t res5; + uint32_t magic1; + uint32_t res6; } zimage; uint64_t start, end; @@ -139,7 +145,8 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, copy_from_paddr(&zimage, addr, sizeof(zimage), DEV_SHARED); - if (zimage.magic != ZIMAGE64_MAGIC) + if ( zimage.magic0 != ZIMAGE64_MAGIC_V0 && + zimage.magic1 != ZIMAGE64_MAGIC_V1 ) return -EINVAL; /* Currently there is no length in the header, so just use the size */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:49:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIX-0005av-O6; Fri, 27 Sep 2013 15:49:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIW-0005aH-Kv for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:40 +0000 Received: from [193.109.254.147:42677] by server-14.bemta-14.messagelabs.com id 74/84-07546-219A5425; Fri, 27 Sep 2013 15:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296977!1596029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16940 invoked from network); 27 Sep 2013 15:49:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIS-0000HN-Vc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIS-0005Bc-ML for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:36 +0000 Date: Fri, 27 Sep 2013 15:49:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use new 64-bit zImage magic numbers for Xen binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 856107eca87d85c7138ca01eeefd8e6402f7ecb4 Author: Ian Campbell AuthorDate: Wed Sep 25 12:21:51 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:47:17 2013 +0100 xen: arm: use new 64-bit zImage magic numbers for Xen binary Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended up changing the zImage magic (which was actually the initial branch instructio encoding!). The new header has a proper magic number at a fixed location. Switch Xen itself to using this format. Neither the bootwrapper nor the models care about this header themselves and real bootloaders are not widely used, so now is as good a time as any to switch (as upstream have proven) Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm64/head.S | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index e0831b6..4495f72 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -73,6 +73,14 @@ start: .quad 0 /* Image load offset from start of RAM */ .quad 0 /* reserved */ .quad 0 /* reserved */ + .quad 0 /* reserved */ + .quad 0 /* reserved */ + .quad 0 /* reserved */ + .byte 0x41 /* Magic number, "ARM\x64" */ + .byte 0x52 + .byte 0x4d + .byte 0x64 + .word 0 /* reserved */ real_start: msr DAIFSet, 0xf /* Disable all interrupts */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIX-0005av-O6; Fri, 27 Sep 2013 15:49:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIW-0005aH-Kv for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:40 +0000 Received: from [193.109.254.147:42677] by server-14.bemta-14.messagelabs.com id 74/84-07546-219A5425; Fri, 27 Sep 2013 15:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296977!1596029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16940 invoked from network); 27 Sep 2013 15:49:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIS-0000HN-Vc for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIS-0005Bc-ML for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:36 +0000 Date: Fri, 27 Sep 2013 15:49:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use new 64-bit zImage magic numbers for Xen binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 856107eca87d85c7138ca01eeefd8e6402f7ecb4 Author: Ian Campbell AuthorDate: Wed Sep 25 12:21:51 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 15:47:17 2013 +0100 xen: arm: use new 64-bit zImage magic numbers for Xen binary Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended up changing the zImage magic (which was actually the initial branch instructio encoding!). The new header has a proper magic number at a fixed location. Switch Xen itself to using this format. Neither the bootwrapper nor the models care about this header themselves and real bootloaders are not widely used, so now is as good a time as any to switch (as upstream have proven) Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm64/head.S | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index e0831b6..4495f72 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -73,6 +73,14 @@ start: .quad 0 /* Image load offset from start of RAM */ .quad 0 /* reserved */ .quad 0 /* reserved */ + .quad 0 /* reserved */ + .quad 0 /* reserved */ + .quad 0 /* reserved */ + .byte 0x41 /* Magic number, "ARM\x64" */ + .byte 0x52 + .byte 0x4d + .byte 0x64 + .word 0 /* reserved */ real_start: msr DAIFSet, 0xf /* Disable all interrupts */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIg-0005cm-RC; Fri, 27 Sep 2013 15:49:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIf-0005cV-D6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:49 +0000 Received: from [193.109.254.147:59940] by server-12.bemta-14.messagelabs.com id A4/9F-27329-C19A5425; Fri, 27 Sep 2013 15:49:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380296987!1541761!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26388 invoked from network); 27 Sep 2013 15:49:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaId-0000HT-5L for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaId-0005C1-3T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:47 +0000 Date: Fri, 27 Sep 2013 15:49:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't dump stack when the VCPU is offline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f042e3280babbe66884371eee18bd0f38b016a8e Author: Julien Grall AuthorDate: Wed Sep 25 13:12:47 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:18:41 2013 +0100 xen/arm: Don't dump stack when the VCPU is offline When a VCPU is not yet online, the registers contain garbagge. This will result to call randomly BUG() in show_guest_stack. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 0e9a141..4c0fc32 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -612,6 +612,12 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) void *mapped; unsigned long *stack, addr; + if ( test_bit(_VPF_down, &v->pause_flags) ) + { + printk("No stack trace, VCPU offline\n"); + return; + } + switch ( regs->cpsr & PSR_MODE_MASK ) { case PSR_MODE_USR: -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:49:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:49: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 1VPaIg-0005cm-RC; Fri, 27 Sep 2013 15:49:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIf-0005cV-D6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:49 +0000 Received: from [193.109.254.147:59940] by server-12.bemta-14.messagelabs.com id A4/9F-27329-C19A5425; Fri, 27 Sep 2013 15:49:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380296987!1541761!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26388 invoked from network); 27 Sep 2013 15:49:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:49:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaId-0000HT-5L for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaId-0005C1-3T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:47 +0000 Date: Fri, 27 Sep 2013 15:49:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Don't dump stack when the VCPU is offline X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f042e3280babbe66884371eee18bd0f38b016a8e Author: Julien Grall AuthorDate: Wed Sep 25 13:12:47 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:18:41 2013 +0100 xen/arm: Don't dump stack when the VCPU is offline When a VCPU is not yet online, the registers contain garbagge. This will result to call randomly BUG() in show_guest_stack. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 0e9a141..4c0fc32 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -612,6 +612,12 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) void *mapped; unsigned long *stack, addr; + if ( test_bit(_VPF_down, &v->pause_flags) ) + { + printk("No stack trace, VCPU offline\n"); + return; + } + switch ( regs->cpsr & PSR_MODE_MASK ) { case PSR_MODE_USR: -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaIq-0005ei-UD; Fri, 27 Sep 2013 15:50:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIp-0005eS-Kh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:59 +0000 Received: from [193.109.254.147:60543] by server-10.bemta-14.messagelabs.com id 07/87-26557-729A5425; Fri, 27 Sep 2013 15:49:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296997!1596100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18859 invoked from network); 27 Sep 2013 15:49:58 -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; 27 Sep 2013 15:49:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIn-0000Hc-Bg for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIn-0005CN-9G for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:57 +0000 Date: Fri, 27 Sep 2013 15:49:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: ensure the xenheap is 32MB aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cfdb1210ca4028303dd75b6d141685990096adc Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:34 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:20 2013 +0100 xen/arm: ensure the xenheap is 32MB aligned My patch 08693f5948d8 "xen: arm: reduce the size of the xen heap to max 1/8 RAM size" unintentionally violated the constraint that the xenheap must be 32MB aligned, since we only explicitly align the end of the heap and xenheap_pages was not a multiple of 32 pages. Round xenheap pages up to a 32MB boundary. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1d0b5e9..24bbc73 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -324,7 +324,8 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * constraints. */ heap_pages = (ram_size >> PAGE_SHIFT); - xenheap_pages = max(heap_pages/8, 128UL<<(20-PAGE_SHIFT)); + xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL; + xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT)); do { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:50:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaIq-0005ei-UD; Fri, 27 Sep 2013 15:50:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIp-0005eS-Kh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:59 +0000 Received: from [193.109.254.147:60543] by server-10.bemta-14.messagelabs.com id 07/87-26557-729A5425; Fri, 27 Sep 2013 15:49:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1380296997!1596100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18859 invoked from network); 27 Sep 2013 15:49:58 -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; 27 Sep 2013 15:49:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIn-0000Hc-Bg for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIn-0005CN-9G for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:49:57 +0000 Date: Fri, 27 Sep 2013 15:49:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: ensure the xenheap is 32MB aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4cfdb1210ca4028303dd75b6d141685990096adc Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:34 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:20 2013 +0100 xen/arm: ensure the xenheap is 32MB aligned My patch 08693f5948d8 "xen: arm: reduce the size of the xen heap to max 1/8 RAM size" unintentionally violated the constraint that the xenheap must be 32MB aligned, since we only explicitly align the end of the heap and xenheap_pages was not a multiple of 32 pages. Round xenheap pages up to a 32MB boundary. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1d0b5e9..24bbc73 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -324,7 +324,8 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * constraints. */ heap_pages = (ram_size >> PAGE_SHIFT); - xenheap_pages = max(heap_pages/8, 128UL<<(20-PAGE_SHIFT)); + xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL; + xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT)); do { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:50:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJ2-0005gs-1U; Fri, 27 Sep 2013 15:50:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJ0-0005gd-OX for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:10 +0000 Received: from [85.158.139.211:64046] by server-9.bemta-5.messagelabs.com id 59/F6-24493-139A5425; Fri, 27 Sep 2013 15:50:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1380297007!5053265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17490 invoked from network); 27 Sep 2013 15:50:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIx-0000I9-Kh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIx-0005D0-G2 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:07 +0000 Date: Fri, 27 Sep 2013 15:50:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: DOMHEAP_SECOND_PAGES is arm32 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fbb3b146c7b8a4e9ff4d29234931c57879b4ca8 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:25 2013 +0100 xen/arm: DOMHEAP_SECOND_PAGES is arm32 specific since 5263507b1b4a "xen: arm: Use a direct mapping of RAM on arm64" Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/include/asm-arm/config.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 604088e..624c73e 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -136,6 +136,9 @@ #define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */ +/* Number of domheap pagetable pages required at the second level (2MB mappings) */ +#define DOMHEAP_SECOND_PAGES ((DOMHEAP_VIRT_END - DOMHEAP_VIRT_START + 1) >> FIRST_SHIFT) + #else /* ARM_64 */ #define SLOT0_ENTRY_BITS 39 @@ -159,9 +162,6 @@ #endif -/* Number of domheap pagetable pages required at the second level (2MB mappings) */ -#define DOMHEAP_SECOND_PAGES ((DOMHEAP_VIRT_END - DOMHEAP_VIRT_START + 1) >> FIRST_SHIFT) - /* Fixmap slots */ #define FIXMAP_CONSOLE 0 /* The primary UART */ #define FIXMAP_PT 1 /* Temporary mappings of pagetable 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 Fri Sep 27 15:50:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJ2-0005gs-1U; Fri, 27 Sep 2013 15:50:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJ0-0005gd-OX for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:10 +0000 Received: from [85.158.139.211:64046] by server-9.bemta-5.messagelabs.com id 59/F6-24493-139A5425; Fri, 27 Sep 2013 15:50:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1380297007!5053265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17490 invoked from network); 27 Sep 2013 15:50:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaIx-0000I9-Kh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaIx-0005D0-G2 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:07 +0000 Date: Fri, 27 Sep 2013 15:50:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: DOMHEAP_SECOND_PAGES is arm32 specific X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fbb3b146c7b8a4e9ff4d29234931c57879b4ca8 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:35 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:25 2013 +0100 xen/arm: DOMHEAP_SECOND_PAGES is arm32 specific since 5263507b1b4a "xen: arm: Use a direct mapping of RAM on arm64" Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/include/asm-arm/config.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 604088e..624c73e 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -136,6 +136,9 @@ #define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */ +/* Number of domheap pagetable pages required at the second level (2MB mappings) */ +#define DOMHEAP_SECOND_PAGES ((DOMHEAP_VIRT_END - DOMHEAP_VIRT_START + 1) >> FIRST_SHIFT) + #else /* ARM_64 */ #define SLOT0_ENTRY_BITS 39 @@ -159,9 +162,6 @@ #endif -/* Number of domheap pagetable pages required at the second level (2MB mappings) */ -#define DOMHEAP_SECOND_PAGES ((DOMHEAP_VIRT_END - DOMHEAP_VIRT_START + 1) >> FIRST_SHIFT) - /* Fixmap slots */ #define FIXMAP_CONSOLE 0 /* The primary UART */ #define FIXMAP_PT 1 /* Temporary mappings of pagetable 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 Fri Sep 27 15:50:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJC-0005iu-4L; Fri, 27 Sep 2013 15:50:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJA-0005iZ-C0 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:20 +0000 Received: from [85.158.143.35:64283] by server-3.bemta-4.messagelabs.com id DA/48-24907-B39A5425; Fri, 27 Sep 2013 15:50:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1380297018!2472171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8233 invoked from network); 27 Sep 2013 15:50:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJ7-0000IH-Sn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJ7-0005E7-Pn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:17 +0000 Date: Fri, 27 Sep 2013 15:50:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Reserve FDT via early module mechanism X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c883eed77ae2bec5aca2f678bfd7fe4642fa6d37 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:36 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:27 2013 +0100 xen/arm: Reserve FDT via early module mechanism This will stop us putting any heaps or relocating Xen itself over the FDT. The devicetree will be copied to allocated memory in setup_mm and the original copy will be freed by discard_initial_modules. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 3 ++- xen/common/device_tree.c | 9 ++++++++- xen/include/xen/device_tree.h | 13 +++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 24bbc73..b5c2b17 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -622,9 +622,10 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); + /* This is mapped by head.S */ device_tree_flattened = (void *)BOOT_MISC_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); - fdt_size = device_tree_early_init(device_tree_flattened); + fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); cmdline_parse(device_tree_bootargs(device_tree_flattened)); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9a16650..793e9a8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -420,14 +420,21 @@ static void __init early_print_info(void) * * Returns the size of the DTB. */ -size_t __init device_tree_early_init(const void *fdt) +size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) { + struct dt_mb_module *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) early_panic("No valid device tree\n"); + mod = &early_info.modules.module[MOD_FDT]; + mod->start = paddr; + mod->size = fdt_totalsize(fdt); + + early_info.modules.nr_mods = max(MOD_FDT, early_info.modules.nr_mods); + device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 7810f53..a665c97 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -20,12 +20,13 @@ #define NR_MEM_BANKS 8 -#define MOD_XEN 0 -#define MOD_KERNEL 1 -#define MOD_INITRD 2 -#define NR_MODULES 3 +#define MOD_XEN 0 +#define MOD_FDT 1 +#define MOD_KERNEL 2 +#define MOD_INITRD 3 +#define NR_MODULES 4 -#define MOD_DISCARD_FIRST MOD_KERNEL +#define MOD_DISCARD_FIRST MOD_FDT struct membank { paddr_t start; @@ -179,7 +180,7 @@ typedef int (*device_tree_node_func)(const void *fdt, extern struct dt_early_info early_info; extern const void *device_tree_flattened; -size_t __init device_tree_early_init(const void *fdt); +size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); const char __init *device_tree_bootargs(const void *fdt); void __init device_tree_dump(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJC-0005iu-4L; Fri, 27 Sep 2013 15:50:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJA-0005iZ-C0 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:20 +0000 Received: from [85.158.143.35:64283] by server-3.bemta-4.messagelabs.com id DA/48-24907-B39A5425; Fri, 27 Sep 2013 15:50:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1380297018!2472171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8233 invoked from network); 27 Sep 2013 15:50:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJ7-0000IH-Sn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJ7-0005E7-Pn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:17 +0000 Date: Fri, 27 Sep 2013 15:50:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Reserve FDT via early module mechanism X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c883eed77ae2bec5aca2f678bfd7fe4642fa6d37 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:36 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:27 2013 +0100 xen/arm: Reserve FDT via early module mechanism This will stop us putting any heaps or relocating Xen itself over the FDT. The devicetree will be copied to allocated memory in setup_mm and the original copy will be freed by discard_initial_modules. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 3 ++- xen/common/device_tree.c | 9 ++++++++- xen/include/xen/device_tree.h | 13 +++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 24bbc73..b5c2b17 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -622,9 +622,10 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); + /* This is mapped by head.S */ device_tree_flattened = (void *)BOOT_MISC_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); - fdt_size = device_tree_early_init(device_tree_flattened); + fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); cmdline_parse(device_tree_bootargs(device_tree_flattened)); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9a16650..793e9a8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -420,14 +420,21 @@ static void __init early_print_info(void) * * Returns the size of the DTB. */ -size_t __init device_tree_early_init(const void *fdt) +size_t __init device_tree_early_init(const void *fdt, paddr_t paddr) { + struct dt_mb_module *mod; int ret; ret = fdt_check_header(fdt); if ( ret < 0 ) early_panic("No valid device tree\n"); + mod = &early_info.modules.module[MOD_FDT]; + mod->start = paddr; + mod->size = fdt_totalsize(fdt); + + early_info.modules.nr_mods = max(MOD_FDT, early_info.modules.nr_mods); + device_tree_for_each_node((void *)fdt, early_scan_node, NULL); early_print_info(); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 7810f53..a665c97 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -20,12 +20,13 @@ #define NR_MEM_BANKS 8 -#define MOD_XEN 0 -#define MOD_KERNEL 1 -#define MOD_INITRD 2 -#define NR_MODULES 3 +#define MOD_XEN 0 +#define MOD_FDT 1 +#define MOD_KERNEL 2 +#define MOD_INITRD 3 +#define NR_MODULES 4 -#define MOD_DISCARD_FIRST MOD_KERNEL +#define MOD_DISCARD_FIRST MOD_FDT struct membank { paddr_t start; @@ -179,7 +180,7 @@ typedef int (*device_tree_node_func)(const void *fdt, extern struct dt_early_info early_info; extern const void *device_tree_flattened; -size_t __init device_tree_early_init(const void *fdt); +size_t __init device_tree_early_init(const void *fdt, paddr_t paddr); const char __init *device_tree_bootargs(const void *fdt); void __init device_tree_dump(const void *fdt); -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJM-0005kt-7f; Fri, 27 Sep 2013 15:50:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJK-0005kd-Me for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:30 +0000 Received: from [85.158.143.35:65156] by server-3.bemta-4.messagelabs.com id 5E/78-24907-649A5425; Fri, 27 Sep 2013 15:50:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1380297028!1051669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1851 invoked from network); 27 Sep 2013 15:50:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJI-0000IS-Aw for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJI-0005ET-0Y for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:28 +0000 Date: Fri, 27 Sep 2013 15:50:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: do not relocate Xen outside of visible RAM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:37 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:33 2013 +0100 xen/arm: do not relocate Xen outside of visible RAM Since we do not handle non-contiguous banks of memory lets avoid relocating Xen into such a bank. Avoids issues such as free_init_memory releasing pages which are outside of the frametable. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b5c2b17..8215897 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -240,17 +240,25 @@ static paddr_t __init get_xen_paddr(void) { struct dt_mem_info *mi = &early_info.mem; paddr_t min_size; - paddr_t paddr = 0; + paddr_t paddr = 0, last_end; int i; min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1); + last_end = mi->bank[0].start; + /* Find the highest bank with enough space. */ for ( i = 0; i < mi->nr_banks; i++ ) { const struct membank *bank = &mi->bank[i]; paddr_t s, e; + /* We can only deal with contiguous memory at the moment */ + if ( last_end != bank->start ) + break; + + last_end = bank->start + bank->size; + if ( bank->size >= min_size ) { e = consider_modules(bank->start, bank->start + bank->size, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:50:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJM-0005kt-7f; Fri, 27 Sep 2013 15:50:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJK-0005kd-Me for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:30 +0000 Received: from [85.158.143.35:65156] by server-3.bemta-4.messagelabs.com id 5E/78-24907-649A5425; Fri, 27 Sep 2013 15:50:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1380297028!1051669!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1851 invoked from network); 27 Sep 2013 15:50:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJI-0000IS-Aw for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJI-0005ET-0Y for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:28 +0000 Date: Fri, 27 Sep 2013 15:50:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: do not relocate Xen outside of visible RAM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db92b1ac55cd5e193ae22b0b6f01fb47bc9e5d2f Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:37 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:33 2013 +0100 xen/arm: do not relocate Xen outside of visible RAM Since we do not handle non-contiguous banks of memory lets avoid relocating Xen into such a bank. Avoids issues such as free_init_memory releasing pages which are outside of the frametable. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b5c2b17..8215897 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -240,17 +240,25 @@ static paddr_t __init get_xen_paddr(void) { struct dt_mem_info *mi = &early_info.mem; paddr_t min_size; - paddr_t paddr = 0; + paddr_t paddr = 0, last_end; int i; min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1); + last_end = mi->bank[0].start; + /* Find the highest bank with enough space. */ for ( i = 0; i < mi->nr_banks; i++ ) { const struct membank *bank = &mi->bank[i]; paddr_t s, e; + /* We can only deal with contiguous memory at the moment */ + if ( last_end != bank->start ) + break; + + last_end = bank->start + bank->size; + if ( bank->size >= min_size ) { e = consider_modules(bank->start, bank->start + bank->size, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 27 15:50:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJX-0005nC-Bx; Fri, 27 Sep 2013 15:50:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJV-0005md-7b for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:41 +0000 Received: from [85.158.137.68:22448] by server-10.bemta-3.messagelabs.com id D2/DE-30473-059A5425; Fri, 27 Sep 2013 15:50:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1380297039!2867046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21097 invoked from network); 27 Sep 2013 15:50:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJS-0000IY-Qo for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJS-0005Et-Oh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:38 +0000 Date: Fri, 27 Sep 2013 15:50:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: cope with modules outside of "visible" RAM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac5a04eda393de164a03148bfa0ed75b0f68e97d Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:38 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:36 2013 +0100 xen/arm: cope with modules outside of "visible" RAM This can happen if modules are in a bank which we can't cope with e.g. due to being non-contiguous. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 8215897..02200ff 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -390,6 +390,12 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) e = n = ram_end; } + /* Module in RAM which we cannot see here, due to not handling + * non-contiguous memory regions yet + */ + if ( e > ram_end ) + e = ram_end; + /* Avoid the xenheap */ if ( s < ((xenheap_mfn_start+xenheap_pages) << PAGE_SHIFT) && (xenheap_mfn_start << PAGE_SHIFT) < e ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJX-0005nC-Bx; Fri, 27 Sep 2013 15:50:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJV-0005md-7b for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:41 +0000 Received: from [85.158.137.68:22448] by server-10.bemta-3.messagelabs.com id D2/DE-30473-059A5425; Fri, 27 Sep 2013 15:50:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1380297039!2867046!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21097 invoked from network); 27 Sep 2013 15:50:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJS-0000IY-Qo for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJS-0005Et-Oh for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:38 +0000 Date: Fri, 27 Sep 2013 15:50:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: cope with modules outside of "visible" RAM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac5a04eda393de164a03148bfa0ed75b0f68e97d Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:38 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:36 2013 +0100 xen/arm: cope with modules outside of "visible" RAM This can happen if modules are in a bank which we can't cope with e.g. due to being non-contiguous. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 8215897..02200ff 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -390,6 +390,12 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) e = n = ram_end; } + /* Module in RAM which we cannot see here, due to not handling + * non-contiguous memory regions yet + */ + if ( e > ram_end ) + e = ram_end; + /* Avoid the xenheap */ if ( s < ((xenheap_mfn_start+xenheap_pages) << PAGE_SHIFT) && (xenheap_mfn_start << PAGE_SHIFT) < e ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJh-0005pf-MT; Fri, 27 Sep 2013 15:50:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJg-0005pI-Cn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:52 +0000 Received: from [85.158.139.211:41965] by server-3.bemta-5.messagelabs.com id 56/64-19273-B59A5425; Fri, 27 Sep 2013 15:50:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1380297049!5059953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25634 invoked from network); 27 Sep 2013 15:50:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJd-0000Ie-0T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJc-0005FF-VD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:48 +0000 Date: Fri, 27 Sep 2013 15:50:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Support dtb /memreserve/ regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93483b04e29f959bff29b8e3f707f5c72d8c42c0 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:39 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:39 2013 +0100 xen/arm: Support dtb /memreserve/ regions This requires a mapping of the DTB during setup_mm. Previously this was in the BOOT_MISC slot, which is clobbered by setup_pagetables. Split it out into its own slot which can be preserved. Also handle these regions as part of consider_modules() and when adding pages to the heaps to ensure we do not locate any part of Xen or the heaps over them. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 2 +- xen/arch/arm/mm.c | 10 ++++++- xen/arch/arm/setup.c | 65 +++++++++++++++++++++++++++++++++++++++-- xen/common/device_tree.c | 13 ++++++++- xen/include/asm-arm/config.h | 7 ++-- xen/include/asm-arm/mm.h | 2 + 7 files changed, 90 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index fce18a2..2fcd38a 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -301,7 +301,7 @@ cpu_init_done: orr r2, r2, #PT_UPPER(MEM) orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the early boot slot */ + strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ pt_ready: PRINT("- Turning on paging -\r\n") diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 4495f72..bc95972 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -263,7 +263,7 @@ skip_bss: mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ orr x2, x2, x3 add x4, x4, #8 - str x2, [x1, x4] /* Map it in the early boot slot */ + str x2, [x1, x4] /* Map it in the early fdt slot */ pt_ready: PRINT("- Turning on paging -\r\n") diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 4521c8d..5cb6dac 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -361,6 +361,13 @@ static inline lpae_t pte_of_xenaddr(vaddr_t va) return mfn_to_xen_entry(mfn); } +void __init remove_early_mappings(void) +{ + lpae_t pte = {0}; + write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START), pte); + flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, SECOND_SIZE); +} + /* Boot-time pagetable setup. * Changes here may need matching changes in head.S */ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) @@ -401,7 +408,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) p[second_linear_offset(va)].bits = 0; } for ( i = 0; i < 4 * LPAE_ENTRIES; i++) - if ( p[i].pt.valid ) + /* The FDT is not relocated */ + if ( p[i].pt.valid && i != second_linear_offset(BOOT_FDT_VIRT_START) ) p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; /* Change pagetables to the copy in the relocated Xen */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 02200ff..65596d3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -147,6 +148,32 @@ static void __init processor_id(void) } } +static void dt_unreserved_regions(paddr_t s, paddr_t e, + void (*cb)(paddr_t, paddr_t), int first) +{ + int i, nr = fdt_num_mem_rsv(device_tree_flattened); + + for ( i = first; i < nr ; i++ ) + { + paddr_t r_s, r_e; + + if ( fdt_get_mem_rsv(device_tree_flattened, i, &r_s, &r_e ) < 0 ) + /* If we can't read it, pretend it doesn't exist... */ + continue; + + r_e += r_s; /* fdt_get_mem_rsc returns length */ + + if ( s < r_e && r_s < e ) + { + dt_unreserved_regions(r_e, e, cb, i+1); + dt_unreserved_regions(s, r_s, cb, i+1); + return; + } + } + + cb(s, e); +} + void __init discard_initial_modules(void) { struct dt_module_info *mi = &early_info.modules; @@ -157,10 +184,12 @@ void __init discard_initial_modules(void) paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - init_domheap_pages(s, e); + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 0; + + remove_early_mappings(); } /* @@ -177,6 +206,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, { const struct dt_module_info *mi = &early_info.modules; int i; + int nr_rsvd; s = (s+align-1) & ~(align-1); e = e & ~(align-1); @@ -184,6 +214,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, if ( s > e || e - s < size ) return 0; + /* First check the boot modules */ for ( i = first_mod; i <= mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; @@ -199,6 +230,32 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } } + /* Now check any fdt reserved areas. */ + + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + + for ( ; i < mi->nr_mods + nr_rsvd; i++ ) + { + paddr_t mod_s, mod_e; + + if ( fdt_get_mem_rsv(device_tree_flattened, + i - mi->nr_mods, + &mod_s, &mod_e ) < 0 ) + /* If we can't read it, pretend it doesn't exist... */ + continue; + + /* fdt_get_mem_rsv returns length */ + mod_e += mod_s; + + if ( s < mod_e && mod_s < e ) + { + mod_e = consider_modules(mod_e, e, size, align, i+1); + if ( mod_e ) + return mod_e; + + return consider_modules(s, mod_s, size, align, i+1); + } + } return e; } @@ -404,7 +461,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) n = pfn_to_paddr(xenheap_mfn_start+xenheap_pages); } - init_boot_pages(s, e); + dt_unreserved_regions(s, e, init_boot_pages, 0); s = n; } @@ -464,7 +521,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_mfn_end = e; - init_boot_pages(s, e); + dt_unreserved_regions(s, e, init_boot_pages, 0); s = n; } } @@ -637,7 +694,7 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); /* This is mapped by head.S */ - device_tree_flattened = (void *)BOOT_MISC_VIRT_START + device_tree_flattened = (void *)BOOT_FDT_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 793e9a8..4a1391c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -399,7 +399,7 @@ 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; + int i, nr_rsvd; for ( i = 0; i < mi->nr_banks; i++ ) early_printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", @@ -412,6 +412,17 @@ static void __init early_print_info(void) mods->module[i].start, mods->module[i].start + mods->module[i].size, mods->module[i].cmdline); + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + for ( i = 0; i < nr_rsvd; i++ ) + { + paddr_t s, e; + if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) + continue; + /* fdt_get_mem_rsv returns length */ + e += s; + early_printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", + i, s, e); + } } /** diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 624c73e..efeb952 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -80,10 +80,10 @@ * 0 - 2M Unmapped * 2M - 4M Xen text, data, bss * 4M - 6M Fixmap: special-purpose 4K mapping slots - * 6M - 8M Early boot misc (see below) + * 6M - 8M Early boot mapping of FDT + * 8M - 10M Early boot misc (see below) * * The early boot misc area is used: - * - in head.S for the DTB for device_tree_early_init(). * - in setup_pagetables() when relocating Xen. * * ARM32 layout: @@ -116,7 +116,8 @@ #define XEN_VIRT_START _AT(vaddr_t,0x00200000) #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) -#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00600000) +#define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) +#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000) #define HYPERVISOR_VIRT_START XEN_VIRT_START diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 173db1b..0129cd1 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -147,6 +147,8 @@ extern unsigned long total_pages; /* Boot-time pagetable setup */ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); +/* Remove early mappings */ +extern void remove_early_mappings(void); /* Allocate and initialise pagetables for a secondary CPU */ extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:50:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:50: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 1VPaJh-0005pf-MT; Fri, 27 Sep 2013 15:50:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJg-0005pI-Cn for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:52 +0000 Received: from [85.158.139.211:41965] by server-3.bemta-5.messagelabs.com id 56/64-19273-B59A5425; Fri, 27 Sep 2013 15:50:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1380297049!5059953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25634 invoked from network); 27 Sep 2013 15:50:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:50:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJd-0000Ie-0T for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJc-0005FF-VD for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:48 +0000 Date: Fri, 27 Sep 2013 15:50:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Support dtb /memreserve/ regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93483b04e29f959bff29b8e3f707f5c72d8c42c0 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:39 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:39 2013 +0100 xen/arm: Support dtb /memreserve/ regions This requires a mapping of the DTB during setup_mm. Previously this was in the BOOT_MISC slot, which is clobbered by setup_pagetables. Split it out into its own slot which can be preserved. Also handle these regions as part of consider_modules() and when adding pages to the heaps to ensure we do not locate any part of Xen or the heaps over them. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 2 +- xen/arch/arm/mm.c | 10 ++++++- xen/arch/arm/setup.c | 65 +++++++++++++++++++++++++++++++++++++++-- xen/common/device_tree.c | 13 ++++++++- xen/include/asm-arm/config.h | 7 ++-- xen/include/asm-arm/mm.h | 2 + 7 files changed, 90 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index fce18a2..2fcd38a 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -301,7 +301,7 @@ cpu_init_done: orr r2, r2, #PT_UPPER(MEM) orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the early boot slot */ + strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ pt_ready: PRINT("- Turning on paging -\r\n") diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 4495f72..bc95972 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -263,7 +263,7 @@ skip_bss: mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ orr x2, x2, x3 add x4, x4, #8 - str x2, [x1, x4] /* Map it in the early boot slot */ + str x2, [x1, x4] /* Map it in the early fdt slot */ pt_ready: PRINT("- Turning on paging -\r\n") diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 4521c8d..5cb6dac 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -361,6 +361,13 @@ static inline lpae_t pte_of_xenaddr(vaddr_t va) return mfn_to_xen_entry(mfn); } +void __init remove_early_mappings(void) +{ + lpae_t pte = {0}; + write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START), pte); + flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, SECOND_SIZE); +} + /* Boot-time pagetable setup. * Changes here may need matching changes in head.S */ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) @@ -401,7 +408,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) p[second_linear_offset(va)].bits = 0; } for ( i = 0; i < 4 * LPAE_ENTRIES; i++) - if ( p[i].pt.valid ) + /* The FDT is not relocated */ + if ( p[i].pt.valid && i != second_linear_offset(BOOT_FDT_VIRT_START) ) p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; /* Change pagetables to the copy in the relocated Xen */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 02200ff..65596d3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -147,6 +148,32 @@ static void __init processor_id(void) } } +static void dt_unreserved_regions(paddr_t s, paddr_t e, + void (*cb)(paddr_t, paddr_t), int first) +{ + int i, nr = fdt_num_mem_rsv(device_tree_flattened); + + for ( i = first; i < nr ; i++ ) + { + paddr_t r_s, r_e; + + if ( fdt_get_mem_rsv(device_tree_flattened, i, &r_s, &r_e ) < 0 ) + /* If we can't read it, pretend it doesn't exist... */ + continue; + + r_e += r_s; /* fdt_get_mem_rsc returns length */ + + if ( s < r_e && r_s < e ) + { + dt_unreserved_regions(r_e, e, cb, i+1); + dt_unreserved_regions(s, r_s, cb, i+1); + return; + } + } + + cb(s, e); +} + void __init discard_initial_modules(void) { struct dt_module_info *mi = &early_info.modules; @@ -157,10 +184,12 @@ void __init discard_initial_modules(void) paddr_t s = mi->module[i].start; paddr_t e = s + PAGE_ALIGN(mi->module[i].size); - init_domheap_pages(s, e); + dt_unreserved_regions(s, e, init_domheap_pages, 0); } mi->nr_mods = 0; + + remove_early_mappings(); } /* @@ -177,6 +206,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, { const struct dt_module_info *mi = &early_info.modules; int i; + int nr_rsvd; s = (s+align-1) & ~(align-1); e = e & ~(align-1); @@ -184,6 +214,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, if ( s > e || e - s < size ) return 0; + /* First check the boot modules */ for ( i = first_mod; i <= mi->nr_mods; i++ ) { paddr_t mod_s = mi->module[i].start; @@ -199,6 +230,32 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } } + /* Now check any fdt reserved areas. */ + + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + + for ( ; i < mi->nr_mods + nr_rsvd; i++ ) + { + paddr_t mod_s, mod_e; + + if ( fdt_get_mem_rsv(device_tree_flattened, + i - mi->nr_mods, + &mod_s, &mod_e ) < 0 ) + /* If we can't read it, pretend it doesn't exist... */ + continue; + + /* fdt_get_mem_rsv returns length */ + mod_e += mod_s; + + if ( s < mod_e && mod_s < e ) + { + mod_e = consider_modules(mod_e, e, size, align, i+1); + if ( mod_e ) + return mod_e; + + return consider_modules(s, mod_s, size, align, i+1); + } + } return e; } @@ -404,7 +461,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) n = pfn_to_paddr(xenheap_mfn_start+xenheap_pages); } - init_boot_pages(s, e); + dt_unreserved_regions(s, e, init_boot_pages, 0); s = n; } @@ -464,7 +521,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_mfn_end = e; - init_boot_pages(s, e); + dt_unreserved_regions(s, e, init_boot_pages, 0); s = n; } } @@ -637,7 +694,7 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); /* This is mapped by head.S */ - device_tree_flattened = (void *)BOOT_MISC_VIRT_START + device_tree_flattened = (void *)BOOT_FDT_VIRT_START + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 793e9a8..4a1391c 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -399,7 +399,7 @@ 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; + int i, nr_rsvd; for ( i = 0; i < mi->nr_banks; i++ ) early_printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", @@ -412,6 +412,17 @@ static void __init early_print_info(void) mods->module[i].start, mods->module[i].start + mods->module[i].size, mods->module[i].cmdline); + nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); + for ( i = 0; i < nr_rsvd; i++ ) + { + paddr_t s, e; + if ( fdt_get_mem_rsv(device_tree_flattened, i, &s, &e) < 0 ) + continue; + /* fdt_get_mem_rsv returns length */ + e += s; + early_printk(" RESVD[%d]: %"PRIpaddr" - %"PRIpaddr"\n", + i, s, e); + } } /** diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 624c73e..efeb952 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -80,10 +80,10 @@ * 0 - 2M Unmapped * 2M - 4M Xen text, data, bss * 4M - 6M Fixmap: special-purpose 4K mapping slots - * 6M - 8M Early boot misc (see below) + * 6M - 8M Early boot mapping of FDT + * 8M - 10M Early boot misc (see below) * * The early boot misc area is used: - * - in head.S for the DTB for device_tree_early_init(). * - in setup_pagetables() when relocating Xen. * * ARM32 layout: @@ -116,7 +116,8 @@ #define XEN_VIRT_START _AT(vaddr_t,0x00200000) #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) -#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00600000) +#define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) +#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000) #define HYPERVISOR_VIRT_START XEN_VIRT_START diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 173db1b..0129cd1 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -147,6 +147,8 @@ extern unsigned long total_pages; /* Boot-time pagetable setup */ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); +/* Remove early mappings */ +extern void remove_early_mappings(void); /* Allocate and initialise pagetables for a secondary CPU */ extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:51:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51: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 1VPaJq-0005rK-TC; Fri, 27 Sep 2013 15:51:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJp-0005qy-G6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:01 +0000 Received: from [193.109.254.147:64326] by server-5.bemta-14.messagelabs.com id B3/49-04931-469A5425; Fri, 27 Sep 2013 15:51:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380297059!4781220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2236 invoked from network); 27 Sep 2013 15:51:00 -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; 27 Sep 2013 15:51:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJn-0000Ir-5a for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJn-0005Ff-4D for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:59 +0000 Date: Fri, 27 Sep 2013 15:50:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: rename boot misc region to boot reloc now it has a single purpose X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4bb8f3358e0996e9208fe456be244410c408e6fa Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:40 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:47 2013 +0100 xen/arm: rename boot misc region to boot reloc now it has a single purpose Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 4 ++-- xen/include/asm-arm/config.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5cb6dac..89d9f57 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -128,7 +128,7 @@ static inline void check_memory_layout_alignment_constraints(void) { /* 2MB aligned regions */ BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK); BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK); - BUILD_BUG_ON(BOOT_MISC_VIRT_START & ~SECOND_MASK); + BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK); /* 1GB aligned regions */ BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK); #ifdef CONFIG_DOMAIN_PAGE @@ -377,7 +377,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) int i; /* Map the destination in the boot misc area. */ - dest_va = BOOT_MISC_VIRT_START; + dest_va = BOOT_RELOC_VIRT_START; pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); write_pte(xen_second + second_table_offset(dest_va), pte); flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index efeb952..9e395c2 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -81,10 +81,7 @@ * 2M - 4M Xen text, data, bss * 4M - 6M Fixmap: special-purpose 4K mapping slots * 6M - 8M Early boot mapping of FDT - * 8M - 10M Early boot misc (see below) - * - * The early boot misc area is used: - * - in setup_pagetables() when relocating Xen. + * 8M - 10M Early relocation address (used when relocating Xen) * * ARM32 layout: * 0 - 8M @@ -117,7 +114,7 @@ #define XEN_VIRT_START _AT(vaddr_t,0x00200000) #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) #define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) -#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000) +#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000) #define HYPERVISOR_VIRT_START XEN_VIRT_START -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:51:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51: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 1VPaJq-0005rK-TC; Fri, 27 Sep 2013 15:51:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJp-0005qy-G6 for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:01 +0000 Received: from [193.109.254.147:64326] by server-5.bemta-14.messagelabs.com id B3/49-04931-469A5425; Fri, 27 Sep 2013 15:51:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380297059!4781220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2236 invoked from network); 27 Sep 2013 15:51:00 -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; 27 Sep 2013 15:51:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJn-0000Ir-5a for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJn-0005Ff-4D for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:50:59 +0000 Date: Fri, 27 Sep 2013 15:50:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: rename boot misc region to boot reloc now it has a single purpose X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4bb8f3358e0996e9208fe456be244410c408e6fa Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:40 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:47 2013 +0100 xen/arm: rename boot misc region to boot reloc now it has a single purpose Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 4 ++-- xen/include/asm-arm/config.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5cb6dac..89d9f57 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -128,7 +128,7 @@ static inline void check_memory_layout_alignment_constraints(void) { /* 2MB aligned regions */ BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK); BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK); - BUILD_BUG_ON(BOOT_MISC_VIRT_START & ~SECOND_MASK); + BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK); /* 1GB aligned regions */ BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK); #ifdef CONFIG_DOMAIN_PAGE @@ -377,7 +377,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) int i; /* Map the destination in the boot misc area. */ - dest_va = BOOT_MISC_VIRT_START; + dest_va = BOOT_RELOC_VIRT_START; pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); write_pte(xen_second + second_table_offset(dest_va), pte); flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index efeb952..9e395c2 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -81,10 +81,7 @@ * 2M - 4M Xen text, data, bss * 4M - 6M Fixmap: special-purpose 4K mapping slots * 6M - 8M Early boot mapping of FDT - * 8M - 10M Early boot misc (see below) - * - * The early boot misc area is used: - * - in setup_pagetables() when relocating Xen. + * 8M - 10M Early relocation address (used when relocating Xen) * * ARM32 layout: * 0 - 8M @@ -117,7 +114,7 @@ #define XEN_VIRT_START _AT(vaddr_t,0x00200000) #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) #define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) -#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000) +#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000) #define HYPERVISOR_VIRT_START XEN_VIRT_START -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:51:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK1-0005tc-0H; Fri, 27 Sep 2013 15:51:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK0-0005tM-1J for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:12 +0000 Received: from [85.158.139.211:16666] by server-3.bemta-5.messagelabs.com id 7C/D4-19273-F69A5425; Fri, 27 Sep 2013 15:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1380297069!3151650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21112 invoked from network); 27 Sep 2013 15:51:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:51:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJx-0000JQ-Bi for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJx-0005GG-9V for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:09 +0000 Date: Fri, 27 Sep 2013 15:51:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: print the location of the Xen heap on 32 bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41208de9b1f52a1d865649ed3d4ba0cfe74f9f9f Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:41 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:50 2013 +0100 xen/arm: print the location of the Xen heap on 32 bit Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 65596d3..d97b900 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -407,8 +407,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) domheap_pages = heap_pages - xenheap_pages; - early_printk("Xen heap: %lu pages Dom heap: %lu pages\n", - xenheap_pages, domheap_pages); + early_printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages)\n", + e - (xenheap_pages << PAGE_SHIFT), e, + xenheap_pages); + early_printk("Dom heap: %lu pages\n", domheap_pages); setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_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 Fri Sep 27 15:51:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK1-0005tc-0H; Fri, 27 Sep 2013 15:51:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK0-0005tM-1J for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:12 +0000 Received: from [85.158.139.211:16666] by server-3.bemta-5.messagelabs.com id 7C/D4-19273-F69A5425; Fri, 27 Sep 2013 15:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1380297069!3151650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21112 invoked from network); 27 Sep 2013 15:51:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:51:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaJx-0000JQ-Bi for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaJx-0005GG-9V for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:09 +0000 Date: Fri, 27 Sep 2013 15:51:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: print the location of the Xen heap on 32 bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41208de9b1f52a1d865649ed3d4ba0cfe74f9f9f Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:41 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:50 2013 +0100 xen/arm: print the location of the Xen heap on 32 bit Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 65596d3..d97b900 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -407,8 +407,10 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) domheap_pages = heap_pages - xenheap_pages; - early_printk("Xen heap: %lu pages Dom heap: %lu pages\n", - xenheap_pages, domheap_pages); + early_printk("Xen heap: %"PRIpaddr"-%"PRIpaddr" (%lu pages)\n", + e - (xenheap_pages << PAGE_SHIFT), e, + xenheap_pages); + early_printk("Dom heap: %lu pages\n", domheap_pages); setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_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 Fri Sep 27 15:51:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaKB-0005vp-4U; Fri, 27 Sep 2013 15:51:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK9-0005vZ-WB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:22 +0000 Received: from [85.158.143.35:21452] by server-1.bemta-4.messagelabs.com id 25/F0-11076-979A5425; Fri, 27 Sep 2013 15:51:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380297079!7298004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22647 invoked from network); 27 Sep 2013 15:51:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:51:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK7-0000JW-Jk for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaK7-0005HF-Fi for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:19 +0000 Date: Fri, 27 Sep 2013 15:51:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: support RAM at addresses 0 and 4096 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1aac966e24e92d664089cfa075f21bbb570a7d58 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:42 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:53 2013 +0100 xen: support RAM at addresses 0 and 4096 Currently the mapping from pages to zones causes the page at zero to go into zone -1 and the page at 4096 to go into zone 0, which is the Xen zone (confusing various assertions). Arrange instead for the mapping to be such that zone 0 is always reserved for Xen and all other pages map to a zone >= 1. Signed-off-by: Ian Campbell Acked-by: Keir Fraser Cc: jbeulich@suse.com Acked-by: Tim Deegan --- xen/common/page_alloc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 41251b2..fb8187b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -257,11 +257,11 @@ unsigned long __init alloc_boot_pages( */ #define MEMZONE_XEN 0 -#define NR_ZONES (PADDR_BITS - PAGE_SHIFT) +#define NR_ZONES (PADDR_BITS - PAGE_SHIFT + 1) -#define bits_to_zone(b) (((b) < (PAGE_SHIFT + 1)) ? 0 : ((b) - PAGE_SHIFT - 1)) +#define bits_to_zone(b) (((b) < (PAGE_SHIFT + 1)) ? 1 : ((b) - PAGE_SHIFT)) #define page_to_zone(pg) (is_xen_heap_page(pg) ? MEMZONE_XEN : \ - (fls(page_to_mfn(pg)) - 1)) + (fls(page_to_mfn(pg)) ? : 1)) typedef struct page_list_head heap_by_zone_and_order_t[NR_ZONES][MAX_ORDER+1]; static heap_by_zone_and_order_t *_heap[MAX_NUMNODES]; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 27 15:51:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 27 Sep 2013 15:51:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaKB-0005vp-4U; Fri, 27 Sep 2013 15:51:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK9-0005vZ-WB for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:22 +0000 Received: from [85.158.143.35:21452] by server-1.bemta-4.messagelabs.com id 25/F0-11076-979A5425; Fri, 27 Sep 2013 15:51:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380297079!7298004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22647 invoked from network); 27 Sep 2013 15:51:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2013 15:51:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPaK7-0000JW-Jk for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPaK7-0005HF-Fi for xen-changelog@lists.xensource.com; Fri, 27 Sep 2013 15:51:19 +0000 Date: Fri, 27 Sep 2013 15:51:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: support RAM at addresses 0 and 4096 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1aac966e24e92d664089cfa075f21bbb570a7d58 Author: Ian Campbell AuthorDate: Thu Sep 26 12:35:42 2013 +0100 Commit: Ian Campbell CommitDate: Thu Sep 26 16:21:53 2013 +0100 xen: support RAM at addresses 0 and 4096 Currently the mapping from pages to zones causes the page at zero to go into zone -1 and the page at 4096 to go into zone 0, which is the Xen zone (confusing various assertions). Arrange instead for the mapping to be such that zone 0 is always reserved for Xen and all other pages map to a zone >= 1. Signed-off-by: Ian Campbell Acked-by: Keir Fraser Cc: jbeulich@suse.com Acked-by: Tim Deegan --- xen/common/page_alloc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 41251b2..fb8187b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -257,11 +257,11 @@ unsigned long __init alloc_boot_pages( */ #define MEMZONE_XEN 0 -#define NR_ZONES (PADDR_BITS - PAGE_SHIFT) +#define NR_ZONES (PADDR_BITS - PAGE_SHIFT + 1) -#define bits_to_zone(b) (((b) < (PAGE_SHIFT + 1)) ? 0 : ((b) - PAGE_SHIFT - 1)) +#define bits_to_zone(b) (((b) < (PAGE_SHIFT + 1)) ? 1 : ((b) - PAGE_SHIFT)) #define page_to_zone(pg) (is_xen_heap_page(pg) ? MEMZONE_XEN : \ - (fls(page_to_mfn(pg)) - 1)) + (fls(page_to_mfn(pg)) ? : 1)) typedef struct page_list_head heap_by_zone_and_order_t[NR_ZONES][MAX_ORDER+1]; static heap_by_zone_and_order_t *_heap[MAX_NUMNODES]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDZ-0004sz-GD; Sat, 28 Sep 2013 17: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 1VPyDX-0004sr-I8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:07 +0000 Received: from [85.158.143.35:21089] by server-1.bemta-4.messagelabs.com id C3/9F-11076-E3017425; Sat, 28 Sep 2013 17:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1380388924!7455521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32746 invoked from network); 28 Sep 2013 17:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDU-00089N-5k for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDT-0005hl-NJ for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:03 +0000 Date: Sat, 28 Sep 2013 17:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: fix Dom0 device setup failure for host bridges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0af438757d455f8eb6b5a6ae9a990ae245f230fd Author: Suravee Suthikulpanit AuthorDate: Fri Sep 27 10:11:49 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:11:49 2013 +0200 AMD IOMMU: fix Dom0 device setup failure for host bridges The host bridge device (i.e. 0x18 for AMD) does not require IOMMU, and therefore is not included in the IVRS. The current logic tries to map all PCI devices to an IOMMU. In this case, "xl dmesg" shows the following message on AMD sytem. (XEN) setup 0000:00:18.0 for d0 failed (-19) (XEN) setup 0000:00:18.1 for d0 failed (-19) (XEN) setup 0000:00:18.2 for d0 failed (-19) (XEN) setup 0000:00:18.3 for d0 failed (-19) (XEN) setup 0000:00:18.4 for d0 failed (-19) (XEN) setup 0000:00:18.5 for d0 failed (-19) This patch adds a new device type (i.e. DEV_TYPE_PCI_HOST_BRIDGE) which corresponds to PCI class code 0x06 and sub-class 0x00. Then, it uses this new type to filter when trying to map device to IOMMU. Signed-off-by: Suravee Suthikulpanit Reported-by: Stefan Bader On VT-d refuse (un)mapping host bridges for other than the hardware domain. Coding style cleanup. Signed-off-by: Jan Beulich Tested-by: Stefan Bader Acked-by: Xiantao Zhang --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 14 ++++++++++++-- xen/drivers/passthrough/pci.c | 8 +++++--- xen/drivers/passthrough/vtd/intremap.c | 1 + xen/drivers/passthrough/vtd/iommu.c | 18 ++++++++++++++++++ xen/include/xen/pci.h | 1 + 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 9684ae8..7241aad 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -147,9 +147,10 @@ static void amd_iommu_setup_domain_device( amd_iommu_flush_device(iommu, req_id); - AMD_IOMMU_DEBUG("Setup I/O page table: device id = %#x, " + AMD_IOMMU_DEBUG("Setup I/O page table: device id = %#x, type = %#x, " "root table = %#"PRIx64", " - "domain = %d, paging mode = %d\n", req_id, + "domain = %d, paging mode = %d\n", + req_id, pdev->type, page_to_maddr(hd->root_table), hd->domain_id, hd->paging_mode); } @@ -175,6 +176,15 @@ static int __init amd_iommu_setup_dom0_device(u8 devfn, struct pci_dev *pdev) if ( unlikely(!iommu) ) { + /* Filter the bridge devices */ + if ( pdev->type == DEV_TYPE_PCI_HOST_BRIDGE ) + { + AMD_IOMMU_DEBUG("Skipping host bridge %04x:%02x:%02x.%u\n", + pdev->seg, PCI_BUS(bdf), PCI_SLOT(bdf), + PCI_FUNC(bdf)); + return 0; + } + AMD_IOMMU_DEBUG("No iommu for device %04x:%02x:%02x.%u\n", pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index e9f2a56..4aa8f64 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -194,9 +194,6 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) u16 cap; u8 sec_bus, sub_bus; - case DEV_TYPE_PCIe_BRIDGE: - break; - case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: sec_bus = pci_conf_read8(pseg->nr, bus, PCI_SLOT(devfn), @@ -244,6 +241,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) break; case DEV_TYPE_PCI: + case DEV_TYPE_PCIe_BRIDGE: + case DEV_TYPE_PCI_HOST_BRIDGE: break; default: @@ -697,6 +696,7 @@ void pci_release_devices(struct domain *d) spin_unlock(&pcidevs_lock); } +#define PCI_CLASS_BRIDGE_HOST 0x0600 #define PCI_CLASS_BRIDGE_PCI 0x0604 enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) @@ -720,6 +720,8 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) return DEV_TYPE_PCI2PCIe_BRIDGE; } return DEV_TYPE_PCIe_BRIDGE; + case PCI_CLASS_BRIDGE_HOST: + return DEV_TYPE_PCI_HOST_BRIDGE; case 0x0000: case 0xffff: return DEV_TYPE_PCI_UNKNOWN; diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index f3bb31b..2f8b9eb 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -442,6 +442,7 @@ static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire) case DEV_TYPE_PCIe_ENDPOINT: case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: + case DEV_TYPE_PCI_HOST_BRIDGE: switch ( pdev->phantom_stride ) { case 1: sq = SQ_13_IGNORE_3; break; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index fd3abcb..12e0165 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1433,6 +1433,15 @@ static int domain_context_mapping( switch ( pdev->type ) { + case DEV_TYPE_PCI_HOST_BRIDGE: + if ( iommu_verbose ) + dprintk(VTDPREFIX, "d%d:Hostbridge: skip %04x:%02x:%02x.%u map\n", + domain->domain_id, seg, bus, + PCI_SLOT(devfn), PCI_FUNC(devfn)); + if ( !is_hardware_domain(domain) ) + return -EPERM; + break; + case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -1563,6 +1572,15 @@ static int domain_context_unmap( switch ( pdev->type ) { + case DEV_TYPE_PCI_HOST_BRIDGE: + if ( iommu_verbose ) + dprintk(VTDPREFIX, "d%d:Hostbridge: skip %04x:%02x:%02x.%u unmap\n", + domain->domain_id, seg, bus, + PCI_SLOT(devfn), PCI_FUNC(devfn)); + if ( !is_hardware_domain(domain) ) + return -EPERM; + goto out; + case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 3003803..cadb525 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -63,6 +63,7 @@ struct pci_dev { DEV_TYPE_PCIe2PCI_BRIDGE, // PCIe-to-PCI/PCIx bridge DEV_TYPE_PCI2PCIe_BRIDGE, // PCI/PCIx-to-PCIe bridge DEV_TYPE_LEGACY_PCI_BRIDGE, // Legacy PCI bridge + DEV_TYPE_PCI_HOST_BRIDGE, // PCI Host bridge DEV_TYPE_PCI, } type; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDZ-0004sz-GD; Sat, 28 Sep 2013 17: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 1VPyDX-0004sr-I8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:07 +0000 Received: from [85.158.143.35:21089] by server-1.bemta-4.messagelabs.com id C3/9F-11076-E3017425; Sat, 28 Sep 2013 17:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1380388924!7455521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32746 invoked from network); 28 Sep 2013 17:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDU-00089N-5k for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDT-0005hl-NJ for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:03 +0000 Date: Sat, 28 Sep 2013 17:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: fix Dom0 device setup failure for host bridges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0af438757d455f8eb6b5a6ae9a990ae245f230fd Author: Suravee Suthikulpanit AuthorDate: Fri Sep 27 10:11:49 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:11:49 2013 +0200 AMD IOMMU: fix Dom0 device setup failure for host bridges The host bridge device (i.e. 0x18 for AMD) does not require IOMMU, and therefore is not included in the IVRS. The current logic tries to map all PCI devices to an IOMMU. In this case, "xl dmesg" shows the following message on AMD sytem. (XEN) setup 0000:00:18.0 for d0 failed (-19) (XEN) setup 0000:00:18.1 for d0 failed (-19) (XEN) setup 0000:00:18.2 for d0 failed (-19) (XEN) setup 0000:00:18.3 for d0 failed (-19) (XEN) setup 0000:00:18.4 for d0 failed (-19) (XEN) setup 0000:00:18.5 for d0 failed (-19) This patch adds a new device type (i.e. DEV_TYPE_PCI_HOST_BRIDGE) which corresponds to PCI class code 0x06 and sub-class 0x00. Then, it uses this new type to filter when trying to map device to IOMMU. Signed-off-by: Suravee Suthikulpanit Reported-by: Stefan Bader On VT-d refuse (un)mapping host bridges for other than the hardware domain. Coding style cleanup. Signed-off-by: Jan Beulich Tested-by: Stefan Bader Acked-by: Xiantao Zhang --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 14 ++++++++++++-- xen/drivers/passthrough/pci.c | 8 +++++--- xen/drivers/passthrough/vtd/intremap.c | 1 + xen/drivers/passthrough/vtd/iommu.c | 18 ++++++++++++++++++ xen/include/xen/pci.h | 1 + 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 9684ae8..7241aad 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -147,9 +147,10 @@ static void amd_iommu_setup_domain_device( amd_iommu_flush_device(iommu, req_id); - AMD_IOMMU_DEBUG("Setup I/O page table: device id = %#x, " + AMD_IOMMU_DEBUG("Setup I/O page table: device id = %#x, type = %#x, " "root table = %#"PRIx64", " - "domain = %d, paging mode = %d\n", req_id, + "domain = %d, paging mode = %d\n", + req_id, pdev->type, page_to_maddr(hd->root_table), hd->domain_id, hd->paging_mode); } @@ -175,6 +176,15 @@ static int __init amd_iommu_setup_dom0_device(u8 devfn, struct pci_dev *pdev) if ( unlikely(!iommu) ) { + /* Filter the bridge devices */ + if ( pdev->type == DEV_TYPE_PCI_HOST_BRIDGE ) + { + AMD_IOMMU_DEBUG("Skipping host bridge %04x:%02x:%02x.%u\n", + pdev->seg, PCI_BUS(bdf), PCI_SLOT(bdf), + PCI_FUNC(bdf)); + return 0; + } + AMD_IOMMU_DEBUG("No iommu for device %04x:%02x:%02x.%u\n", pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index e9f2a56..4aa8f64 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -194,9 +194,6 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) u16 cap; u8 sec_bus, sub_bus; - case DEV_TYPE_PCIe_BRIDGE: - break; - case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: sec_bus = pci_conf_read8(pseg->nr, bus, PCI_SLOT(devfn), @@ -244,6 +241,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) break; case DEV_TYPE_PCI: + case DEV_TYPE_PCIe_BRIDGE: + case DEV_TYPE_PCI_HOST_BRIDGE: break; default: @@ -697,6 +696,7 @@ void pci_release_devices(struct domain *d) spin_unlock(&pcidevs_lock); } +#define PCI_CLASS_BRIDGE_HOST 0x0600 #define PCI_CLASS_BRIDGE_PCI 0x0604 enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) @@ -720,6 +720,8 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn) return DEV_TYPE_PCI2PCIe_BRIDGE; } return DEV_TYPE_PCIe_BRIDGE; + case PCI_CLASS_BRIDGE_HOST: + return DEV_TYPE_PCI_HOST_BRIDGE; case 0x0000: case 0xffff: return DEV_TYPE_PCI_UNKNOWN; diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index f3bb31b..2f8b9eb 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -442,6 +442,7 @@ static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire) case DEV_TYPE_PCIe_ENDPOINT: case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: + case DEV_TYPE_PCI_HOST_BRIDGE: switch ( pdev->phantom_stride ) { case 1: sq = SQ_13_IGNORE_3; break; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index fd3abcb..12e0165 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1433,6 +1433,15 @@ static int domain_context_mapping( switch ( pdev->type ) { + case DEV_TYPE_PCI_HOST_BRIDGE: + if ( iommu_verbose ) + dprintk(VTDPREFIX, "d%d:Hostbridge: skip %04x:%02x:%02x.%u map\n", + domain->domain_id, seg, bus, + PCI_SLOT(devfn), PCI_FUNC(devfn)); + if ( !is_hardware_domain(domain) ) + return -EPERM; + break; + case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -1563,6 +1572,15 @@ static int domain_context_unmap( switch ( pdev->type ) { + case DEV_TYPE_PCI_HOST_BRIDGE: + if ( iommu_verbose ) + dprintk(VTDPREFIX, "d%d:Hostbridge: skip %04x:%02x:%02x.%u unmap\n", + domain->domain_id, seg, bus, + PCI_SLOT(devfn), PCI_FUNC(devfn)); + if ( !is_hardware_domain(domain) ) + return -EPERM; + goto out; + case DEV_TYPE_PCIe_BRIDGE: case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 3003803..cadb525 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -63,6 +63,7 @@ struct pci_dev { DEV_TYPE_PCIe2PCI_BRIDGE, // PCIe-to-PCI/PCIx bridge DEV_TYPE_PCI2PCIe_BRIDGE, // PCI/PCIx-to-PCIe bridge DEV_TYPE_LEGACY_PCI_BRIDGE, // Legacy PCI bridge + DEV_TYPE_PCI_HOST_BRIDGE, // PCI Host bridge DEV_TYPE_PCI, } type; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDi-0004tD-J0; Sat, 28 Sep 2013 17:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDh-0004t8-Hf for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:17 +0000 Received: from [85.158.137.68:59185] by server-5.bemta-3.messagelabs.com id 0C/77-23058-84017425; Sat, 28 Sep 2013 17:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1380388934!5329969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31171 invoked from network); 28 Sep 2013 17:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDe-00089Q-IT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDe-0005j0-DF for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:14 +0000 Date: Sat, 28 Sep 2013 17:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader/smbios: Change strncpy to memcpy for anchor strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62466514cc419152fa2f33dc9aa986d0a2fc519a Author: Andrew Cooper AuthorDate: Fri Sep 27 10:15:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:15:28 2013 +0200 hvmloader/smbios: Change strncpy to memcpy for anchor strings Coverity complains about the use of strncpy() to completely fill the anchor strings, resulting in an unterminated string. Although the strncpy result is correct, the anchor strings are not strings in the C sense, and use of memcpy is the prevaling style elsewhere in hvmloader anyway. While tidying up the style in this function, also remove some trailing whitespace and gratuitous cast. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- tools/firmware/hvmloader/smbios.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 9f292cc..4d3d692 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -347,18 +347,18 @@ smbios_entry_point_init(void *start, { uint8_t sum; int i; - struct smbios_entry_point *ep = (struct smbios_entry_point *)start; + struct smbios_entry_point *ep = start; memset(ep, 0, sizeof(*ep)); - strncpy(ep->anchor_string, "_SM_", 4); + memcpy(ep->anchor_string, "_SM_", 4); ep->length = 0x1f; ep->smbios_major_version = 2; ep->smbios_minor_version = 4; ep->max_structure_size = max_structure_size; ep->entry_point_revision = 0; - strncpy(ep->intermediate_anchor_string, "_DMI_", 5); - + memcpy(ep->intermediate_anchor_string, "_DMI_", 5); + ep->structure_table_length = structure_table_length; ep->structure_table_address = structure_table_address; ep->number_of_structures = number_of_structures; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDi-0004tD-J0; Sat, 28 Sep 2013 17:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDh-0004t8-Hf for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:17 +0000 Received: from [85.158.137.68:59185] by server-5.bemta-3.messagelabs.com id 0C/77-23058-84017425; Sat, 28 Sep 2013 17:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1380388934!5329969!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31171 invoked from network); 28 Sep 2013 17:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDe-00089Q-IT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDe-0005j0-DF for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:14 +0000 Date: Sat, 28 Sep 2013 17:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader/smbios: Change strncpy to memcpy for anchor strings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62466514cc419152fa2f33dc9aa986d0a2fc519a Author: Andrew Cooper AuthorDate: Fri Sep 27 10:15:28 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:15:28 2013 +0200 hvmloader/smbios: Change strncpy to memcpy for anchor strings Coverity complains about the use of strncpy() to completely fill the anchor strings, resulting in an unterminated string. Although the strncpy result is correct, the anchor strings are not strings in the C sense, and use of memcpy is the prevaling style elsewhere in hvmloader anyway. While tidying up the style in this function, also remove some trailing whitespace and gratuitous cast. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- tools/firmware/hvmloader/smbios.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 9f292cc..4d3d692 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -347,18 +347,18 @@ smbios_entry_point_init(void *start, { uint8_t sum; int i; - struct smbios_entry_point *ep = (struct smbios_entry_point *)start; + struct smbios_entry_point *ep = start; memset(ep, 0, sizeof(*ep)); - strncpy(ep->anchor_string, "_SM_", 4); + memcpy(ep->anchor_string, "_SM_", 4); ep->length = 0x1f; ep->smbios_major_version = 2; ep->smbios_minor_version = 4; ep->max_structure_size = max_structure_size; ep->entry_point_revision = 0; - strncpy(ep->intermediate_anchor_string, "_DMI_", 5); - + memcpy(ep->intermediate_anchor_string, "_DMI_", 5); + ep->structure_table_length = structure_table_length; ep->structure_table_address = structure_table_address; ep->number_of_structures = number_of_structures; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDs-0004uG-Lf; Sat, 28 Sep 2013 17:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDr-0004ty-Ja for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:27 +0000 Received: from [85.158.139.211:51928] by server-12.bemta-5.messagelabs.com id DC/16-18373-25017425; Sat, 28 Sep 2013 17:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380388945!5171970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30144 invoked from network); 28 Sep 2013 17:22:26 -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; 28 Sep 2013 17:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDo-00089U-Rh for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDo-0005jP-N5 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:24 +0000 Date: Sat, 28 Sep 2013 17:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified_drivers: enable build of usbfront driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0dcfb88fb838ad6f8558f2952feb2f09dc34470f Author: Olaf Hering AuthorDate: Fri Sep 27 10:18:03 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:18:03 2013 +0200 unmodified_drivers: enable build of usbfront driver Signed-off-by: Olaf Hering --- unmodified_drivers/linux-2.6/Makefile | 1 + unmodified_drivers/linux-2.6/usbfront/Kbuild | 5 +++++ unmodified_drivers/linux-2.6/usbfront/Makefile | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/unmodified_drivers/linux-2.6/Makefile b/unmodified_drivers/linux-2.6/Makefile index 159c13e..a5c6967 100644 --- a/unmodified_drivers/linux-2.6/Makefile +++ b/unmodified_drivers/linux-2.6/Makefile @@ -5,3 +5,4 @@ obj-m += balloon/ obj-m += blkfront/ obj-m += netfront/ obj-m += scsifront/ +obj-m += usbfront/ diff --git a/unmodified_drivers/linux-2.6/usbfront/Kbuild b/unmodified_drivers/linux-2.6/usbfront/Kbuild new file mode 100644 index 0000000..f44deaa --- /dev/null +++ b/unmodified_drivers/linux-2.6/usbfront/Kbuild @@ -0,0 +1,5 @@ +include $(M)/overrides.mk + +obj-m += xen-usb.o + +xen-usb-objs := usbfront-hcd.o xenbus.o diff --git a/unmodified_drivers/linux-2.6/usbfront/Makefile b/unmodified_drivers/linux-2.6/usbfront/Makefile new file mode 100644 index 0000000..64e7acd --- /dev/null +++ b/unmodified_drivers/linux-2.6/usbfront/Makefile @@ -0,0 +1,3 @@ +ifneq ($(KERNELRELEASE),) +include $(src)/Kbuild +endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyDs-0004uG-Lf; Sat, 28 Sep 2013 17:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDr-0004ty-Ja for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:27 +0000 Received: from [85.158.139.211:51928] by server-12.bemta-5.messagelabs.com id DC/16-18373-25017425; Sat, 28 Sep 2013 17:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380388945!5171970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30144 invoked from network); 28 Sep 2013 17:22:26 -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; 28 Sep 2013 17:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDo-00089U-Rh for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDo-0005jP-N5 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:24 +0000 Date: Sat, 28 Sep 2013 17:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] unmodified_drivers: enable build of usbfront driver X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0dcfb88fb838ad6f8558f2952feb2f09dc34470f Author: Olaf Hering AuthorDate: Fri Sep 27 10:18:03 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:18:03 2013 +0200 unmodified_drivers: enable build of usbfront driver Signed-off-by: Olaf Hering --- unmodified_drivers/linux-2.6/Makefile | 1 + unmodified_drivers/linux-2.6/usbfront/Kbuild | 5 +++++ unmodified_drivers/linux-2.6/usbfront/Makefile | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/unmodified_drivers/linux-2.6/Makefile b/unmodified_drivers/linux-2.6/Makefile index 159c13e..a5c6967 100644 --- a/unmodified_drivers/linux-2.6/Makefile +++ b/unmodified_drivers/linux-2.6/Makefile @@ -5,3 +5,4 @@ obj-m += balloon/ obj-m += blkfront/ obj-m += netfront/ obj-m += scsifront/ +obj-m += usbfront/ diff --git a/unmodified_drivers/linux-2.6/usbfront/Kbuild b/unmodified_drivers/linux-2.6/usbfront/Kbuild new file mode 100644 index 0000000..f44deaa --- /dev/null +++ b/unmodified_drivers/linux-2.6/usbfront/Kbuild @@ -0,0 +1,5 @@ +include $(M)/overrides.mk + +obj-m += xen-usb.o + +xen-usb-objs := usbfront-hcd.o xenbus.o diff --git a/unmodified_drivers/linux-2.6/usbfront/Makefile b/unmodified_drivers/linux-2.6/usbfront/Makefile new file mode 100644 index 0000000..64e7acd --- /dev/null +++ b/unmodified_drivers/linux-2.6/usbfront/Makefile @@ -0,0 +1,3 @@ +ifneq ($(KERNELRELEASE),) +include $(src)/Kbuild +endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17: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 1VPyE4-0004vQ-Oj; Sat, 28 Sep 2013 17:22:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyE3-0004vC-Ec for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:39 +0000 Received: from [193.109.254.147:49327] by server-6.bemta-14.messagelabs.com id E8/B4-20235-E5017425; Sat, 28 Sep 2013 17:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380388955!1670333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5231 invoked from network); 28 Sep 2013 17:22:36 -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; 28 Sep 2013 17:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDz-00089e-3w for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDy-0005jr-Us for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:34 +0000 Date: Sat, 28 Sep 2013 17:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: Scan the initramfs payload for microcode blob X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 155587481e392e4261038364e2761aab27f597ed Author: Konrad Rzeszutek Wilk AuthorDate: Fri Sep 27 10:22:55 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:22:55 2013 +0200 x86/microcode: Scan the initramfs payload for microcode blob The Linux kernel is able to update the microcode during early bootup via inspection of the initramfs blob to see if there is an cpio image with certain microcode files. Linux is able to function with two (or more) cpio archives in the initrd b/c it unpacks all of the cpio archives. The format of the early initramfs is nicely documented in Linux's Documentation/x86/early-microcode.txt: Early load microcode ==================== By Fenghua Yu Kernel can update microcode in early phase of boot time. Loading microcode early can fix CPU issues before they are observed during kernel boot time. Microcode is stored in an initrd file. The microcode is read from the initrd file and loaded to CPUs during boot time. The format of the combined initrd image is microcode in cpio format followed by the initrd image (maybe compressed). Kernel parses the combined initrd image during boot time. The microcode file in cpio name space is: kernel/x86/microcode/GenuineIntel.bin During BSP boot (before SMP starts), if the kernel finds the microcode file in the initrd file, it parses the microcode and saves matching microcode in memory. If matching microcode is found, it will be uploaded in BSP and later on in all APs. The cached microcode patch is applied when CPUs resume from a sleep state. There are two legacy user space interfaces to load microcode, either through /dev/cpu/microcode or through /sys/devices/system/cpu/microcode/reload file in sysfs. In addition to these two legacy methods, the early loading method described here is the third method with which microcode can be uploaded to a system's CPUs. The following example script shows how to generate a new combined initrd file in /boot/initrd-3.5.0.ucode.img with original microcode microcode.bin and original initrd image /boot/initrd-3.5.0.img. mkdir initrd cd initrd mkdir kernel mkdir kernel/x86 mkdir kernel/x86/microcode cp ../microcode.bin kernel/x86/microcode/GenuineIntel.bin find .|cpio -oc >../ucode.cpio cd .. cat ucode.cpio /boot/initrd-3.5.0.img >/boot/initrd-3.5.0.ucode.img As such this code inspects the initrd to see if the microcode signatures are present and if so updates the hypervisor. The option to turn this scan on/off is gated by the 'ucode' parameter. The options are now: 'scan' Scan for the microcode in any multiboot payload. Attempt to load microcode blob (not the cpio archive format) from the multiboot payload number. This option alters slightly the 'ucode' parameter by only allowing either parameter: ucode=[|scan] Implementation wise the ucode_blob is defined as __initdata. That is OK from the viewpoint of suspend/resume as the the underlaying architecture microcode (microcode_intel or microcode_amd) end up saving the blob in 'struct ucode_cpu_info' which is a per-cpu data structure (see ucode_cpu_info). They end up saving it when doing the pre-SMP (for CPU0) and SMP (for the rest) microcode loading. Naturally if one does a hypercall to update the microcode and it is newer, then the old per-cpu data is replaced. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 14 +++- xen/arch/x86/microcode.c | 158 +++++++++++++++++++++++++++++++---- xen/common/Makefile | 2 +- xen/common/earlycpio.c | 151 +++++++++++++++++++++++++++++++++ xen/include/xen/earlycpio.h | 14 +++ 5 files changed, 320 insertions(+), 19 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 56c9729..dc72473 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -897,10 +897,12 @@ pages) must also be specified via the tbuf\_size parameter. > `= unstable | skewed` ### ucode -> `= ` +> `= [ | scan]` + +Specify how and where to find CPU microcode update blob. -Specify the CPU microcode update blob module index. When positive, this -specifies the n-th module (in the GrUB entry, zero based) to be used +'integer' specifies the CPU microcode update blob module index. When positive, +this specifies the n-th module (in the GrUB entry, zero based) to be used for updating CPU micrcode. When negative, counting starts at the end of the modules in the GrUB entry (so with the blob commonly being last, one could specify `ucode=-1`). Note that the value of zero is not valid @@ -910,6 +912,12 @@ when used with xen.efi (there the concept of modules doesn't exist, and the blob gets specified via the `ucode=` config file/section entry; see [EFI configuration file description](efi.html)). +'scan' instructs the hypervisor to scan the multiboot images for an cpio +image that contains microcode. Depending on the platform the blob with the +microcode in the cpio name space must be: + - on Intel: kernel/x86/microcode/GenuineIntel.bin + - on AMD : kernel/x86/microcode/AuthenticAMD.bin + ### unrestricted\_guest > `= ` diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index fbbf95b..e6344cf 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -45,19 +46,123 @@ static signed int __initdata ucode_mod_idx; static bool_t __initdata ucode_mod_forced; static cpumask_t __initdata init_mask; +/* + * If we scan the initramfs.cpio for the early microcode code + * and find it, then 'ucode_blob' will contain the pointer + * and the size of said blob. It is allocated from Xen's heap + * memory. + */ +struct ucode_mod_blob { + void *data; + size_t size; +}; + +static struct ucode_mod_blob __initdata ucode_blob; +/* + * By default we will NOT parse the multiboot modules to see if there is + * cpio image with the microcode images. + */ +static bool_t __initdata ucode_scan; + void __init microcode_set_module(unsigned int idx) { ucode_mod_idx = idx; ucode_mod_forced = 1; } +/* + * The format is '[|scan]'. Both options are optional. + * If the EFI has forced which of the multiboot payloads is to be used, + * no parsing will be attempted. + */ static void __init parse_ucode(char *s) { - if ( !ucode_mod_forced ) + if ( ucode_mod_forced ) /* Forced by EFI */ + return; + + if ( !strncmp(s, "scan", 4) ) + ucode_scan = 1; + else ucode_mod_idx = simple_strtol(s, NULL, 0); } custom_param("ucode", parse_ucode); +/* + * 8MB ought to be enough. + */ +#define MAX_EARLY_CPIO_MICROCODE (8 << 20) + +void __init microcode_scan_module( + unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootmap)(const module_t *)) +{ + module_t *mod = (module_t *)__va(mbi->mods_addr); + uint64_t *_blob_start; + unsigned long _blob_size; + struct cpio_data cd; + long offset; + const char *p = NULL; + int i; + + ucode_blob.size = 0; + if ( !ucode_scan ) + return; + + if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + p = "kernel/x86/microcode/AuthenticAMD.bin"; + else if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + p = "kernel/x86/microcode/GenuineIntel.bin"; + else + return; + + /* + * Try all modules and see whichever could be the microcode blob. + */ + for ( i = 1 /* Ignore dom0 kernel */; i < mbi->mods_count; i++ ) + { + if ( !test_bit(i, module_map) ) + continue; + + _blob_start = bootmap(&mod[i]); + _blob_size = mod[i].mod_end; + if ( !_blob_start ) + { + printk("Could not map multiboot module #%d (size: %ld)\n", + i, _blob_size); + continue; + } + cd.data = NULL; + cd.size = 0; + cd = find_cpio_data(p, _blob_start, _blob_size, &offset /* ignore */); + if ( cd.data ) + { + /* + * This is an arbitrary check - it would be sad if the blob + * consumed most of the memory and did not allow guests + * to launch. + */ + if ( cd.size > MAX_EARLY_CPIO_MICROCODE ) + { + printk("Multiboot %d microcode payload too big! (%ld, we can do %d)\n", + i, cd.size, MAX_EARLY_CPIO_MICROCODE); + goto err; + } + ucode_blob.size = cd.size; + ucode_blob.data = xmalloc_bytes(cd.size); + if ( !ucode_blob.data ) + cd.data = NULL; + else + memcpy(ucode_blob.data, cd.data, cd.size); + } + bootmap(NULL); + if ( cd.data ) + break; + } + return; +err: + bootmap(NULL); +} void __init microcode_grab_module( unsigned long *module_map, const multiboot_info_t *mbi, @@ -69,9 +174,12 @@ void __init microcode_grab_module( ucode_mod_idx += mbi->mods_count; if ( ucode_mod_idx <= 0 || ucode_mod_idx >= mbi->mods_count || !__test_and_clear_bit(ucode_mod_idx, module_map) ) - return; + goto scan; ucode_mod = mod[ucode_mod_idx]; ucode_mod_map = map; +scan: + if ( ucode_scan ) + microcode_scan_module(module_map, mbi, map); } const struct microcode_ops *microcode_ops; @@ -236,7 +344,10 @@ int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void) buf, unsigned long len) static void __init _do_microcode_update(unsigned long data) { - microcode_update_cpu((void *)data, ucode_mod.mod_end); + void *_data = (void *)data; + size_t len = ucode_blob.size ? ucode_blob.size : ucode_mod.mod_end; + + microcode_update_cpu(_data, len); cpumask_set_cpu(smp_processor_id(), &init_mask); } @@ -246,18 +357,19 @@ static int __init microcode_init(void) static struct tasklet __initdata tasklet; unsigned int cpu; - if ( !microcode_ops || !ucode_mod.mod_end ) + if ( !microcode_ops ) + return 0; + + if ( !ucode_mod.mod_end && !ucode_blob.size ) return 0; - data = ucode_mod_map(&ucode_mod); + data = ucode_blob.size ? ucode_blob.data : ucode_mod_map(&ucode_mod); + if ( !data ) return -ENOMEM; if ( microcode_ops->start_update && microcode_ops->start_update() != 0 ) - { - ucode_mod_map(NULL); - return 0; - } + goto out; softirq_tasklet_init(&tasklet, _do_microcode_update, (unsigned long)data); @@ -269,7 +381,11 @@ static int __init microcode_init(void) } while ( !cpumask_test_cpu(cpu, &init_mask) ); } - ucode_mod_map(NULL); +out: + if ( ucode_blob.size ) + xfree(data); + else + ucode_mod_map(NULL); return 0; } @@ -298,14 +414,26 @@ static int __init microcode_presmp_init(void) { if ( microcode_ops ) { - if ( ucode_mod.mod_end ) + if ( ucode_mod.mod_end || ucode_blob.size ) { - void *data = ucode_mod_map(&ucode_mod); - + void *data; + size_t len; + + if ( ucode_blob.size ) + { + len = ucode_blob.size; + data = ucode_blob.data; + } + else + { + len = ucode_mod.mod_end; + data = ucode_mod_map(&ucode_mod); + } if ( data ) - microcode_update_cpu(data, ucode_mod.mod_end); + microcode_update_cpu(data, len); - ucode_mod_map(NULL); + if ( !ucode_blob.size ) + ucode_mod_map(NULL); } register_cpu_notifier(µcode_percpu_nfb); diff --git a/xen/common/Makefile b/xen/common/Makefile index 5486140..6da4651 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -49,7 +49,7 @@ obj-y += radix-tree.o obj-y += rbtree.o obj-y += lzo.o -obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo,$(n).init.o) +obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo earlycpio,$(n).init.o) obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o diff --git a/xen/common/earlycpio.c b/xen/common/earlycpio.c new file mode 100644 index 0000000..5e54142 --- /dev/null +++ b/xen/common/earlycpio.c @@ -0,0 +1,151 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2012 Intel Corporation; author H. Peter Anvin + * + * This file is part of the Linux kernel, and is made available + * under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * ----------------------------------------------------------------------- */ + +/* + * earlycpio.c + * + * Find a specific cpio member; must precede any compressed content. + * This is used to locate data items in the initramfs used by the + * kernel itself during early boot (before the main initramfs is + * decompressed.) It is the responsibility of the initramfs creator + * to ensure that these items are uncompressed at the head of the + * blob. Depending on the boot loader or package tool that may be a + * separate file or part of the same file. + */ + +#include +#include +#include +#include +#include + +#define ALIGN(x, a) ((x + (a) - 1) & ~((a) - 1)) +#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) + +enum cpio_fields { + C_MAGIC, + C_INO, + C_MODE, + C_UID, + C_GID, + C_NLINK, + C_MTIME, + C_FILESIZE, + C_MAJ, + C_MIN, + C_RMAJ, + C_RMIN, + C_NAMESIZE, + C_CHKSUM, + C_NFIELDS +}; + +/** + * cpio_data find_cpio_data - Search for files in an uncompressed cpio + * @path: The directory to search for, including a slash at the end + * @data: Pointer to the the cpio archive or a header inside + * @len: Remaining length of the cpio based on data pointer + * @offset: When a matching file is found, this is the offset to the + * beginning of the cpio. It can be used to iterate through + * the cpio to find all files inside of a directory path + * + * @return: struct cpio_data containing the address, length and + * filename (with the directory path cut off) of the found file. + * If you search for a filename and not for files in a directory, + * pass the absolute path of the filename in the cpio and make sure + * the match returned an empty filename string. + */ + +struct cpio_data __init find_cpio_data(const char *path, void *data, + size_t len, long *offset) +{ + const size_t cpio_header_len = 8*C_NFIELDS - 2; + struct cpio_data cd = { NULL, 0 }; + const char *p, *dptr, *nptr; + unsigned int ch[C_NFIELDS], *chp, v; + unsigned char c, x; + size_t mypathsize = strlen(path); + int i, j; + + p = data; + + while (len > cpio_header_len) { + if (!*p) { + /* All cpio headers need to be 4-byte aligned */ + p += 4; + len -= 4; + continue; + } + + j = 6; /* The magic field is only 6 characters */ + chp = ch; + for (i = C_NFIELDS; i; i--) { + v = 0; + while (j--) { + v <<= 4; + c = *p++; + + x = c - '0'; + if (x < 10) { + v += x; + continue; + } + + x = (c | 0x20) - 'a'; + if (x < 6) { + v += x + 10; + continue; + } + + goto quit; /* Invalid hexadecimal */ + } + *chp++ = v; + j = 8; /* All other fields are 8 characters */ + } + + if ((ch[C_MAGIC] - 0x070701) > 1) + goto quit; /* Invalid magic */ + + len -= cpio_header_len; + + dptr = PTR_ALIGN(p + ch[C_NAMESIZE], 4); + nptr = PTR_ALIGN(dptr + ch[C_FILESIZE], 4); + + if (nptr > p + len || dptr < p || nptr < dptr) + goto quit; /* Buffer overrun */ + + if ((ch[C_MODE] & 0170000) == 0100000 && + ch[C_NAMESIZE] >= mypathsize && + !memcmp(p, path, mypathsize)) { + *offset = (long)nptr - (long)data; + if (ch[C_NAMESIZE] - mypathsize >= MAX_CPIO_FILE_NAME) { + printk( + "File %s exceeding MAX_CPIO_FILE_NAME [%d]\n", + p, MAX_CPIO_FILE_NAME); + } + if (ch[C_NAMESIZE] - 1 /* includes \0 */ == mypathsize) { + cd.data = (void *)dptr; + cd.size = ch[C_FILESIZE]; + return cd; /* Found it! */ + } + } + len -= (nptr - p); + p = nptr; + } + +quit: + return cd; +} + diff --git a/xen/include/xen/earlycpio.h b/xen/include/xen/earlycpio.h new file mode 100644 index 0000000..85d144a --- /dev/null +++ b/xen/include/xen/earlycpio.h @@ -0,0 +1,14 @@ +#ifndef _EARLYCPIO_H +#define _EARLYCPIO_H + +#define MAX_CPIO_FILE_NAME 18 + +struct cpio_data { + void *data; + size_t size; +}; + +struct cpio_data find_cpio_data(const char *path, void *data, size_t len, + long *offset); + +#endif /* _EARLYCPIO_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17: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 1VPyE4-0004vQ-Oj; Sat, 28 Sep 2013 17:22:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyE3-0004vC-Ec for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:39 +0000 Received: from [193.109.254.147:49327] by server-6.bemta-14.messagelabs.com id E8/B4-20235-E5017425; Sat, 28 Sep 2013 17:22:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1380388955!1670333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5231 invoked from network); 28 Sep 2013 17:22:36 -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; 28 Sep 2013 17:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyDz-00089e-3w for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyDy-0005jr-Us for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:34 +0000 Date: Sat, 28 Sep 2013 17:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: Scan the initramfs payload for microcode blob X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 155587481e392e4261038364e2761aab27f597ed Author: Konrad Rzeszutek Wilk AuthorDate: Fri Sep 27 10:22:55 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:22:55 2013 +0200 x86/microcode: Scan the initramfs payload for microcode blob The Linux kernel is able to update the microcode during early bootup via inspection of the initramfs blob to see if there is an cpio image with certain microcode files. Linux is able to function with two (or more) cpio archives in the initrd b/c it unpacks all of the cpio archives. The format of the early initramfs is nicely documented in Linux's Documentation/x86/early-microcode.txt: Early load microcode ==================== By Fenghua Yu Kernel can update microcode in early phase of boot time. Loading microcode early can fix CPU issues before they are observed during kernel boot time. Microcode is stored in an initrd file. The microcode is read from the initrd file and loaded to CPUs during boot time. The format of the combined initrd image is microcode in cpio format followed by the initrd image (maybe compressed). Kernel parses the combined initrd image during boot time. The microcode file in cpio name space is: kernel/x86/microcode/GenuineIntel.bin During BSP boot (before SMP starts), if the kernel finds the microcode file in the initrd file, it parses the microcode and saves matching microcode in memory. If matching microcode is found, it will be uploaded in BSP and later on in all APs. The cached microcode patch is applied when CPUs resume from a sleep state. There are two legacy user space interfaces to load microcode, either through /dev/cpu/microcode or through /sys/devices/system/cpu/microcode/reload file in sysfs. In addition to these two legacy methods, the early loading method described here is the third method with which microcode can be uploaded to a system's CPUs. The following example script shows how to generate a new combined initrd file in /boot/initrd-3.5.0.ucode.img with original microcode microcode.bin and original initrd image /boot/initrd-3.5.0.img. mkdir initrd cd initrd mkdir kernel mkdir kernel/x86 mkdir kernel/x86/microcode cp ../microcode.bin kernel/x86/microcode/GenuineIntel.bin find .|cpio -oc >../ucode.cpio cd .. cat ucode.cpio /boot/initrd-3.5.0.img >/boot/initrd-3.5.0.ucode.img As such this code inspects the initrd to see if the microcode signatures are present and if so updates the hypervisor. The option to turn this scan on/off is gated by the 'ucode' parameter. The options are now: 'scan' Scan for the microcode in any multiboot payload. Attempt to load microcode blob (not the cpio archive format) from the multiboot payload number. This option alters slightly the 'ucode' parameter by only allowing either parameter: ucode=[|scan] Implementation wise the ucode_blob is defined as __initdata. That is OK from the viewpoint of suspend/resume as the the underlaying architecture microcode (microcode_intel or microcode_amd) end up saving the blob in 'struct ucode_cpu_info' which is a per-cpu data structure (see ucode_cpu_info). They end up saving it when doing the pre-SMP (for CPU0) and SMP (for the rest) microcode loading. Naturally if one does a hypercall to update the microcode and it is newer, then the old per-cpu data is replaced. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Keir Fraser --- docs/misc/xen-command-line.markdown | 14 +++- xen/arch/x86/microcode.c | 158 +++++++++++++++++++++++++++++++---- xen/common/Makefile | 2 +- xen/common/earlycpio.c | 151 +++++++++++++++++++++++++++++++++ xen/include/xen/earlycpio.h | 14 +++ 5 files changed, 320 insertions(+), 19 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 56c9729..dc72473 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -897,10 +897,12 @@ pages) must also be specified via the tbuf\_size parameter. > `= unstable | skewed` ### ucode -> `= ` +> `= [ | scan]` + +Specify how and where to find CPU microcode update blob. -Specify the CPU microcode update blob module index. When positive, this -specifies the n-th module (in the GrUB entry, zero based) to be used +'integer' specifies the CPU microcode update blob module index. When positive, +this specifies the n-th module (in the GrUB entry, zero based) to be used for updating CPU micrcode. When negative, counting starts at the end of the modules in the GrUB entry (so with the blob commonly being last, one could specify `ucode=-1`). Note that the value of zero is not valid @@ -910,6 +912,12 @@ when used with xen.efi (there the concept of modules doesn't exist, and the blob gets specified via the `ucode=` config file/section entry; see [EFI configuration file description](efi.html)). +'scan' instructs the hypervisor to scan the multiboot images for an cpio +image that contains microcode. Depending on the platform the blob with the +microcode in the cpio name space must be: + - on Intel: kernel/x86/microcode/GenuineIntel.bin + - on AMD : kernel/x86/microcode/AuthenticAMD.bin + ### unrestricted\_guest > `= ` diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index fbbf95b..e6344cf 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -45,19 +46,123 @@ static signed int __initdata ucode_mod_idx; static bool_t __initdata ucode_mod_forced; static cpumask_t __initdata init_mask; +/* + * If we scan the initramfs.cpio for the early microcode code + * and find it, then 'ucode_blob' will contain the pointer + * and the size of said blob. It is allocated from Xen's heap + * memory. + */ +struct ucode_mod_blob { + void *data; + size_t size; +}; + +static struct ucode_mod_blob __initdata ucode_blob; +/* + * By default we will NOT parse the multiboot modules to see if there is + * cpio image with the microcode images. + */ +static bool_t __initdata ucode_scan; + void __init microcode_set_module(unsigned int idx) { ucode_mod_idx = idx; ucode_mod_forced = 1; } +/* + * The format is '[|scan]'. Both options are optional. + * If the EFI has forced which of the multiboot payloads is to be used, + * no parsing will be attempted. + */ static void __init parse_ucode(char *s) { - if ( !ucode_mod_forced ) + if ( ucode_mod_forced ) /* Forced by EFI */ + return; + + if ( !strncmp(s, "scan", 4) ) + ucode_scan = 1; + else ucode_mod_idx = simple_strtol(s, NULL, 0); } custom_param("ucode", parse_ucode); +/* + * 8MB ought to be enough. + */ +#define MAX_EARLY_CPIO_MICROCODE (8 << 20) + +void __init microcode_scan_module( + unsigned long *module_map, + const multiboot_info_t *mbi, + void *(*bootmap)(const module_t *)) +{ + module_t *mod = (module_t *)__va(mbi->mods_addr); + uint64_t *_blob_start; + unsigned long _blob_size; + struct cpio_data cd; + long offset; + const char *p = NULL; + int i; + + ucode_blob.size = 0; + if ( !ucode_scan ) + return; + + if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + p = "kernel/x86/microcode/AuthenticAMD.bin"; + else if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + p = "kernel/x86/microcode/GenuineIntel.bin"; + else + return; + + /* + * Try all modules and see whichever could be the microcode blob. + */ + for ( i = 1 /* Ignore dom0 kernel */; i < mbi->mods_count; i++ ) + { + if ( !test_bit(i, module_map) ) + continue; + + _blob_start = bootmap(&mod[i]); + _blob_size = mod[i].mod_end; + if ( !_blob_start ) + { + printk("Could not map multiboot module #%d (size: %ld)\n", + i, _blob_size); + continue; + } + cd.data = NULL; + cd.size = 0; + cd = find_cpio_data(p, _blob_start, _blob_size, &offset /* ignore */); + if ( cd.data ) + { + /* + * This is an arbitrary check - it would be sad if the blob + * consumed most of the memory and did not allow guests + * to launch. + */ + if ( cd.size > MAX_EARLY_CPIO_MICROCODE ) + { + printk("Multiboot %d microcode payload too big! (%ld, we can do %d)\n", + i, cd.size, MAX_EARLY_CPIO_MICROCODE); + goto err; + } + ucode_blob.size = cd.size; + ucode_blob.data = xmalloc_bytes(cd.size); + if ( !ucode_blob.data ) + cd.data = NULL; + else + memcpy(ucode_blob.data, cd.data, cd.size); + } + bootmap(NULL); + if ( cd.data ) + break; + } + return; +err: + bootmap(NULL); +} void __init microcode_grab_module( unsigned long *module_map, const multiboot_info_t *mbi, @@ -69,9 +174,12 @@ void __init microcode_grab_module( ucode_mod_idx += mbi->mods_count; if ( ucode_mod_idx <= 0 || ucode_mod_idx >= mbi->mods_count || !__test_and_clear_bit(ucode_mod_idx, module_map) ) - return; + goto scan; ucode_mod = mod[ucode_mod_idx]; ucode_mod_map = map; +scan: + if ( ucode_scan ) + microcode_scan_module(module_map, mbi, map); } const struct microcode_ops *microcode_ops; @@ -236,7 +344,10 @@ int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void) buf, unsigned long len) static void __init _do_microcode_update(unsigned long data) { - microcode_update_cpu((void *)data, ucode_mod.mod_end); + void *_data = (void *)data; + size_t len = ucode_blob.size ? ucode_blob.size : ucode_mod.mod_end; + + microcode_update_cpu(_data, len); cpumask_set_cpu(smp_processor_id(), &init_mask); } @@ -246,18 +357,19 @@ static int __init microcode_init(void) static struct tasklet __initdata tasklet; unsigned int cpu; - if ( !microcode_ops || !ucode_mod.mod_end ) + if ( !microcode_ops ) + return 0; + + if ( !ucode_mod.mod_end && !ucode_blob.size ) return 0; - data = ucode_mod_map(&ucode_mod); + data = ucode_blob.size ? ucode_blob.data : ucode_mod_map(&ucode_mod); + if ( !data ) return -ENOMEM; if ( microcode_ops->start_update && microcode_ops->start_update() != 0 ) - { - ucode_mod_map(NULL); - return 0; - } + goto out; softirq_tasklet_init(&tasklet, _do_microcode_update, (unsigned long)data); @@ -269,7 +381,11 @@ static int __init microcode_init(void) } while ( !cpumask_test_cpu(cpu, &init_mask) ); } - ucode_mod_map(NULL); +out: + if ( ucode_blob.size ) + xfree(data); + else + ucode_mod_map(NULL); return 0; } @@ -298,14 +414,26 @@ static int __init microcode_presmp_init(void) { if ( microcode_ops ) { - if ( ucode_mod.mod_end ) + if ( ucode_mod.mod_end || ucode_blob.size ) { - void *data = ucode_mod_map(&ucode_mod); - + void *data; + size_t len; + + if ( ucode_blob.size ) + { + len = ucode_blob.size; + data = ucode_blob.data; + } + else + { + len = ucode_mod.mod_end; + data = ucode_mod_map(&ucode_mod); + } if ( data ) - microcode_update_cpu(data, ucode_mod.mod_end); + microcode_update_cpu(data, len); - ucode_mod_map(NULL); + if ( !ucode_blob.size ) + ucode_mod_map(NULL); } register_cpu_notifier(µcode_percpu_nfb); diff --git a/xen/common/Makefile b/xen/common/Makefile index 5486140..6da4651 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -49,7 +49,7 @@ obj-y += radix-tree.o obj-y += rbtree.o obj-y += lzo.o -obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo,$(n).init.o) +obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo earlycpio,$(n).init.o) obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o diff --git a/xen/common/earlycpio.c b/xen/common/earlycpio.c new file mode 100644 index 0000000..5e54142 --- /dev/null +++ b/xen/common/earlycpio.c @@ -0,0 +1,151 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2012 Intel Corporation; author H. Peter Anvin + * + * This file is part of the Linux kernel, and is made available + * under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * ----------------------------------------------------------------------- */ + +/* + * earlycpio.c + * + * Find a specific cpio member; must precede any compressed content. + * This is used to locate data items in the initramfs used by the + * kernel itself during early boot (before the main initramfs is + * decompressed.) It is the responsibility of the initramfs creator + * to ensure that these items are uncompressed at the head of the + * blob. Depending on the boot loader or package tool that may be a + * separate file or part of the same file. + */ + +#include +#include +#include +#include +#include + +#define ALIGN(x, a) ((x + (a) - 1) & ~((a) - 1)) +#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) + +enum cpio_fields { + C_MAGIC, + C_INO, + C_MODE, + C_UID, + C_GID, + C_NLINK, + C_MTIME, + C_FILESIZE, + C_MAJ, + C_MIN, + C_RMAJ, + C_RMIN, + C_NAMESIZE, + C_CHKSUM, + C_NFIELDS +}; + +/** + * cpio_data find_cpio_data - Search for files in an uncompressed cpio + * @path: The directory to search for, including a slash at the end + * @data: Pointer to the the cpio archive or a header inside + * @len: Remaining length of the cpio based on data pointer + * @offset: When a matching file is found, this is the offset to the + * beginning of the cpio. It can be used to iterate through + * the cpio to find all files inside of a directory path + * + * @return: struct cpio_data containing the address, length and + * filename (with the directory path cut off) of the found file. + * If you search for a filename and not for files in a directory, + * pass the absolute path of the filename in the cpio and make sure + * the match returned an empty filename string. + */ + +struct cpio_data __init find_cpio_data(const char *path, void *data, + size_t len, long *offset) +{ + const size_t cpio_header_len = 8*C_NFIELDS - 2; + struct cpio_data cd = { NULL, 0 }; + const char *p, *dptr, *nptr; + unsigned int ch[C_NFIELDS], *chp, v; + unsigned char c, x; + size_t mypathsize = strlen(path); + int i, j; + + p = data; + + while (len > cpio_header_len) { + if (!*p) { + /* All cpio headers need to be 4-byte aligned */ + p += 4; + len -= 4; + continue; + } + + j = 6; /* The magic field is only 6 characters */ + chp = ch; + for (i = C_NFIELDS; i; i--) { + v = 0; + while (j--) { + v <<= 4; + c = *p++; + + x = c - '0'; + if (x < 10) { + v += x; + continue; + } + + x = (c | 0x20) - 'a'; + if (x < 6) { + v += x + 10; + continue; + } + + goto quit; /* Invalid hexadecimal */ + } + *chp++ = v; + j = 8; /* All other fields are 8 characters */ + } + + if ((ch[C_MAGIC] - 0x070701) > 1) + goto quit; /* Invalid magic */ + + len -= cpio_header_len; + + dptr = PTR_ALIGN(p + ch[C_NAMESIZE], 4); + nptr = PTR_ALIGN(dptr + ch[C_FILESIZE], 4); + + if (nptr > p + len || dptr < p || nptr < dptr) + goto quit; /* Buffer overrun */ + + if ((ch[C_MODE] & 0170000) == 0100000 && + ch[C_NAMESIZE] >= mypathsize && + !memcmp(p, path, mypathsize)) { + *offset = (long)nptr - (long)data; + if (ch[C_NAMESIZE] - mypathsize >= MAX_CPIO_FILE_NAME) { + printk( + "File %s exceeding MAX_CPIO_FILE_NAME [%d]\n", + p, MAX_CPIO_FILE_NAME); + } + if (ch[C_NAMESIZE] - 1 /* includes \0 */ == mypathsize) { + cd.data = (void *)dptr; + cd.size = ch[C_FILESIZE]; + return cd; /* Found it! */ + } + } + len -= (nptr - p); + p = nptr; + } + +quit: + return cd; +} + diff --git a/xen/include/xen/earlycpio.h b/xen/include/xen/earlycpio.h new file mode 100644 index 0000000..85d144a --- /dev/null +++ b/xen/include/xen/earlycpio.h @@ -0,0 +1,14 @@ +#ifndef _EARLYCPIO_H +#define _EARLYCPIO_H + +#define MAX_CPIO_FILE_NAME 18 + +struct cpio_data { + void *data; + size_t size; +}; + +struct cpio_data find_cpio_data(const char *path, void *data, size_t len, + long *offset); + +#endif /* _EARLYCPIO_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyEC-0004wX-TV; Sat, 28 Sep 2013 17:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEC-0004wK-2n for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:48 +0000 Received: from [85.158.139.211:54154] by server-7.bemta-5.messagelabs.com id F5/C8-24315-76017425; Sat, 28 Sep 2013 17:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1380388965!5178762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13185 invoked from network); 28 Sep 2013 17:22:46 -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; 28 Sep 2013 17:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyE9-00089k-9a for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyE9-0005kG-7g for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:45 +0000 Date: Sat, 28 Sep 2013 17:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: Check whether the microcode is correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4deea8515b1caba8803816399068f2a75d65f8ad Author: Konrad Rzeszutek Wilk AuthorDate: Fri Sep 27 10:25:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:25:08 2013 +0200 x86/microcode: Check whether the microcode is correct We do the microcode code update in two steps - the presmp: 'microcode_presmp_init' and when CPUs are brought up: 'microcode_init'. The earlier performs the microcode update on the BSP - but unfortunately it does not check whether the update failed. Which means that we might try later to update a incorrect payload on the rest of CPUs. This patch handles this odd situation. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/microcode.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index e6344cf..091d5d1 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -418,6 +418,7 @@ static int __init microcode_presmp_init(void) { void *data; size_t len; + int rc = 0; if ( ucode_blob.size ) { @@ -430,10 +431,24 @@ static int __init microcode_presmp_init(void) data = ucode_mod_map(&ucode_mod); } if ( data ) - microcode_update_cpu(data, len); + rc = microcode_update_cpu(data, len); + else + rc = -ENOMEM; if ( !ucode_blob.size ) ucode_mod_map(NULL); + + if ( rc ) + { + if ( ucode_blob.size ) + { + xfree(ucode_blob.data); + ucode_blob.size = 0; + ucode_blob.data = NULL; + } + else + ucode_mod.mod_end = 0; + } } register_cpu_notifier(µcode_percpu_nfb); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:22:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:22: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 1VPyEC-0004wX-TV; Sat, 28 Sep 2013 17:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEC-0004wK-2n for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:48 +0000 Received: from [85.158.139.211:54154] by server-7.bemta-5.messagelabs.com id F5/C8-24315-76017425; Sat, 28 Sep 2013 17:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1380388965!5178762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13185 invoked from network); 28 Sep 2013 17:22:46 -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; 28 Sep 2013 17:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyE9-00089k-9a for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyE9-0005kG-7g for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:45 +0000 Date: Sat, 28 Sep 2013 17:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: Check whether the microcode is correct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4deea8515b1caba8803816399068f2a75d65f8ad Author: Konrad Rzeszutek Wilk AuthorDate: Fri Sep 27 10:25:08 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 10:25:08 2013 +0200 x86/microcode: Check whether the microcode is correct We do the microcode code update in two steps - the presmp: 'microcode_presmp_init' and when CPUs are brought up: 'microcode_init'. The earlier performs the microcode update on the BSP - but unfortunately it does not check whether the update failed. Which means that we might try later to update a incorrect payload on the rest of CPUs. This patch handles this odd situation. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/microcode.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index e6344cf..091d5d1 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -418,6 +418,7 @@ static int __init microcode_presmp_init(void) { void *data; size_t len; + int rc = 0; if ( ucode_blob.size ) { @@ -430,10 +431,24 @@ static int __init microcode_presmp_init(void) data = ucode_mod_map(&ucode_mod); } if ( data ) - microcode_update_cpu(data, len); + rc = microcode_update_cpu(data, len); + else + rc = -ENOMEM; if ( !ucode_blob.size ) ucode_mod_map(NULL); + + if ( rc ) + { + if ( ucode_blob.size ) + { + xfree(ucode_blob.data); + ucode_blob.size = 0; + ucode_blob.data = NULL; + } + else + ucode_mod.mod_end = 0; + } } register_cpu_notifier(µcode_percpu_nfb); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEN-0004y8-0c; Sat, 28 Sep 2013 17:22:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEM-0004xm-2O for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:58 +0000 Received: from [85.158.143.35:26640] by server-3.bemta-4.messagelabs.com id 16/5F-24907-17017425; Sat, 28 Sep 2013 17:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1380388975!1208134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8256 invoked from network); 28 Sep 2013 17:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEJ-00089t-Ee for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEJ-0005kf-DC for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:55 +0000 Date: Sat, 28 Sep 2013 17:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Load xen under 4GB on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d163c0158f6d9a1a0285397d523ea5b57dc4b95 Author: Ian Campbell AuthorDate: Wed Jun 5 10:08:35 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: Load xen under 4GB on 32-bit We need to be able to use a 1:1 mapping during bring up. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d97b900..315fa1d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -323,6 +323,14 @@ static paddr_t __init get_xen_paddr(void) if ( !e ) continue; +#ifdef CONFIG_ARM_32 + /* Xen must be under 4GB */ + if ( e > 0x100000000ULL ) + e = 0x100000000ULL; + if ( e < bank->start ) + continue; +#endif + s = e - min_size; if ( s > paddr ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEN-0004y8-0c; Sat, 28 Sep 2013 17:22:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEM-0004xm-2O for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:58 +0000 Received: from [85.158.143.35:26640] by server-3.bemta-4.messagelabs.com id 16/5F-24907-17017425; Sat, 28 Sep 2013 17:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1380388975!1208134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8256 invoked from network); 28 Sep 2013 17:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEJ-00089t-Ee for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEJ-0005kf-DC for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:22:55 +0000 Date: Sat, 28 Sep 2013 17:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Load xen under 4GB on 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d163c0158f6d9a1a0285397d523ea5b57dc4b95 Author: Ian Campbell AuthorDate: Wed Jun 5 10:08:35 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: Load xen under 4GB on 32-bit We need to be able to use a 1:1 mapping during bring up. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d97b900..315fa1d 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -323,6 +323,14 @@ static paddr_t __init get_xen_paddr(void) if ( !e ) continue; +#ifdef CONFIG_ARM_32 + /* Xen must be under 4GB */ + if ( e > 0x100000000ULL ) + e = 0x100000000ULL; + if ( e < bank->start ) + continue; +#endif + s = e - min_size; if ( s > paddr ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEY-0004zw-3p; Sat, 28 Sep 2013 17:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEW-0004zX-Lm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:08 +0000 Received: from [85.158.137.68:49511] by server-4.bemta-3.messagelabs.com id D1/08-13758-B7017425; Sat, 28 Sep 2013 17:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1380388985!5324294!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26784 invoked from network); 28 Sep 2013 17:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyET-0008AS-K7 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyET-0005lD-Hb for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:05 +0000 Date: Sat, 28 Sep 2013 17:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: build platform support only on the relevant arch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d33f4d19a535b7f43ade3d169d333d04ec4ca660 Author: Ian Campbell AuthorDate: Fri Sep 27 10:35:47 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: build platform support only on the relevant arch midway, omap5 and exynos are all 32-bit only platforms. This avoids needing CONFIG_ARM_32 ifdefs around the SMP callbacks on such platforms. Vexpress is both. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 4aa82e8..7535801 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -1,4 +1,4 @@ obj-y += vexpress.o -obj-y += exynos5.o -obj-y += midway.o -obj-y += omap5.o +obj-$(CONFIG_ARM_32) += exynos5.o +obj-$(CONFIG_ARM_32) += midway.o +obj-$(CONFIG_ARM_32) += omap5.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEY-0004zw-3p; Sat, 28 Sep 2013 17:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEW-0004zX-Lm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:08 +0000 Received: from [85.158.137.68:49511] by server-4.bemta-3.messagelabs.com id D1/08-13758-B7017425; Sat, 28 Sep 2013 17:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1380388985!5324294!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26784 invoked from network); 28 Sep 2013 17:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyET-0008AS-K7 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyET-0005lD-Hb for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:05 +0000 Date: Sat, 28 Sep 2013 17:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: build platform support only on the relevant arch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d33f4d19a535b7f43ade3d169d333d04ec4ca660 Author: Ian Campbell AuthorDate: Fri Sep 27 10:35:47 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: build platform support only on the relevant arch midway, omap5 and exynos are all 32-bit only platforms. This avoids needing CONFIG_ARM_32 ifdefs around the SMP callbacks on such platforms. Vexpress is both. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 4aa82e8..7535801 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -1,4 +1,4 @@ obj-y += vexpress.o -obj-y += exynos5.o -obj-y += midway.o -obj-y += omap5.o +obj-$(CONFIG_ARM_32) += exynos5.o +obj-$(CONFIG_ARM_32) += midway.o +obj-$(CONFIG_ARM_32) += omap5.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEh-00051i-6e; Sat, 28 Sep 2013 17:23:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEf-00051M-TW for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:18 +0000 Received: from [85.158.143.35:49156] by server-2.bemta-4.messagelabs.com id F7/E4-31802-58017425; Sat, 28 Sep 2013 17:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380388996!7444762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11744 invoked from network); 28 Sep 2013 17:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEd-0008AY-R8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEd-0005mE-ON for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:15 +0000 Date: Sat, 28 Sep 2013 17:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Log the raw MIDR on boot. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fbc4c343e52777e636439e2afcdfb3f100211c3 Author: Ian Campbell AuthorDate: Mon Sep 16 15:47:05 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: Log the raw MIDR on boot. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 315fa1d..23e9577 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -84,8 +84,9 @@ static void __init processor_id(void) printk("Huh, cpu architecture %x, expected 0xf (defined by cpuid)\n", c->midr.architecture); - printk("Processor: \"%s\", variant: 0x%x, part 0x%03x, rev 0x%x\n", - implementer, c->midr.variant, c->midr.part_number, c->midr.revision); + printk("Processor: %08"PRIx32": \"%s\", variant: 0x%x, part 0x%03x, rev 0x%x\n", + c->midr.bits, implementer, + c->midr.variant, c->midr.part_number, c->midr.revision); #if defined(CONFIG_ARM_64) printk("64-bit Execution:\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEh-00051i-6e; Sat, 28 Sep 2013 17:23:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEf-00051M-TW for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:18 +0000 Received: from [85.158.143.35:49156] by server-2.bemta-4.messagelabs.com id F7/E4-31802-58017425; Sat, 28 Sep 2013 17:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1380388996!7444762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11744 invoked from network); 28 Sep 2013 17:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEd-0008AY-R8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEd-0005mE-ON for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:15 +0000 Date: Sat, 28 Sep 2013 17:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Log the raw MIDR on boot. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fbc4c343e52777e636439e2afcdfb3f100211c3 Author: Ian Campbell AuthorDate: Mon Sep 16 15:47:05 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: Log the raw MIDR on boot. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 315fa1d..23e9577 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -84,8 +84,9 @@ static void __init processor_id(void) printk("Huh, cpu architecture %x, expected 0xf (defined by cpuid)\n", c->midr.architecture); - printk("Processor: \"%s\", variant: 0x%x, part 0x%03x, rev 0x%x\n", - implementer, c->midr.variant, c->midr.part_number, c->midr.revision); + printk("Processor: %08"PRIx32": \"%s\", variant: 0x%x, part 0x%03x, rev 0x%x\n", + c->midr.bits, implementer, + c->midr.variant, c->midr.part_number, c->midr.revision); #if defined(CONFIG_ARM_64) printk("64-bit Execution:\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23: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 1VPyEs-00053a-9c; Sat, 28 Sep 2013 17:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEq-00053J-Ts for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:29 +0000 Received: from [85.158.139.211:59181] by server-16.bemta-5.messagelabs.com id 7B/F7-03533-09017425; Sat, 28 Sep 2013 17:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380389006!5172011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30687 invoked from network); 28 Sep 2013 17:23:27 -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; 28 Sep 2013 17:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEo-0008Ae-1B for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEn-0005mc-Vb for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:26 +0000 Date: Sat, 28 Sep 2013 17:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make sure we stay within the memory bank during mm 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 7b8fca21dfe5584ec8d4c83c24859b1306328c79 Author: Ian Campbell AuthorDate: Mon Sep 16 17:57:08 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: make sure we stay within the memory bank during mm setup Otherwise if there is a module in another bank we can run off the end. Rename *n to *end to make it clearer what is happening. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/setup.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 23e9577..d615b4a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -264,9 +264,11 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, * Return the end of the non-module region starting at s. In other * words return s the start of the next modules after s. * - * Also returns the end of that module in *n. + * On input *end is the end of the region which should be considered + * and it is updated to reflect the end of the module, clipped to the + * end of the region if it would run over. */ -static paddr_t __init next_module(paddr_t s, paddr_t *n) +static paddr_t __init next_module(paddr_t s, paddr_t *end) { struct dt_module_info *mi = &early_info.modules; paddr_t lowest = ~(paddr_t)0; @@ -281,8 +283,10 @@ static paddr_t __init next_module(paddr_t s, paddr_t *n) continue; if ( mod_s > lowest ) continue; + if ( mod_s > *end ) + continue; lowest = mod_s; - *n = mod_e; + *end = min(*end, mod_e); } return lowest; } @@ -528,6 +532,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) e = n = bank_end; } + if ( e > bank_end ) + e = bank_end; + setup_xenheap_mappings(s>>PAGE_SHIFT, (e-s)>>PAGE_SHIFT); xenheap_mfn_end = e; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23: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 1VPyEs-00053a-9c; Sat, 28 Sep 2013 17:23:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEq-00053J-Ts for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:29 +0000 Received: from [85.158.139.211:59181] by server-16.bemta-5.messagelabs.com id 7B/F7-03533-09017425; Sat, 28 Sep 2013 17:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380389006!5172011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30687 invoked from network); 28 Sep 2013 17:23:27 -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; 28 Sep 2013 17:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEo-0008Ae-1B for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEn-0005mc-Vb for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:26 +0000 Date: Sat, 28 Sep 2013 17:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: make sure we stay within the memory bank during mm 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 7b8fca21dfe5584ec8d4c83c24859b1306328c79 Author: Ian Campbell AuthorDate: Mon Sep 16 17:57:08 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: make sure we stay within the memory bank during mm setup Otherwise if there is a module in another bank we can run off the end. Rename *n to *end to make it clearer what is happening. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/setup.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 23e9577..d615b4a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -264,9 +264,11 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, * Return the end of the non-module region starting at s. In other * words return s the start of the next modules after s. * - * Also returns the end of that module in *n. + * On input *end is the end of the region which should be considered + * and it is updated to reflect the end of the module, clipped to the + * end of the region if it would run over. */ -static paddr_t __init next_module(paddr_t s, paddr_t *n) +static paddr_t __init next_module(paddr_t s, paddr_t *end) { struct dt_module_info *mi = &early_info.modules; paddr_t lowest = ~(paddr_t)0; @@ -281,8 +283,10 @@ static paddr_t __init next_module(paddr_t s, paddr_t *n) continue; if ( mod_s > lowest ) continue; + if ( mod_s > *end ) + continue; lowest = mod_s; - *n = mod_e; + *end = min(*end, mod_e); } return lowest; } @@ -528,6 +532,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) e = n = bank_end; } + if ( e > bank_end ) + e = bank_end; + setup_xenheap_mappings(s>>PAGE_SHIFT, (e-s)>>PAGE_SHIFT); xenheap_mfn_end = e; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17: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 1VPyF2-00055Y-Cp; Sat, 28 Sep 2013 17:23:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyF0-00055B-UT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:39 +0000 Received: from [85.158.139.211:53248] by server-16.bemta-5.messagelabs.com id 06/08-03533-A9017425; Sat, 28 Sep 2013 17:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380389016!5174262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10648 invoked from network); 28 Sep 2013 17:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEy-0008An-5u for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEy-0005n7-4N for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:36 +0000 Date: Sat, 28 Sep 2013 17:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add two new device tree helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1dbd62d48ef6b82fd6f4906e37ae1a8f873a2cf Author: Ian Campbell AuthorDate: Tue Sep 17 02:27:49 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: add two new device tree helpers - dt_property_read_u64 - dt_find_node_by_type Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/common/device_tree.c | 29 +++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 17 +++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 4a1391c..27ee708 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -511,6 +511,21 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, return 1; } + +bool_t dt_property_read_u64(const struct dt_device_node *np, + const char *name, u64 *out_value) +{ + u32 len; + const __be32 *val; + + val = dt_get_property(np, name, &len); + if ( !val || len < sizeof(*out_value) ) + return 0; + + *out_value = dt_read_number(val, 2); + + return 1; +} int dt_property_read_string(const struct dt_device_node *np, const char *propname, const char **out_string) { @@ -576,6 +591,20 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from, return np; } +struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, + const char *type) +{ + struct dt_device_node *np; + struct dt_device_node *dt; + + dt = from ? from->allnext : dt_host; + dt_for_each_device_node(dt, np) + if ( np->type && (dt_node_cmp(np->type, type) == 0) ) + break; + + return np; +} + struct dt_device_node *dt_find_node_by_path(const char *path) { struct dt_device_node *np; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index a665c97..da78c9f 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -352,6 +352,17 @@ const void *dt_get_property(const struct dt_device_node *np, bool_t dt_property_read_u32(const struct dt_device_node *np, const char *name, u32 *out_value); /** + * dt_property_read_u64 - Helper to read a u64 property. + * @np: node to get the value + * @name: name of the property + * @out_value: pointer to return value + * + * Return true if get the desired value. + */ +bool_t dt_property_read_u64(const struct dt_device_node *np, + const char *name, u64 *out_value); + +/** * dt_property_read_string - Find and read a string from a property * @np: Device node from which the property value is to be read * @propname: Name of the property to be searched @@ -400,6 +411,12 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *node, const char *name); /** + * dt_find_node_by_type - Find a node by its "type" property + */ +struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, + const char *type); + +/** * df_find_node_by_alias - Find a node matching an alias * @alias: The alias to match * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17: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 1VPyF2-00055Y-Cp; Sat, 28 Sep 2013 17:23:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyF0-00055B-UT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:39 +0000 Received: from [85.158.139.211:53248] by server-16.bemta-5.messagelabs.com id 06/08-03533-A9017425; Sat, 28 Sep 2013 17:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380389016!5174262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10648 invoked from network); 28 Sep 2013 17:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyEy-0008An-5u for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyEy-0005n7-4N for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:36 +0000 Date: Sat, 28 Sep 2013 17:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add two new device tree helpers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1dbd62d48ef6b82fd6f4906e37ae1a8f873a2cf Author: Ian Campbell AuthorDate: Tue Sep 17 02:27:49 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: add two new device tree helpers - dt_property_read_u64 - dt_find_node_by_type Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/common/device_tree.c | 29 +++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 17 +++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 4a1391c..27ee708 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -511,6 +511,21 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, return 1; } + +bool_t dt_property_read_u64(const struct dt_device_node *np, + const char *name, u64 *out_value) +{ + u32 len; + const __be32 *val; + + val = dt_get_property(np, name, &len); + if ( !val || len < sizeof(*out_value) ) + return 0; + + *out_value = dt_read_number(val, 2); + + return 1; +} int dt_property_read_string(const struct dt_device_node *np, const char *propname, const char **out_string) { @@ -576,6 +591,20 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from, return np; } +struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, + const char *type) +{ + struct dt_device_node *np; + struct dt_device_node *dt; + + dt = from ? from->allnext : dt_host; + dt_for_each_device_node(dt, np) + if ( np->type && (dt_node_cmp(np->type, type) == 0) ) + break; + + return np; +} + struct dt_device_node *dt_find_node_by_path(const char *path) { struct dt_device_node *np; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index a665c97..da78c9f 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -352,6 +352,17 @@ const void *dt_get_property(const struct dt_device_node *np, bool_t dt_property_read_u32(const struct dt_device_node *np, const char *name, u32 *out_value); /** + * dt_property_read_u64 - Helper to read a u64 property. + * @np: node to get the value + * @name: name of the property + * @out_value: pointer to return value + * + * Return true if get the desired value. + */ +bool_t dt_property_read_u64(const struct dt_device_node *np, + const char *name, u64 *out_value); + +/** * dt_property_read_string - Find and read a string from a property * @np: Device node from which the property value is to be read * @propname: Name of the property to be searched @@ -400,6 +411,12 @@ struct dt_device_node *dt_find_node_by_name(struct dt_device_node *node, const char *name); /** + * dt_find_node_by_type - Find a node by its "type" property + */ +struct dt_device_node *dt_find_node_by_type(struct dt_device_node *from, + const char *type); + +/** * df_find_node_by_alias - Find a node matching an alias * @alias: The alias to match * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFC-00057B-G1; Sat, 28 Sep 2013 17:23:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFB-00056w-4t for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:49 +0000 Received: from [85.158.143.35:32263] by server-2.bemta-4.messagelabs.com id 16/05-31802-4A017425; Sat, 28 Sep 2013 17:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1380389026!2619032!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27772 invoked from network); 28 Sep 2013 17:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyF8-0008As-BU for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyF8-0005nW-A3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:46 +0000 Date: Sat, 28 Sep 2013 17:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement arch/platform SMP and CPU initialisation framework X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f474d3b4727c838ece492661be420387e4e55866 Author: Ian Campbell AuthorDate: Fri Sep 20 23:29:44 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: implement arch/platform SMP and CPU initialisation framework Includes an implementation for vexpress using the sysflags interface and support for the ARMv8 "spin-table" method. Unused until "rewrite start of day page table and cpu bring up", split out to simplify review. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm32/smpboot.c | 29 ++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/arm64/smpboot.c | 89 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/platform.c | 18 +++++++ xen/arch/arm/platforms/vexpress.c | 38 ++++++++++++++++ xen/include/asm-arm/platform.h | 9 ++++ xen/include/asm-arm/smp.h | 9 ++++ 10 files changed, 196 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 18522dc..463b1f5 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -7,5 +7,6 @@ obj-y += proc-v7.o obj-y += traps.o obj-y += domain.o obj-y += vfp.o +obj-y += smpboot.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 2fcd38a..bbcb3a0 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -59,7 +59,7 @@ * or the initial pagetable code below will need adjustment. */ .global start start: - +GLOBAL(init_secondary) /* currently unused */ /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ diff --git a/xen/arch/arm/arm32/smpboot.c b/xen/arch/arm/arm32/smpboot.c new file mode 100644 index 0000000..88fe8fb --- /dev/null +++ b/xen/arch/arm/arm32/smpboot.c @@ -0,0 +1,29 @@ +#include +#include +#include +#include + +int __init arch_smp_init(void) +{ + return platform_smp_init(); +} + +int __init arch_cpu_init(int cpu, struct dt_device_node *dn) +{ + /* TODO handle PSCI init */ + return 0; +} + +int __init arch_cpu_up(int cpu) +{ + return platform_cpu_up(cpu); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index e06a0a9..30fb480 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -6,5 +6,6 @@ obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o obj-y += vfp.o +obj-y += smpboot.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index bc95972..ac1b75a 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -65,6 +65,7 @@ .global start start: +GLOBAL(init_secondary) /* currently unused */ /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c new file mode 100644 index 0000000..8239590 --- /dev/null +++ b/xen/arch/arm/arm64/smpboot.c @@ -0,0 +1,89 @@ +#include +#include +#include +#include +#include +#include + +struct smp_enable_ops { + int (*prepare_cpu)(int); +}; + +static paddr_t cpu_release_addr[NR_CPUS]; +static struct smp_enable_ops smp_enable_ops[NR_CPUS]; + +static int __init smp_spin_table_cpu_up(int cpu) +{ + paddr_t *release; + + if (!cpu_release_addr[cpu]) + { + printk("CPU%d: No release addr\n", cpu); + return -ENODEV; + } + + release = __va(cpu_release_addr[cpu]); + + release[0] = __pa(init_secondary); + flush_xen_data_tlb_range_va((vaddr_t)release, sizeof(*release)); + + sev(); + return 0; +} + +static void __init smp_spin_table_init(int cpu, struct dt_device_node *dn) +{ + if ( !dt_property_read_u64(dn, "cpu-release-addr", &cpu_release_addr[cpu]) ) + { + printk("CPU%d has no cpu-release-addr\n", cpu); + return; + } + + smp_enable_ops[cpu].prepare_cpu = smp_spin_table_cpu_up; +} + +int __init arch_smp_init(void) +{ + /* Nothing */ + return 0; +} + +int __init arch_cpu_init(int cpu, struct dt_device_node *dn) +{ + const char *enable_method; + + enable_method = dt_get_property(dn, "enable-method", NULL); + if (!enable_method) + { + printk("CPU%d has no enable method\n", cpu); + return -EINVAL; + } + + if ( !strcmp(enable_method, "spin-table") ) + smp_spin_table_init(cpu, dn); + /* TODO: method "psci" */ + else + { + printk("CPU%d has unknown enable method \"%s\"\n", cpu, enable_method); + return -EINVAL; + } + + return 0; +} + +int __init arch_cpu_up(int cpu) +{ + if ( !smp_enable_ops[cpu].prepare_cpu ) + return -ENODEV; + + return smp_enable_ops[cpu].prepare_cpu(cpu); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db79368..db135f8 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -105,6 +105,24 @@ int __init platform_specific_mapping(struct domain *d) return res; } +#ifdef CONFIG_ARM_32 +int __init platform_cpu_up(int cpu) +{ + if ( platform && platform->cpu_up ) + return platform->cpu_up(cpu); + + return -EAGAIN; +} + +int __init platform_smp_init(void) +{ + if ( platform && platform->smp_init ) + return platform->smp_init(); + + return 0; +} +#endif + void platform_reset(void) { if ( platform && platform->reset ) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 22c0c13..b9d85af 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -22,6 +22,7 @@ #include #include #include +#include #define DCC_SHIFT 26 #define FUNCTION_SHIFT 20 @@ -120,6 +121,39 @@ static void vexpress_reset(void) iounmap(sp810); } +#ifdef CONFIG_ARM_32 + +static int __init vexpress_smp_init(void) +{ + void __iomem *sysflags; + + sysflags = ioremap_nocache(V2M_SYS_MMIO_BASE, PAGE_SIZE); + if ( !sysflags ) + { + dprintk(XENLOG_ERR, "Unable to map vexpress MMIO\n"); + return -EFAULT; + } + + printk("Set SYS_FLAGS to %"PRIpaddr" (%p)\n", + __pa(init_secondary), init_secondary); + writel(~0, sysflags + V2M_SYS_FLAGSCLR); + writel(__pa(init_secondary), sysflags + V2M_SYS_FLAGSSET); + + iounmap(sysflags); + + return 0; +} + +static int __init vexpress_cpu_up(int cpu) +{ + /* Nothing to do here, the generic sev() will suffice to kick CPUs + * out of either the firmware or our own smp_up_cpu gate, + * depending on where they have ended up. */ + + return 0; +} +#endif + static const char * const vexpress_dt_compat[] __initdata = { "arm,vexpress", @@ -144,6 +178,10 @@ static const struct dt_device_match vexpress_blacklist_dev[] __initconst = PLATFORM_START(vexpress, "VERSATILE EXPRESS") .compatible = vexpress_dt_compat, +#ifdef CONFIG_ARM_32 + .smp_init = vexpress_smp_init, + .cpu_up = vexpress_cpu_up, +#endif .reset = vexpress_reset, .blacklist_dev = vexpress_blacklist_dev, PLATFORM_END diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index a19dbf7..dbd2a15 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -15,6 +15,11 @@ struct platform_desc { /* Platform initialization */ int (*init)(void); int (*init_time)(void); +#ifdef CONFIG_ARM_32 + /* SMP */ + int (*smp_init)(void); + int (*cpu_up)(int cpu); +#endif /* Specific mapping for dom0 */ int (*specific_mapping)(struct domain *d); /* Platform reset */ @@ -43,6 +48,10 @@ struct platform_desc { int __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); +#ifdef CONFIG_ARM_32 +int platform_smp_init(void); +int platform_cpu_up(int cpu); +#endif void platform_reset(void); void platform_poweroff(void); bool_t platform_has_quirk(uint32_t quirk); diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 1c2746b..1added5 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -4,6 +4,7 @@ #ifndef __ASSEMBLY__ #include #include +#include #include #endif @@ -22,9 +23,17 @@ extern void stop_cpu(void); extern void make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset); +extern int arch_smp_init(void); +extern int arch_cpu_init(int cpu, struct dt_device_node *dn); +extern int arch_cpu_up(int cpu); + +/* Secondary CPU entry point */ +extern void init_secondary(void); + extern void smp_clear_cpu_maps (void); extern int smp_get_max_cpus (void); #endif + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:23:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:23:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFC-00057B-G1; Sat, 28 Sep 2013 17:23:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFB-00056w-4t for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:49 +0000 Received: from [85.158.143.35:32263] by server-2.bemta-4.messagelabs.com id 16/05-31802-4A017425; Sat, 28 Sep 2013 17:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1380389026!2619032!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27772 invoked from network); 28 Sep 2013 17:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyF8-0008As-BU for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyF8-0005nW-A3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:46 +0000 Date: Sat, 28 Sep 2013 17:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement arch/platform SMP and CPU initialisation framework X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f474d3b4727c838ece492661be420387e4e55866 Author: Ian Campbell AuthorDate: Fri Sep 20 23:29:44 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:39:03 2013 +0100 xen: arm: implement arch/platform SMP and CPU initialisation framework Includes an implementation for vexpress using the sysflags interface and support for the ARMv8 "spin-table" method. Unused until "rewrite start of day page table and cpu bring up", split out to simplify review. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm32/smpboot.c | 29 ++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/arm64/smpboot.c | 89 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/platform.c | 18 +++++++ xen/arch/arm/platforms/vexpress.c | 38 ++++++++++++++++ xen/include/asm-arm/platform.h | 9 ++++ xen/include/asm-arm/smp.h | 9 ++++ 10 files changed, 196 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 18522dc..463b1f5 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -7,5 +7,6 @@ obj-y += proc-v7.o obj-y += traps.o obj-y += domain.o obj-y += vfp.o +obj-y += smpboot.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 2fcd38a..bbcb3a0 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -59,7 +59,7 @@ * or the initial pagetable code below will need adjustment. */ .global start start: - +GLOBAL(init_secondary) /* currently unused */ /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ diff --git a/xen/arch/arm/arm32/smpboot.c b/xen/arch/arm/arm32/smpboot.c new file mode 100644 index 0000000..88fe8fb --- /dev/null +++ b/xen/arch/arm/arm32/smpboot.c @@ -0,0 +1,29 @@ +#include +#include +#include +#include + +int __init arch_smp_init(void) +{ + return platform_smp_init(); +} + +int __init arch_cpu_init(int cpu, struct dt_device_node *dn) +{ + /* TODO handle PSCI init */ + return 0; +} + +int __init arch_cpu_up(int cpu) +{ + return platform_cpu_up(cpu); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index e06a0a9..30fb480 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -6,5 +6,6 @@ obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o obj-y += vfp.o +obj-y += smpboot.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index bc95972..ac1b75a 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -65,6 +65,7 @@ .global start start: +GLOBAL(init_secondary) /* currently unused */ /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c new file mode 100644 index 0000000..8239590 --- /dev/null +++ b/xen/arch/arm/arm64/smpboot.c @@ -0,0 +1,89 @@ +#include +#include +#include +#include +#include +#include + +struct smp_enable_ops { + int (*prepare_cpu)(int); +}; + +static paddr_t cpu_release_addr[NR_CPUS]; +static struct smp_enable_ops smp_enable_ops[NR_CPUS]; + +static int __init smp_spin_table_cpu_up(int cpu) +{ + paddr_t *release; + + if (!cpu_release_addr[cpu]) + { + printk("CPU%d: No release addr\n", cpu); + return -ENODEV; + } + + release = __va(cpu_release_addr[cpu]); + + release[0] = __pa(init_secondary); + flush_xen_data_tlb_range_va((vaddr_t)release, sizeof(*release)); + + sev(); + return 0; +} + +static void __init smp_spin_table_init(int cpu, struct dt_device_node *dn) +{ + if ( !dt_property_read_u64(dn, "cpu-release-addr", &cpu_release_addr[cpu]) ) + { + printk("CPU%d has no cpu-release-addr\n", cpu); + return; + } + + smp_enable_ops[cpu].prepare_cpu = smp_spin_table_cpu_up; +} + +int __init arch_smp_init(void) +{ + /* Nothing */ + return 0; +} + +int __init arch_cpu_init(int cpu, struct dt_device_node *dn) +{ + const char *enable_method; + + enable_method = dt_get_property(dn, "enable-method", NULL); + if (!enable_method) + { + printk("CPU%d has no enable method\n", cpu); + return -EINVAL; + } + + if ( !strcmp(enable_method, "spin-table") ) + smp_spin_table_init(cpu, dn); + /* TODO: method "psci" */ + else + { + printk("CPU%d has unknown enable method \"%s\"\n", cpu, enable_method); + return -EINVAL; + } + + return 0; +} + +int __init arch_cpu_up(int cpu) +{ + if ( !smp_enable_ops[cpu].prepare_cpu ) + return -ENODEV; + + return smp_enable_ops[cpu].prepare_cpu(cpu); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db79368..db135f8 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -105,6 +105,24 @@ int __init platform_specific_mapping(struct domain *d) return res; } +#ifdef CONFIG_ARM_32 +int __init platform_cpu_up(int cpu) +{ + if ( platform && platform->cpu_up ) + return platform->cpu_up(cpu); + + return -EAGAIN; +} + +int __init platform_smp_init(void) +{ + if ( platform && platform->smp_init ) + return platform->smp_init(); + + return 0; +} +#endif + void platform_reset(void) { if ( platform && platform->reset ) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 22c0c13..b9d85af 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -22,6 +22,7 @@ #include #include #include +#include #define DCC_SHIFT 26 #define FUNCTION_SHIFT 20 @@ -120,6 +121,39 @@ static void vexpress_reset(void) iounmap(sp810); } +#ifdef CONFIG_ARM_32 + +static int __init vexpress_smp_init(void) +{ + void __iomem *sysflags; + + sysflags = ioremap_nocache(V2M_SYS_MMIO_BASE, PAGE_SIZE); + if ( !sysflags ) + { + dprintk(XENLOG_ERR, "Unable to map vexpress MMIO\n"); + return -EFAULT; + } + + printk("Set SYS_FLAGS to %"PRIpaddr" (%p)\n", + __pa(init_secondary), init_secondary); + writel(~0, sysflags + V2M_SYS_FLAGSCLR); + writel(__pa(init_secondary), sysflags + V2M_SYS_FLAGSSET); + + iounmap(sysflags); + + return 0; +} + +static int __init vexpress_cpu_up(int cpu) +{ + /* Nothing to do here, the generic sev() will suffice to kick CPUs + * out of either the firmware or our own smp_up_cpu gate, + * depending on where they have ended up. */ + + return 0; +} +#endif + static const char * const vexpress_dt_compat[] __initdata = { "arm,vexpress", @@ -144,6 +178,10 @@ static const struct dt_device_match vexpress_blacklist_dev[] __initconst = PLATFORM_START(vexpress, "VERSATILE EXPRESS") .compatible = vexpress_dt_compat, +#ifdef CONFIG_ARM_32 + .smp_init = vexpress_smp_init, + .cpu_up = vexpress_cpu_up, +#endif .reset = vexpress_reset, .blacklist_dev = vexpress_blacklist_dev, PLATFORM_END diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index a19dbf7..dbd2a15 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -15,6 +15,11 @@ struct platform_desc { /* Platform initialization */ int (*init)(void); int (*init_time)(void); +#ifdef CONFIG_ARM_32 + /* SMP */ + int (*smp_init)(void); + int (*cpu_up)(int cpu); +#endif /* Specific mapping for dom0 */ int (*specific_mapping)(struct domain *d); /* Platform reset */ @@ -43,6 +48,10 @@ struct platform_desc { int __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); +#ifdef CONFIG_ARM_32 +int platform_smp_init(void); +int platform_cpu_up(int cpu); +#endif void platform_reset(void); void platform_poweroff(void); bool_t platform_has_quirk(uint32_t quirk); diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 1c2746b..1added5 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -4,6 +4,7 @@ #ifndef __ASSEMBLY__ #include #include +#include #include #endif @@ -22,9 +23,17 @@ extern void stop_cpu(void); extern void make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset); +extern int arch_smp_init(void); +extern int arch_cpu_init(int cpu, struct dt_device_node *dn); +extern int arch_cpu_up(int cpu); + +/* Secondary CPU entry point */ +extern void init_secondary(void); + extern void smp_clear_cpu_maps (void); extern int smp_get_max_cpus (void); #endif + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFM-000597-LK; Sat, 28 Sep 2013 17:24:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFL-00058h-9q for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:59 +0000 Received: from [85.158.139.211:55574] by server-4.bemta-5.messagelabs.com id 30/41-17194-EA017425; Sat, 28 Sep 2013 17:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1380389036!2492313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28748 invoked from network); 28 Sep 2013 17:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFI-0008B1-Hm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFI-0005nu-Fr for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:56 +0000 Date: Sat, 28 Sep 2013 17:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement smp initialisation callbacks for exynos5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09d1e8de8099ed2e3f75c8fe10750ad1b9b5264f Author: Ian Campbell AuthorDate: Fri Sep 27 10:38:21 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:43 2013 +0100 xen: arm: implement smp initialisation callbacks for exynos5 These were removed in "xen: arm: rewrite start of day page table and cpu bring up". Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 36d2325..a2bf916 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -65,6 +65,35 @@ static int exynos5_specific_mapping(struct domain *d) return 0; } +static int __init exynos5_smp_init(void) +{ + void __iomem *sysram; + + sysram = ioremap_nocache(S5P_PA_SYSRAM, PAGE_SIZE); + if ( !sysram ) + { + dprintk(XENLOG_ERR, "Unable to map exynos5 MMIO\n"); + return -EFAULT; + } + + printk("Set SYSRAM to %"PRIpaddr" (%p)\n", + __pa(init_secondary), init_secondary); + writel(__pa(init_secondary), sysram); + + iounmap(sysram); + + return 0; +} + +static int __init exynos5_cpu_up(int cpu) +{ + /* Nothing to do here, the generic sev() will suffice to kick CPUs + * out of either the firmware or our own smp_up_cpu gate, + * depending on where they have ended up. */ + + return 0; +} + static void exynos5_reset(void) { void __iomem *pmu; @@ -107,6 +136,8 @@ PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, .specific_mapping = exynos5_specific_mapping, + .smp_init = exynos5_smp_init, + .cpu_up = exynos5_cpu_up, .reset = exynos5_reset, .quirks = exynos5_quirks, .blacklist_dev = exynos5_blacklist_dev, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFM-000597-LK; Sat, 28 Sep 2013 17:24:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFL-00058h-9q for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:59 +0000 Received: from [85.158.139.211:55574] by server-4.bemta-5.messagelabs.com id 30/41-17194-EA017425; Sat, 28 Sep 2013 17:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1380389036!2492313!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28748 invoked from network); 28 Sep 2013 17:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFI-0008B1-Hm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFI-0005nu-Fr for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:23:56 +0000 Date: Sat, 28 Sep 2013 17:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement smp initialisation callbacks for exynos5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09d1e8de8099ed2e3f75c8fe10750ad1b9b5264f Author: Ian Campbell AuthorDate: Fri Sep 27 10:38:21 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:43 2013 +0100 xen: arm: implement smp initialisation callbacks for exynos5 These were removed in "xen: arm: rewrite start of day page table and cpu bring up". Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 36d2325..a2bf916 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -65,6 +65,35 @@ static int exynos5_specific_mapping(struct domain *d) return 0; } +static int __init exynos5_smp_init(void) +{ + void __iomem *sysram; + + sysram = ioremap_nocache(S5P_PA_SYSRAM, PAGE_SIZE); + if ( !sysram ) + { + dprintk(XENLOG_ERR, "Unable to map exynos5 MMIO\n"); + return -EFAULT; + } + + printk("Set SYSRAM to %"PRIpaddr" (%p)\n", + __pa(init_secondary), init_secondary); + writel(__pa(init_secondary), sysram); + + iounmap(sysram); + + return 0; +} + +static int __init exynos5_cpu_up(int cpu) +{ + /* Nothing to do here, the generic sev() will suffice to kick CPUs + * out of either the firmware or our own smp_up_cpu gate, + * depending on where they have ended up. */ + + return 0; +} + static void exynos5_reset(void) { void __iomem *pmu; @@ -107,6 +136,8 @@ PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, .specific_mapping = exynos5_specific_mapping, + .smp_init = exynos5_smp_init, + .cpu_up = exynos5_cpu_up, .reset = exynos5_reset, .quirks = exynos5_quirks, .blacklist_dev = exynos5_blacklist_dev, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFb-0005BN-Q2; Sat, 28 Sep 2013 17:24:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFZ-0005An-2M for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:13 +0000 Received: from [85.158.139.211:55975] by server-9.bemta-5.messagelabs.com id C6/1B-24493-CB017425; Sat, 28 Sep 2013 17:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1380389047!5174927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1948 invoked from network); 28 Sep 2013 17:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFT-0008CA-0P for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFS-0005oS-R3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:06 +0000 Date: Sat, 28 Sep 2013 17:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rewrite start of day page table and cpu bring up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4557c2292854d047ba8e44a69e2d60d99533d155 Author: Ian Campbell AuthorDate: Thu Aug 29 16:25:00 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: rewrite start of day page table and cpu bring up This is unfortunately a rather large monolithic patch. Rather than bringing up all CPUs in lockstep as we setup paging and relocate Xen instead create a simplified set of dedicated boot time pagetables. This allows secondary CPUs to remain powered down or in the firmware until we actually want to enable them. The bringup is now done later on in C and can be driven by DT etc. I have included code for the vexpress platform, but other platforms will need to be added. The mechanism for deciding how to bring up a CPU differs between arm32 and arm64. On arm32 it is essentially a per-platform property, with the exception of PSCI which can be implemented globally (but isn't here). On arm64 there is a per-cpu property in the device tree. Secondary CPUs are brought up directly into the relocated Xen image, instead of relying on being able to launch on the unrelocated Xen and hoping that it hasn't been clobbered. As part of this change drop support for switching from secure mode to NS HYP as well as the early CPU kick. Xen now requires that it is launched in NS HYP mode and that firmware configure things such that secondary CPUs can be woken up by a primarly CPU in HYP mode. This may require fixes to bootloaders or the use of a boot wrapper. The changes done here (re)exposed an issue with relocating Xen and the compiler spilling values to the stack between the copy and the actual switch to the relocaed copy of Xen in setup_pagetables. Therefore switch to doing the copy and switch in a single asm function where we can control precisely what gets spilled to the stack etc. Since we now have a separate set of boot pagetables it is much easier to build the real Xen pagetables inplace before relocating rather than the more complex approach of rewriting the pagetables in the relocated copy before switching. This will also enable Xen to be loaded above the 4GB boundary on 64-bit. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 - xen/arch/arm/arm32/head.S | 391 +++++++++++++++++++----------- xen/arch/arm/arm32/mode_switch.S | 158 ------------ xen/arch/arm/arm64/Makefile | 1 - xen/arch/arm/arm64/head.S | 396 ++++++++++++++++++++---------- xen/arch/arm/arm64/mode_switch.S | 89 ------- xen/arch/arm/mm.c | 197 +++++++++------ xen/arch/arm/setup.c | 30 ++- xen/arch/arm/smpboot.c | 57 ++--- xen/include/asm-arm/mm.h | 3 +- xen/include/asm-arm/platforms/exynos5.h | 14 - xen/include/asm-arm/platforms/vexpress.h | 11 - xen/include/asm-arm/smp.h | 6 - 13 files changed, 679 insertions(+), 675 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 463b1f5..aacdcb9 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -1,7 +1,6 @@ subdir-y += lib obj-y += entry.o -obj-y += mode_switch.o obj-y += proc-v7.o obj-y += traps.o diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index bbcb3a0..510ccff 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -37,6 +37,25 @@ #include EARLY_PRINTK_INC #endif +/* + * Common register usage in this file: + * r0 - + * r1 - + * r2 - + * r3 - + * r4 - + * r5 - + * r6 - + * r7 - CPUID + * r8 - DTB address (boot CPU only) + * r9 - paddr(start) + * r10 - phys offset + * r11 - UART address + * r12 - is_secondary_cpu + * r13 - SP + * r14 - LR + * r15 - PC + */ /* Macro to print a string to the UART, if there is one. * Clobbers r0-r3. */ #ifdef EARLY_PRINTK @@ -59,7 +78,6 @@ * or the initial pagetable code below will need adjustment. */ .global start start: -GLOBAL(init_secondary) /* currently unused */ /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ @@ -77,7 +95,6 @@ past_zImage: cpsid aif /* Disable all interrupts */ /* Save the bootloader arguments in less-clobberable registers */ - mov r5, r1 /* r5: ARM-linux machine type */ mov r8, r2 /* r8 := DTB base address */ /* Find out where we are */ @@ -91,53 +108,55 @@ past_zImage: add r8, r10 /* r8 := paddr(DTB) */ #endif - /* Are we the boot CPU? */ - mov r12, #0 /* r12 := CPU ID */ - mrc CP32(r0, MPIDR) - tst r0, #(1<<31) /* Multiprocessor extension supported? */ - beq boot_cpu - tst r0, #(1<<30) /* Uniprocessor system? */ - bne boot_cpu - bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ - beq boot_cpu /* If we're CPU 0, boot now */ - - /* Non-boot CPUs wait here to be woken up one at a time. */ -1: dsb - ldr r0, =smp_up_cpu /* VA of gate */ - add r0, r0, r10 /* PA of gate */ - ldr r1, [r0] /* Which CPU is being booted? */ - teq r1, r12 /* Is it us? */ - wfene - bne 1b + mov r12, #0 /* r12 := is_secondary_cpu */ + + b common_start + +GLOBAL(init_secondary) + cpsid aif /* Disable all interrupts */ + + /* Find out where we are */ + ldr r0, =start + adr r9, start /* r9 := paddr (start) */ + sub r10, r9, r0 /* r10 := phys-offset */ + + mov r12, #1 /* r12 := is_secondary_cpu */ + +common_start: + mov r7, #0 /* r7 := CPU ID. Initialy zero until we + * find that multiprocessor extensions are + * present and the system is SMP */ + mrc CP32(r1, MPIDR) + tst r1, #(1<<31) /* Multiprocessor extension supported? */ + beq 1f + tst r1, #(1<<30) /* Uniprocessor system? */ + bne 1f + bic r7, r1, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ +1: + + /* Non-boot CPUs wait here until __cpu_up is ready for them */ + teq r12, #0 + beq 1f + + ldr r0, =smp_up_cpu + add r0, r0, r10 /* Apply physical offset */ + dsb +2: ldr r1, [r0] + cmp r1, r7 + beq 1f + wfe + b 2b +1: -boot_cpu: #ifdef EARLY_PRINTK ldr r11, =EARLY_UART_BASE_ADDRESS /* r11 := UART base address */ - teq r12, #0 /* CPU 0 sets up the UART too */ + teq r12, #0 /* Boot CPU sets up the UART too */ bleq init_uart PRINT("- CPU ") - mov r0, r12 + mov r0, r7 bl putn PRINT(" booting -\r\n") #endif - /* Secondary CPUs doesn't have machine ID - * - Store machine ID on boot CPU - * - Load machine ID on secondary CPUs - * Machine ID is needed in kick_cpus and enter_hyp_mode */ - ldr r0, =machine_id /* VA of machine_id */ - add r0, r0, r10 /* PA of machine_id */ - teq r12, #0 - streq r5, [r0] /* On boot CPU save machine ID */ - ldrne r5, [r0] /* If non boot cpu r5 := machine ID */ - - /* Wake up secondary cpus */ - teq r12, #0 - bleq kick_cpus - - PRINT("- Machine ID ") - mov r0, r5 - bl putn - PRINT(" -\r\n") /* Check that this CPU has Hyp mode */ mrc CP32(r0, ID_PFR1) @@ -147,28 +166,19 @@ boot_cpu: PRINT("- CPU doesn't support the virtualization extensions -\r\n") b fail 1: - /* Check if we're already in it */ + + /* Check that we're already in Hyp mode */ mrs r0, cpsr and r0, r0, #0x1f /* Mode is in the low 5 bits of CPSR */ teq r0, #0x1a /* Hyp Mode? */ - bne 1f - PRINT("- Started in Hyp mode -\r\n") - b hyp -1: - /* Otherwise, it must have been Secure Supervisor mode */ - mrc CP32(r0, SCR) - tst r0, #0x1 /* Not-Secure bit set? */ - beq 1f - PRINT("- CPU is not in Hyp mode or Secure state -\r\n") + beq hyp + + /* OK, we're boned. */ + PRINT("- Xen must be entered in NS Hyp mode -\r\n" \ + "- Please update the bootloader -\r\n") b fail -1: - /* OK, we're in Secure state. */ - PRINT("- Started in Secure state -\r\n- Entering Hyp mode -\r\n") - ldr r0, =enter_hyp_mode /* VA of function */ - adr lr, hyp /* Set return address for call */ - add pc, r0, r10 /* Call PA of function */ -hyp: +hyp: PRINT("- Xen starting in Hyp mode -\r\n") /* Zero BSS On the boot CPU to avoid nasty surprises */ teq r12, #0 @@ -208,8 +218,8 @@ skip_bss: bl putn PRINT(" -\r\n") b fail - 2: + /* Jump to cpu_init */ ldr r1, [r1, #PROCINFO_cpu_init] /* r1 := vaddr(init func) */ adr lr, cpu_init_done /* Save return address */ @@ -242,68 +252,69 @@ cpu_init_done: ldr r0, =(HSCTLR_BASE|SCTLR_A) mcr CP32(r0, HSCTLR) + /* Rebuild the boot pagetable's first-level entries. The structure + * is described in mm.c. + * + * After the CPU enables paging it will add the fixmap mapping + * to these page tables, however this may clash with the 1:1 + * mapping. So each CPU must rebuild the page tables here with + * the 1:1 in place. */ + /* Write Xen's PT's paddr into the HTTBR */ ldr r4, =boot_pgtable - add r4, r4, r10 /* r4 := paddr (xen_pagetable) */ - mov r5, #0 /* r4:r5 is paddr (xen_pagetable) */ + add r4, r4, r10 /* r4 := paddr (boot_pagetable) */ + mov r5, #0 /* r4:r5 is paddr (boot_pagetable) */ mcrr CP64(r4, r5, HTTBR) - /* Non-boot CPUs don't need to rebuild the pagetable */ - teq r12, #0 - bne pt_ready - - /* console fixmap */ -#if defined(EARLY_PRINTK) - ldr r1, =xen_fixmap - add r1, r1, r10 /* r1 := paddr (xen_fixmap) */ - mov r3, #0 - lsr r2, r11, #12 - lsl r2, r2, #12 /* 4K aligned paddr of UART */ - orr r2, r2, #PT_UPPER(DEV_L3) - orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ - strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ -#endif - - /* Build the baseline idle pagetable's first-level entries */ - ldr r1, =xen_second - add r1, r1, r10 /* r1 := paddr (xen_second) */ + /* Setup boot_pgtable: */ + ldr r1, =boot_second + add r1, r1, r10 /* r1 := paddr (boot_second) */ mov r3, #0x0 - orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of xen_second */ + + /* ... map boot_second in boot_pgtable[0] */ + orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_second */ orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ strd r2, r3, [r4, #0] /* Map it in slot 0 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #8] /* Map 2nd page in slot 1 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #16] /* Map 3rd page in slot 2 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #24] /* Map 4th page in slot 3 */ - - /* Now set up the second-level entries */ - orr r2, r9, #PT_UPPER(MEM) - orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB normal map of Xen */ - mov r4, r9, lsr #18 /* Slot for paddr(start) */ - strd r2, r3, [r1, r4] /* Map Xen there */ - ldr r4, =start - lsr r4, #18 /* Slot for vaddr(start) */ - strd r2, r3, [r1, r4] /* Map Xen there too */ - - /* xen_fixmap pagetable */ - ldr r2, =xen_fixmap - add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ - orr r2, r2, #PT_UPPER(PT) - orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ - add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ - mov r3, #0x0 - lsr r2, r8, #21 - lsl r2, r2, #21 /* 2MB-aligned paddr of DTB */ - orr r2, r2, #PT_UPPER(MEM) - orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ - add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ + /* ... map of paddr(start) in boot_pgtable */ + lsrs r1, r9, #30 /* Offset of base paddr in boot_pgtable */ + beq 1f /* If it is in slot 0 then map in boot_second + * later on */ + lsl r2, r1, #30 /* Base address for 1GB mapping */ + orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ + orr r2, r2, #PT_LOWER(MEM) + lsl r1, r1, #3 /* r1 := Slot offset */ + strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + +1: /* Setup boot_second: */ + ldr r4, =boot_second + add r4, r4, r10 /* r1 := paddr (boot_second) */ + + lsr r2, r9, #20 /* Base address for 2MB mapping */ + lsl r2, r2, #20 + orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ + orr r2, r2, #PT_LOWER(MEM) + + /* ... map of vaddr(start) in boot_second */ + ldr r1, =start + lsr r1, #18 /* Slot for vaddr(start) */ + strd r2, r3, [r4, r1] /* Map vaddr(start) */ + + /* ... map of paddr(start) in boot_second */ + lsrs r1, r9, #30 /* Base paddr */ + bne 1f /* If paddr(start) is not in slot 0 + * then the mapping was done in + * boot_pgtable above */ + + mov r1, r9, lsr #18 /* Slot for paddr(start) */ + strd r2, r3, [r4, r1] /* Map Xen there */ +1: + + /* Defer fixmap and dtb mapping until after paging enabled, to + * avoid them clashing with the 1:1 mapping. */ + + /* boot pagetable setup complete */ -pt_ready: PRINT("- Turning on paging -\r\n") ldr r1, =paging /* Explicit vaddr, not RIP-relative */ @@ -315,11 +326,53 @@ pt_ready: mov pc, r1 /* Get a proper vaddr into PC */ paging: + /* Now we can install the fixmap and dtb mappings, since we + * don't need the 1:1 map any more */ + dsb +#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ + /* Non-boot CPUs don't need to rebuild the fixmap itself, just + * the mapping from boot_second to xen_fixmap */ + teq r12, #0 + bne 1f + + /* Add UART to the fixmap table */ + ldr r1, =xen_fixmap /* r1 := vaddr (xen_fixmap) */ + mov r3, #0 + lsr r2, r11, #12 + lsl r2, r2, #12 /* 4K aligned paddr of UART */ + orr r2, r2, #PT_UPPER(DEV_L3) + orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ + strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +1: + + /* Map fixmap into boot_second */ + ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ + ldr r2, =xen_fixmap + add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ + orr r2, r2, #PT_UPPER(PT) + orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ + ldr r4, =FIXMAP_ADDR(0) + mov r4, r4, lsr #18 /* r4 := Slot for FIXMAP(0) */ + strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ -#ifdef EARLY_PRINTK /* Use a virtual address to access the UART. */ ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) #endif + /* Map the DTB in the boot misc slot */ + teq r12, #0 /* Only on boot CPU */ + bne 1f + + ldr r1, =boot_second + mov r3, #0x0 + lsr r2, r8, #21 + lsl r2, r2, #21 /* r2: 2MB-aligned paddr of DTB */ + orr r2, r2, #PT_UPPER(MEM) + orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ + ldr r4, =BOOT_FDT_VIRT_START + mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ + strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ + dsb +1: PRINT("- Ready -\r\n") @@ -327,10 +380,10 @@ paging: teq r12, #0 beq launch - /* Non-boot CPUs need to move on to the relocated pagetables */ - mov r0, #0 - ldr r4, =boot_ttbr /* VA of HTTBR value stashed by CPU 0 */ - add r4, r4, r10 /* PA of it */ + /* Non-boot CPUs need to move on to the proper pagetables, which were + * setup in init_secondary_pagetables. */ + + ldr r4, =init_ttbr /* VA of HTTBR value stashed by CPU 0 */ ldrd r4, r5, [r4] /* Actual value */ dsb mcrr CP64(r4, r5, HTTBR) @@ -342,29 +395,6 @@ paging: dsb /* Ensure completion of TLB+BP flush */ isb - /* Non-boot CPUs report that they've got this far */ - ldr r0, =ready_cpus -1: ldrex r1, [r0] /* { read # of ready CPUs } */ - add r1, r1, #1 /* Atomically { ++ } */ - strex r2, r1, [r0] /* { writeback } */ - teq r2, #0 - bne 1b - dsb - mcr CP32(r0, DCCMVAC) /* flush D-Cache */ - dsb - - /* Here, the non-boot CPUs must wait again -- they're now running on - * the boot CPU's pagetables so it's safe for the boot CPU to - * overwrite the non-relocated copy of Xen. Once it's done that, - * and brought up the memory allocator, non-boot CPUs can get their - * own stacks and enter C. */ -1: wfe - dsb - ldr r0, =smp_up_cpu - ldr r1, [r0] /* Which CPU is being booted? */ - teq r1, r12 /* Is it us? */ - bne 1b - launch: ldr r0, =init_data add r0, #INITINFO_stack /* Find the boot-time stack */ @@ -373,7 +403,7 @@ launch: sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ mov r1, r8 /* - DTB address */ - movs r2, r12 /* - CPU ID */ + movs r2, r7 /* - CPU ID */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ @@ -383,6 +413,82 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +/* Copy Xen to new location and switch TTBR + * r1:r0 ttbr + * r2 source address + * r3 destination address + * [sp]=>r4 length + * + * Source and destination must be word aligned, length is rounded up + * to a 16 byte boundary. + * + * MUST BE VERY CAREFUL when saving things to RAM over the copy */ +ENTRY(relocate_xen) + push {r4,r5,r6,r7,r8,r9,r10,r11} + + ldr r4, [sp, #8*4] /* Get 4th argument from stack */ + + /* Copy 16 bytes at a time using: + * r5: counter + * r6: data + * r7: data + * r8: data + * r9: data + * r10: source + * r11: destination + */ + mov r5, r4 + mov r10, r2 + mov r11, r3 +1: ldmia r10!, {r6, r7, r8, r9} + stmia r11!, {r6, r7, r8, r9} + + subs r5, r5, #16 + bgt 1b + + /* Flush destination from dcache using: + * r5: counter + * r6: step + * r7: vaddr + */ + dsb /* So the CPU issues all writes to the range */ + + mov r5, r4 + ldr r6, =cacheline_bytes /* r6 := step */ + ldr r6, [r6] + mov r7, r3 + +1: mcr CP32(r7, DCCMVAC) + + add r7, r7, r6 + subs r5, r5, r6 + bgt 1b + + dsb /* Ensure the flushes happen before + * continuing */ + isb /* Ensure synchronization with previous + * changes to text */ + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ + mcr CP32(r0, BPIALL) /* Flush branch predictor */ + dsb /* Ensure completion of TLB+BP flush */ + isb + + mcrr CP64(r0, r1, HTTBR) + + dsb /* ensure memory accesses do not cross + * over the TTBR0 write */ + isb /* Ensure synchronization with previous + * changes to text */ + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ + mcr CP32(r0, BPIALL) /* Flush branch predictor */ + dsb /* Ensure completion of TLB+BP flush */ + isb + + pop {r4, r5,r6,r7,r8,r9,r10,r11} + + mov pc, lr #ifdef EARLY_PRINTK /* Bring up the UART. @@ -439,9 +545,6 @@ putn: mov pc, lr #endif /* !EARLY_PRINTK */ -/* Place holder for machine ID */ -machine_id: .word 0x0 - /* * Local variables: * mode: ASM diff --git a/xen/arch/arm/arm32/mode_switch.S b/xen/arch/arm/arm32/mode_switch.S deleted file mode 100644 index 2cd5888..0000000 --- a/xen/arch/arm/arm32/mode_switch.S +++ /dev/null @@ -1,158 +0,0 @@ -/* - * xen/arch/arm/mode_switch.S - * - * Start-of day code to take a CPU from Secure mode to Hyp mode. - * - * Tim Deegan - * Copyright (c) 2011-2012 Citrix Systems. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include - -/* Wake up secondary cpus - * This code relies on Machine ID and only works for Vexpress and the Arndale - * TODO: Move this code either later (via platform specific desc) or in a bootwrapper - * r5: Machine ID - * Clobber r0 r2 */ -GLOBAL(kick_cpus) - ldr r0, =MACH_TYPE_SMDK5250 - teq r5, r0 /* Are we running on the arndale? */ - beq kick_cpus_arndale - /* otherwise versatile express */ - /* write start paddr to v2m sysreg FLAGSSET register */ - ldr r0, =(V2M_SYS_MMIO_BASE) /* base V2M sysreg MMIO address */ - dsb - mov r2, #0xffffffff - str r2, [r0, #(V2M_SYS_FLAGSCLR)] - dsb - ldr r2, =start - add r2, r2, r10 - str r2, [r0, #(V2M_SYS_FLAGSSET)] - dsb - ldr r2, =V2M_GIC_BASE_ADDRESS /* r2 := VE gic base address */ - b kick_cpus_sgi -kick_cpus_arndale: - /* write start paddr to CPU 1 sysreg register */ - ldr r0, =(S5P_PA_SYSRAM) - ldr r2, =start - add r2, r2, r10 - str r2, [r0] - dsb - ldr r2, =EXYNOS5_GIC_BASE_ADDRESS /* r2 := Exynos5 gic base address */ -kick_cpus_sgi: - /* send an interrupt */ - ldr r0, =GIC_DR_OFFSET /* GIC distributor offset */ - add r0, r2 /* r0 := r0 + gic base address */ - mov r2, #0x1 - str r2, [r0, #(GICD_CTLR * 4)] /* enable distributor */ - mov r2, #0xfe0000 - str r2, [r0, #(GICD_SGIR * 4)] /* send IPI to everybody, SGI0 = Event check */ - dsb - str r2, [r0, #(GICD_CTLR * 4)] /* disable distributor */ - mov pc, lr - - -/* Get up a CPU into Hyp mode. Clobbers r0-r3. - * - * r5: Machine ID - * r12: CPU number - * - * This code is specific to the VE model/Arndale, and not intended to be used - * on production systems. As such it's a bit hackier than the main - * boot code in head.S. In future it will be replaced by better - * integration with the bootloader/firmware so that Xen always starts - * in Hyp mode. - * Clobber r0 - r4 */ -GLOBAL(enter_hyp_mode) - mov r3, lr /* Put return address in non-banked reg */ - cpsid aif, #0x16 /* Enter Monitor mode */ - mrc CP32(r0, SCR) - orr r0, r0, #0x100 /* Set HCE */ - orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ - bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ - mcr CP32(r0, SCR) - - ldr r2, =MACH_TYPE_SMDK5250 /* r4 := Arndale machine ID */ - /* By default load Arndale defaults values */ - ldr r0, =EXYNOS5_TIMER_FREQUENCY /* r0 := timer's frequency */ - ldr r1, =EXYNOS5_GIC_BASE_ADDRESS /* r1 := GIC base address */ - /* If it's not the Arndale machine ID, load VE values */ - teq r5, r2 - ldrne r0, =V2M_TIMER_FREQUENCY - ldrne r1, =V2M_GIC_BASE_ADDRESS - - /* Ugly: the system timer's frequency register is only - * programmable in Secure state. Since we don't know where its - * memory-mapped control registers live, we can't find out the - * right frequency. */ - mcr CP32(r0, CNTFRQ) - - mrc CP32(r0,NSACR) - ldr r4, =0x3fff /* Allow access to all co-processors in NS mode */ - orr r0, r0, r4 - orr r0, r0, #(1<<18) /* CA7/CA15: Allow access to ACTLR.SMP in NS mode */ - mcr CP32(r0, NSACR) - - add r0, r1, #GIC_DR_OFFSET - /* Disable the GIC distributor, on the boot CPU only */ - mov r4, #0 - teq r12, #0 /* Is this the boot CPU? */ - streq r4, [r0] - /* Continuing ugliness: Set up the GIC so NS state owns interrupts, - * The first 32 interrupts (SGIs & PPIs) must be configured on all - * CPUs while the remainder are SPIs and only need to be done one, on - * the boot CPU. */ - add r0, r0, #0x80 /* GICD_IGROUP0 */ - mov r2, #0xffffffff /* All interrupts to group 1 */ - str r2, [r0] /* Interrupts 0-31 (SGI & PPI) */ - teq r12, #0 /* Boot CPU? */ - bne skip_spis /* Don't route SPIs on secondary CPUs */ - - add r4, r1, #GIC_DR_OFFSET - ldr r4, [r4, #4] /* r4 := Interrupt Controller Type Reg */ - and r4, r4, #GICD_TYPE_LINES /* r4 := number of SPIs */ -1: teq r4, #0 - beq skip_spis - add r0, r0, #4 /* Go to the new group */ - str r2, [r0] /* Update the group */ - sub r4, r4, #1 - b 1b -skip_spis: - /* Disable the GIC CPU interface on all processors */ - add r0, r1, #GIC_CR_OFFSET - mov r1, #0 - str r1, [r0] - /* Must drop priority mask below 0x80 before entering NS state */ - ldr r1, =0xff - str r1, [r0, #0x4] /* -> GICC_PMR */ - /* Reset a few config registers */ - mov r0, #0 - mcr CP32(r0, FCSEIDR) - mcr CP32(r0, CONTEXTIDR) - - mrs r0, cpsr /* Copy the CPSR */ - add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ - msr spsr_cxsf, r0 /* into the SPSR */ - movs pc, r3 /* Exception-return into Hyp mode */ - -/* - * Local variables: - * mode: ASM - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 30fb480..5d28bad 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -1,7 +1,6 @@ subdir-y += lib obj-y += entry.o -obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index ac1b75a..b2d44cc 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -33,6 +33,41 @@ #include EARLY_PRINTK_INC #endif +/* + * Common register usage in this file: + * x0 - + * x1 - + * x2 - + * x3 - + * x4 - + * x5 - + * x6 - + * x7 - + * x8 - + * x9 - + * x10 - + * x11 - + * x12 - + * x13 - + * x14 - + * x15 - + * x16 - + * x17 - + * x18 - + * x19 - paddr(start) + * x20 - phys offset + * x21 - DTB address (boot cpu only) + * x22 - is_secondary_cpu + * x23 - UART address + * x24 - cpuid + * x25 - + * x26 - + * x27 - + * x28 - + * x29 - + * x30 - lr + */ + /* Macro to print a string to the UART, if there is one. * Clobbers x0-x3. */ #ifdef EARLY_PRINTK @@ -65,7 +100,6 @@ .global start start: -GLOBAL(init_secondary) /* currently unused */ /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -100,69 +134,73 @@ real_start: add x21, x21, x20 /* x21 := paddr(DTB) */ #endif - /* Are we the boot CPU? */ - mov x22, #0 /* x22 := CPU ID */ + mov x22, #0 /* x22 := is_secondary_cpu */ + + b common_start + +GLOBAL(init_secondary) + msr DAIFSet, 0xf /* Disable all interrupts */ + + /* Find out where we are */ + ldr x0, =start + adr x19, start /* x19 := paddr (start) */ + sub x20, x19, x0 /* x20 := phys-offset */ + + mov x22, #1 /* x22 := is_secondary_cpu */ + +common_start: + mov x24, #0 /* x24 := CPU ID. Initialy zero until we + * find that multiprocessor extensions are + * present and the system is SMP */ mrs x0, mpidr_el1 - tbz x0, 31, boot_cpu /* Multiprocessor extension supported? */ - tbnz x0, 30, boot_cpu /* Uniprocessor system? */ + tbz x0, 31, 1f /* Multiprocessor extension not supported? */ + tbnz x0, 30, 1f /* Uniprocessor system? */ mov x13, #(0xff << 24) - bics x22, x0, x13 /* Mask out flags to get CPU ID */ - b.eq boot_cpu /* If we're CPU 0, boot now */ - - /* Non-boot CPUs wait here to be woken up one at a time. */ -1: dsb sy - ldr x0, =smp_up_cpu /* VA of gate */ - add x0, x0, x20 /* PA of gate */ - ldr x1, [x0] /* Which CPU is being booted? */ - cmp x1, x22 /* Is it us? */ - b.eq 2f + bic x24, x0, x13 /* Mask out flags to get CPU ID */ +1: + + /* Non-boot CPUs wait here until __cpu_up is ready for them */ + cbz x22, 1f + + ldr x0, =smp_up_cpu + add x0, x0, x20 /* Apply physical offset */ + dsb sy +2: ldr x1, [x0] + cmp x1, x24 + beq 1f wfe - b 1b -2: + b 2b +1: -boot_cpu: #ifdef EARLY_PRINTK ldr x23, =EARLY_UART_BASE_ADDRESS /* x23 := UART base address */ cbnz x22, 1f -#ifdef EARLY_PRINTK_INIT_UART - bl init_uart /* CPU 0 sets up the UART too */ -#endif + bl init_uart /* Boot CPU sets up the UART too */ 1: PRINT("- CPU ") - mov x0, x22 + mov x0, x24 bl putn PRINT(" booting -\r\n") #endif PRINT("- Current EL ") - mrs x0, CurrentEL + mrs x4, CurrentEL + mov x0, x4 bl putn PRINT(" -\r\n") - /* Are we in EL3 */ - mrs x0, CurrentEL - cmp x0, #PSR_MODE_EL3t - ccmp x0, #PSR_MODE_EL3h, #0x4, ne - b.eq 1f /* Yes */ - /* Are we in EL2 */ - cmp x0, #PSR_MODE_EL2t - ccmp x0, #PSR_MODE_EL2h, #0x4, ne - b.eq 2f /* Yes */ + cmp x4, #PSR_MODE_EL2t + ccmp x4, #PSR_MODE_EL2h, #0x4, ne + b.eq el2 /* Yes */ - /* Otherwise, it must have been EL0 or EL1 */ - PRINT("- CPU is not in EL3 or EL2 -\r\n") - b fail + /* OK, we're boned. */ + PRINT("- Xen must be entered in NS EL2 mode -\r\n" \ + "- Please update the bootloader -\r\n") + b fail -1: PRINT("- Started in EL3 -\r\n- Entering EL2 -\r\n") - ldr x1, =enter_el2_mode /* VA of function */ - add x1, x1, x20 /* PA of function */ - adr x30, el2 /* Set return address for call */ - br x1 /* Call function */ +el2: PRINT("- Xen starting at EL2 -\r\n") -2: PRINT("- Started in EL2 mode -\r\n") - -el2: /* Zero BSS On the boot CPU to avoid nasty surprises */ cbnz x22, skip_bss @@ -177,9 +215,10 @@ el2: b.lo 1b skip_bss: - PRINT("- Setting up control registers -\r\n") + /* XXXX call PROCINFO_cpu_init here */ + /* Set up memory attribute type tables */ ldr x0, =MAIRVAL msr mair_el2, x0 @@ -193,7 +232,7 @@ skip_bss: ldr x0, =0x80802500 msr tcr_el2, x0 - /* Set up the HSCTLR: + /* Set up the SCTLR_EL2: * Exceptions in LE ARM, * Low-latency IRQs disabled, * Write-implies-XN disabled (for now), @@ -204,69 +243,90 @@ skip_bss: ldr x0, =(HSCTLR_BASE|SCTLR_A) msr SCTLR_EL2, x0 - /* Write Xen's PT's paddr into the HTTBR */ + /* Rebuild the boot pagetable's first-level entries. The structure + * is described in mm.c. + * + * After the CPU enables paging it will add the fixmap mapping + * to these page tables, however this may clash with the 1:1 + * mapping. So each CPU must rebuild the page tables here with + * the 1:1 in place. */ + + /* Write Xen's PT's paddr into TTBR0_EL2 */ ldr x4, =boot_pgtable - add x4, x4, x20 /* x4 := paddr (xen_pagetable) */ + add x4, x4, x20 /* x4 := paddr (boot_pagetable) */ msr TTBR0_EL2, x4 - /* Non-boot CPUs don't need to rebuild the pagetable */ - cbnz x22, pt_ready - + /* Setup boot_pgtable: */ ldr x1, =boot_first - add x1, x1, x20 /* x1 := paddr (xen_first) */ - mov x3, #PT_PT /* x2 := table map of xen_first */ - orr x2, x1, x3 /* (+ rights for linear PT) */ - str x2, [x4, #0] /* Map it in slot 0 */ + add x1, x1, x20 /* x1 := paddr (boot_first) */ - mov x4, x1 /* Next level into xen_first */ + /* ... map boot_first in boot_pgtable[0] */ + mov x3, #PT_PT /* x2 := table map of boot_first */ + orr x2, x1, x3 /* + rights for linear PT */ + str x2, [x4, #0] /* Map it in slot 0 */ - /* console fixmap */ - ldr x1, =xen_fixmap - add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ - lsr x2, x23, #12 - lsl x2, x2, #12 /* 4K aligned paddr of UART */ - mov x3, #PT_DEV_L3 - orr x2, x2, x3 /* x2 := 4K dev map including UART */ - str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ + /* ... map of paddr(start) in boot_pgtable */ + lsr x1, x19, #39 /* Offset of base paddr in boot_pgtable */ + cbz x1, 1f /* It's in slot 0, map in boot_first + * or boot_second later on */ - /* Build the baseline idle pagetable's first-level entries */ - ldr x1, =xen_second - add x1, x1, x20 /* x1 := paddr (xen_second) */ - mov x3, #PT_PT /* x2 := table map of xen_second */ - orr x2, x1, x3 /* (+ rights for linear PT) */ + lsl x2, x1, #39 /* Base address for 512GB mapping */ + mov x3, #PT_MEM /* x2 := Section mapping */ + orr x2, x2, x3 + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Mapping of paddr(start)*/ + +1: /* Setup boot_first: */ + ldr x4, =boot_first /* Next level into boot_first */ + add x4, x4, x20 /* x4 := paddr(boot_first) */ + + /* ... map boot_second in boot_first[0] */ + ldr x1, =boot_second + add x1, x1, x20 /* x1 := paddr(boot_second) */ + mov x3, #PT_PT /* x2 := table map of boot_first */ + orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ - add x2, x2, #0x1000 - str x2, [x4, #8] /* Map 2nd page in slot 1 */ - add x2, x2, #0x1000 - str x2, [x4, #16] /* Map 3rd page in slot 2 */ - add x2, x2, #0x1000 - str x2, [x4, #24] /* Map 4th page in slot 3 */ - - /* Now set up the second-level entries */ - mov x3, #PT_MEM - orr x2, x19, x3 /* x2 := 2MB normal map of Xen */ - orr x4, xzr, x19, lsr #18 - str x2, [x1, x4] /* Map Xen there */ - ldr x4, =start - lsr x4, x4, #18 /* Slot for vaddr(start) */ - str x2, [x1, x4] /* Map Xen there too */ - - /* xen_fixmap pagetable */ - ldr x2, =xen_fixmap - add x2, x2, x20 /* x2 := paddr (xen_fixmap) */ - mov x3, #PT_PT - orr x2, x2, x3 /* x2 := table map of xen_fixmap */ - add x4, x4, #8 - str x2, [x1, x4] /* Map it in the fixmap's slot */ - lsr x2, x21, #21 - lsl x2, x2, #21 /* 2MB-aligned paddr of DTB */ - mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ + /* ... map of paddr(start) in boot_first */ + lsr x2, x19, #30 /* x2 := Offset of base paddr in boot_first */ + and x1, x2, 0x1ff /* x1 := Slot to use */ + cbz x1, 1f /* It's in slot 0, map in boot_second */ + + lsl x2, x2, #30 /* Base address for 1GB mapping */ + mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 - add x4, x4, #8 - str x2, [x1, x4] /* Map it in the early fdt slot */ + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Create mapping of paddr(start)*/ + +1: /* Setup boot_second: */ + ldr x4, =boot_second + add x4, x4, x20 /* x4 := paddr (boot_second) */ + + lsr x2, x19, #20 /* Base address for 2MB mapping */ + lsl x2, x2, #20 + mov x3, #PT_MEM /* x2 := Section map */ + orr x2, x2, x3 + + /* ... map of vaddr(start) in boot_second */ + ldr x1, =start + lsr x1, x1, #18 /* Slot for vaddr(start) */ + str x2, [x4, x1] /* Map vaddr(start) */ + + /* ... map of paddr(start) in boot_second */ + lsr x1, x19, #30 /* Base paddr */ + cbnz x1, 1f /* If paddr(start) is not in slot 0 + * then the mapping was done in + * boot_pgtable or boot_first above */ + + lsr x1, x19, #18 /* Slot for paddr(start) */ + str x2, [x4, x1] /* Map Xen there */ +1: + + /* Defer fixmap and dtb mapping until after paging enabled, to + * avoid them clashing with the 1:1 mapping. */ + + /* boot pagetable setup complete */ -pt_ready: PRINT("- Turning on paging -\r\n") ldr x1, =paging /* Explicit vaddr, not RIP-relative */ @@ -279,17 +339,60 @@ pt_ready: br x1 /* Get a proper vaddr into PC */ paging: + /* Now we can install the fixmap and dtb mappings, since we + * don't need the 1:1 map any more */ + dsb sy +#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ + /* Non-boot CPUs don't need to rebuild the fixmap itself, just + * the mapping from boot_second to xen_fixmap */ + cbnz x22, 1f + + /* Add UART to the fixmap table */ + ldr x1, =xen_fixmap + add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ + lsr x2, x23, #12 + lsl x2, x2, #12 /* 4K aligned paddr of UART */ + mov x3, #PT_DEV_L3 + orr x2, x2, x3 /* x2 := 4K dev map including UART */ + str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +1: + + /* Map fixmap into boot_second */ + ldr x4, =boot_second /* x4 := vaddr (boot_second) */ + ldr x2, =xen_fixmap + add x2, x2, x20 /* x2 := paddr (xen_fixmap) */ + mov x3, #PT_PT + orr x2, x2, x3 /* x2 := table map of xen_fixmap */ + ldr x1, =FIXMAP_ADDR(0) + lsr x1, x1, #18 /* x1 := Slot for FIXMAP(0) */ + str x2, [x4, x1] /* Map it in the fixmap's slot */ + /* Use a virtual address to access the UART. */ ldr x23, =FIXMAP_ADDR(FIXMAP_CONSOLE) +#endif + + /* Map the DTB in the boot misc slot */ + cbnz x22, 1f /* Only on boot CPU */ + + lsr x2, x21, #21 + lsl x2, x2, #21 /* x2 := 2MB-aligned paddr of DTB */ + mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ + orr x2, x2, x3 + ldr x1, =BOOT_FDT_VIRT_START + lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ + str x2, [x4, x1] /* Map it in the early fdt slot */ + dsb sy +1: PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ cbz x22, launch - /* Non-boot CPUs need to move on to the relocated pagetables */ - ldr x4, =boot_ttbr /* VA of TTBR0_EL2 stashed by CPU 0 */ - add x4, x4, x20 /* PA of it */ + /* Non-boot CPUs need to move on to the proper pagetables, which were + * setup in init_secondary_pagetables. */ + + ldr x4, =init_ttbr /* VA of TTBR0_EL2 stashed by CPU 0 */ ldr x4, [x4] /* Actual value */ dsb sy msr TTBR0_EL2, x4 @@ -299,28 +402,6 @@ paging: dsb sy /* Ensure completion of TLB flush */ isb - /* Non-boot CPUs report that they've got this far */ - ldr x0, =ready_cpus -1: ldaxr x1, [x0] /* { read # of ready CPUs } */ - add x1, x1, #1 /* Atomically { ++ } */ - stlxr w2, x1, [x0] /* { writeback } */ - cbnz w2, 1b - dsb sy - dc cvac, x0 /* Flush D-Cache */ - dsb sy - - /* Here, the non-boot CPUs must wait again -- they're now running on - * the boot CPU's pagetables so it's safe for the boot CPU to - * overwrite the non-relocated copy of Xen. Once it's done that, - * and brought up the memory allocator, non-boot CPUs can get their - * own stacks and enter C. */ -1: wfe - dsb sy - ldr x0, =smp_up_cpu - ldr x1, [x0] /* Which CPU is being booted? */ - cmp x1, x22 /* Is it us? */ - b.ne 1b - launch: ldr x0, =init_data add x0, x0, #INITINFO_stack /* Find the boot-time stack */ @@ -331,7 +412,7 @@ launch: mov x0, x20 /* Marshal args: - phys_offset */ mov x1, x21 /* - FDT */ - mov x2, x22 /* - CPU ID */ + mov x2, x24 /* - CPU ID */ cbz x22, start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ @@ -341,13 +422,80 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b -#ifdef EARLY_PRINTK +/* Copy Xen to new location and switch TTBR + * x0 ttbr + * x1 source address + * x2 destination address + * x3 length + * + * Source and destination must be word aligned, length is rounded up + * to a 16 byte boundary. + * + * MUST BE VERY CAREFUL when saving things to RAM over the copy */ +ENTRY(relocate_xen) + /* Copy 16 bytes at a time using: + * x9: counter + * x10: data + * x11: data + * x12: source + * x13: destination + */ + mov x9, x3 + mov x12, x1 + mov x13, x2 +1: ldp x10, x11, [x12], #16 + stp x10, x11, [x13], #16 + + subs x9, x9, #16 + bgt 1b + + /* Flush destination from dcache using: + * x9: counter + * x10: step + * x11: vaddr + */ + dsb sy /* So the CPU issues all writes to the range */ + + mov x9, x3 + ldr x10, =cacheline_bytes /* x10 := step */ + ldr x10, [x10] + mov x11, x2 + +1: dc cvac, x11 + + add x11, x11, x10 + subs x9, x9, x10 + bgt 1b + + dsb sy /* Ensure the flushes happen before + * continuing */ + isb /* Ensure synchronization with previous + * changes to text */ + tlbi alle2 /* Flush hypervisor TLB */ + ic iallu /* Flush I-cache */ + dsb sy /* Ensure completion of TLB flush */ + isb + + msr TTBR0_EL2, x0 + + isb /* Ensure synchronization with previous + * changes to text */ + tlbi alle2 /* Flush hypervisor TLB */ + ic iallu /* Flush I-cache */ + dsb sy /* Ensure completion of TLB flush */ + isb + + ret + +#ifdef EARLY_PRINTK /* Bring up the UART. * x23: Early UART base address * Clobbers x0-x1 */ init_uart: +#ifdef EARLY_PRINTK_INIT_UART early_uart_init x23, 0 +#endif adr x0, 1f b puts 1: .asciz "- UART enabled -\r\n" diff --git a/xen/arch/arm/arm64/mode_switch.S b/xen/arch/arm/arm64/mode_switch.S deleted file mode 100644 index ea64f22..0000000 --- a/xen/arch/arm/arm64/mode_switch.S +++ /dev/null @@ -1,89 +0,0 @@ -/* - * xen/arch/arm/arm64/mode_switch.S - * - * Start-of day code to take a CPU from EL3 to EL2. Largely taken from - * bootwrapper. - * - * Ian Campbell - * Copyright (c) 2012 Citrix Systems. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -/* Get up a CPU into EL2. Clobbers x0-x3. - * - * Expects x22 == CPU number - * Expects x30 == EL2 entry point - * - * This code is specific to the VE model, and not intended to be used - * on production systems. As such it's a bit hackier than the main - * boot code in head.S. In future it will be replaced by better - * integration with the bootloader/firmware so that Xen always starts - * at EL2. - */ -GLOBAL(enter_el2_mode) - mov x0, #0x30 // RES1 - orr x0, x0, #(1 << 0) // Non-secure EL1 - orr x0, x0, #(1 << 8) // HVC enable - orr x0, x0, #(1 << 10) // 64-bit EL2 - msr scr_el3, x0 - - msr cptr_el3, xzr // Disable copro. traps to EL3 - - ldr x0, =0x01800000 // 24Mhz - msr cntfrq_el0, x0 - - /* - * Check for the primary CPU to avoid a race on the distributor - * registers. - */ - cbnz x22, 1f - - ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_DR_OFFSET) // GICD_CTLR - mov w0, #3 // EnableGrp0 | EnableGrp1 - str w0, [x1] - -1: ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_DR_OFFSET+0x80) // GICD_IGROUPR - mov w0, #~0 // Grp1 interrupts - str w0, [x1], #4 - b.ne 2f // Only local interrupts for secondary CPUs - str w0, [x1], #4 - str w0, [x1], #4 - -2: ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_CR_OFFSET) // GICC_CTLR - ldr w0, [x1] - mov w0, #3 // EnableGrp0 | EnableGrp1 - str w0, [x1] - - mov w0, #1 << 7 // allow NS access to GICC_PMR - str w0, [x1, #4] // GICC_PMR - - msr sctlr_el2, xzr - - /* - * Prepare the switch to the EL2_SP1 mode from EL3 - */ - msr elr_el3, x30 // Return to desired function - mov x1, #0x3c9 // EL2_SP1 | D | A | I | F - msr spsr_el3, x1 - eret - -/* - * Local variables: - * mode: ASM - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 89d9f57..969a361 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -43,40 +43,70 @@ struct domain *dom_xen, *dom_io, *dom_cow; -/* Static start-of-day pagetables that we use before the - * allocators are up. These go on to become the boot CPU's real pagetables. +/* Static start-of-day pagetables that we use before the allocators + * are up. These are used by all CPUs during bringup before switching + * to the CPUs own pagetables. + * + * These pagetables have a very simple structure. They include: + * - a 2MB mapping of xen at XEN_VIRT_START, boot_first and + * boot_second are used to populate the trie down to that mapping. + * - a 1:1 mapping of xen at its current physical address. This uses a + * section mapping at whichever of boot_{pgtable,first,second} + * covers that physical address. + * + * For the boot CPU these mappings point to the address where Xen was + * loaded by the bootloader. For secondary CPUs they point to the + * relocated copy of Xen for the benefit of secondary CPUs. + * + * In addition to the above for the boot CPU the device-tree is + * initially mapped in the boot misc slot. This mapping is not present + * for secondary CPUs. + * + * Finally, if EARLY_PRINTK is enabled then xen_fixmap will be mapped + * by the CPU once it has moved off the 1:1 mapping. */ lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #ifdef CONFIG_ARM_64 lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); -/* The first page of the first level mapping of the xenheap. The - * subsequent xenheap first level pages are dynamically allocated, but - * we need this one to bootstrap ourselves. */ -lpae_t xenheap_first_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); -/* The zeroeth level slot which uses xenheap_first_first. Used because - * setup_xenheap_mappings otherwise relies on mfn_to_virt which isn't - * valid for a non-xenheap mapping. */ -static __initdata int xenheap_first_first_slot = -1; #endif +lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); + +/* Main runtime page tables */ /* - * xen_pgtable and xen_dommap are per-PCPU and are allocated before - * bringing up each CPU. On 64-bit a first level table is also allocated. + * For arm32 xen_pgtable and xen_dommap are per-PCPU and are allocated before + * bringing up each CPU. For arm64 xen_pgtable is common to all PCPUs. * - * xen_second, xen_fixmap and xen_xenmap are shared between all PCPUs. + * xen_second, xen_fixmap and xen_xenmap are always shared between all + * PCPUs. */ #ifdef CONFIG_ARM_64 -#define THIS_CPU_PGTABLE boot_pgtable +lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t xen_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +#define THIS_CPU_PGTABLE xen_pgtable #else /* Per-CPU pagetable pages */ /* xen_pgtable == root of the trie (zeroeth level on 64-bit, first on 32-bit) */ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); #define THIS_CPU_PGTABLE this_cpu(xen_pgtable) /* xen_dommap == pages used by map_domain_page, these pages contain - * the second level pagetables which mapp the domheap region + * the second level pagetables which map the domheap region * DOMHEAP_VIRT_START...DOMHEAP_VIRT_END in 2MB chunks. */ static DEFINE_PER_CPU(lpae_t *, xen_dommap); +/* Root of the trie for cpu0 */ +lpae_t cpu0_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +#endif + +#ifdef CONFIG_ARM_64 +/* The first page of the first level mapping of the xenheap. The + * subsequent xenheap first level pages are dynamically allocated, but + * we need this one to bootstrap ourselves. */ +lpae_t xenheap_first_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +/* The zeroeth level slot which uses xenheap_first_first. Used because + * setup_xenheap_mappings otherwise relies on mfn_to_virt which isn't + * valid for a non-xenheap mapping. */ +static __initdata int xenheap_first_first_slot = -1; #endif /* Common pagetable leaves */ @@ -104,9 +134,8 @@ lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); * as appropriate. */ static lpae_t xen_xenmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); - /* Non-boot CPUs use this to find the correct pagetables. */ -uint64_t boot_ttbr; +uint64_t init_ttbr; static paddr_t phys_offset; @@ -131,6 +160,12 @@ static inline void check_memory_layout_alignment_constraints(void) { BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK); /* 1GB aligned regions */ BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK); + /* Page table structure constraints */ +#ifdef CONFIG_ARM_64 + BUILD_BUG_ON(zeroeth_table_offset(XEN_VIRT_START)); +#endif + BUILD_BUG_ON(first_table_offset(XEN_VIRT_START)); + BUILD_BUG_ON(second_linear_offset(XEN_VIRT_START) >= LPAE_ENTRIES); #ifdef CONFIG_DOMAIN_PAGE BUILD_BUG_ON(DOMHEAP_VIRT_START & ~FIRST_MASK); #endif @@ -344,16 +379,6 @@ void __cpuinit setup_virt_paging(void) WRITE_SYSREG32(0x80002558, VTCR_EL2); isb(); } -/* This needs to be a macro to stop the compiler spilling to the stack - * which will change when we change pagetables */ -#define WRITE_TTBR(ttbr) \ - flush_xen_text_tlb(); \ - WRITE_SYSREG64(ttbr, TTBR0_EL2); \ - dsb(); /* ensure memory accesses do not cross over the TTBR0 write */ \ - /* flush_xen_text_tlb contains an initial isb which ensures the \ - * write to TTBR0 has completed. */ \ - flush_xen_text_tlb() - static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; @@ -368,70 +393,77 @@ void __init remove_early_mappings(void) flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, SECOND_SIZE); } +extern void relocate_xen(uint64_t ttbr, void *src, void *dst, size_t len); + /* Boot-time pagetable setup. * Changes here may need matching changes in head.S */ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) { + uint64_t ttbr; unsigned long dest_va; lpae_t pte, *p; int i; - /* Map the destination in the boot misc area. */ - dest_va = BOOT_RELOC_VIRT_START; - pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); - write_pte(xen_second + second_table_offset(dest_va), pte); - flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); - /* Calculate virt-to-phys offset for the new location */ phys_offset = xen_paddr - (unsigned long) _start; - /* Copy */ - memcpy((void *) dest_va, _start, _end - _start); - - /* Beware! Any state we modify between now and the PT switch may be - * discarded when we switch over to the copy. */ - - /* Update the copy of boot_pgtable to use the new paddrs */ - p = (void *) boot_pgtable + dest_va - (unsigned long) _start; #ifdef CONFIG_ARM_64 - p[0].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - p = (void *) boot_first + dest_va - (unsigned long) _start; + p = (void *) xen_pgtable; + p[0] = pte_of_xenaddr((uintptr_t)xen_first); + p[0].pt.table = 1; + p[0].pt.xn = 0; + p = (void *) xen_first; +#else + p = (void *) cpu0_pgtable; #endif - for ( i = 0; i < 4; i++) - p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - p = (void *) xen_second + dest_va - (unsigned long) _start; - if ( boot_phys_offset != 0 ) + /* Initialise first level entries, to point to second level entries */ + for ( i = 0; i < 4; i++) { - /* Remove the old identity mapping of the boot paddr */ - vaddr_t va = (vaddr_t)_start + boot_phys_offset; - p[second_linear_offset(va)].bits = 0; + p[i] = pte_of_xenaddr((uintptr_t)(xen_second+i*LPAE_ENTRIES)); + p[i].pt.table = 1; + p[i].pt.xn = 0; } - for ( i = 0; i < 4 * LPAE_ENTRIES; i++) - /* The FDT is not relocated */ - if ( p[i].pt.valid && i != second_linear_offset(BOOT_FDT_VIRT_START) ) - p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - /* Change pagetables to the copy in the relocated Xen */ - boot_ttbr = (uintptr_t) boot_pgtable + phys_offset; - flush_xen_dcache(boot_ttbr); - flush_xen_dcache_va_range((void*)dest_va, _end - _start); + /* Initialise xen second level entries ... */ + /* ... Xen's text etc */ - WRITE_TTBR(boot_ttbr); + pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT); + pte.pt.xn = 0;/* Contains our text mapping! */ + xen_second[second_table_offset(XEN_VIRT_START)] = pte; - /* Undo the temporary map */ - pte.bits = 0; - write_pte(xen_second + second_table_offset(dest_va), pte); - flush_xen_text_tlb(); - - /* Link in the fixmap pagetable */ + /* ... Fixmap */ pte = pte_of_xenaddr((vaddr_t)xen_fixmap); pte.pt.table = 1; - write_pte(xen_second + second_table_offset(FIXMAP_ADDR(0)), pte); - /* - * No flush required here. Individual flushes are done in - * set_fixmap as entries are used. - */ + xen_second[second_table_offset(FIXMAP_ADDR(0))] = pte; + + /* ... DTB */ + pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START)]; + xen_second[second_table_offset(BOOT_FDT_VIRT_START)] = pte; + + /* Map the destination in the boot misc area. */ + dest_va = BOOT_RELOC_VIRT_START; + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); + write_pte(boot_second + second_table_offset(dest_va), pte); + flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); +#ifdef CONFIG_ARM_64 + ttbr = (uintptr_t) xen_pgtable + phys_offset; +#else + ttbr = (uintptr_t) cpu0_pgtable + phys_offset; +#endif + + relocate_xen(ttbr, _start, (void*)dest_va, _end - _start); + + /* Clear the copy of the boot pagetables. Each secondary CPU + * rebuilds these itself (see head.S) */ + memset(boot_pgtable, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_pgtable); +#ifdef CONFIG_ARM_64 + memset(boot_pgtable, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_first); +#endif + memset(boot_second, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) @@ -452,6 +484,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) write_pte(xen_xenmap + i, pte); /* No flush required here as page table is not hooked in yet. */ } + pte = pte_of_xenaddr((vaddr_t)xen_xenmap); pte.pt.table = 1; write_pte(xen_second + second_linear_offset(XEN_VIRT_START), pte); @@ -463,7 +496,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) flush_xen_text_tlb(); #ifdef CONFIG_ARM_32 - per_cpu(xen_pgtable, 0) = boot_pgtable; + per_cpu(xen_pgtable, 0) = cpu0_pgtable; per_cpu(xen_dommap, 0) = xen_second + second_linear_offset(DOMHEAP_VIRT_START); @@ -474,10 +507,14 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) DOMHEAP_SECOND_PAGES*PAGE_SIZE); #endif } + #ifdef CONFIG_ARM_64 int init_secondary_pagetables(int cpu) { - /* All CPUs share a single page table on 64 bit */ + /* Set init_ttbr for this CPU coming up. All CPus share a single setof + * pagetables, but rewrite it each time for consistency with 32 bit. */ + init_ttbr = (uintptr_t) xen_pgtable + phys_offset; + flush_xen_dcache(init_ttbr); return 0; } #else @@ -498,7 +535,7 @@ int init_secondary_pagetables(int cpu) } /* Initialise root pagetable from root of boot tables */ - memcpy(first, boot_pgtable, PAGE_SIZE); + memcpy(first, cpu0_pgtable, PAGE_SIZE); /* Ensure the domheap has no stray mappings */ memset(domheap, 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); @@ -518,6 +555,10 @@ int init_secondary_pagetables(int cpu) per_cpu(xen_pgtable, cpu) = first; per_cpu(xen_dommap, cpu) = domheap; + /* Set init_ttbr for this CPU coming up */ + init_ttbr = __pa(first); + flush_xen_dcache(init_ttbr); + return 0; } #endif @@ -525,12 +566,6 @@ int init_secondary_pagetables(int cpu) /* MMU setup for secondary CPUS (which already have paging enabled) */ void __cpuinit mmu_init_secondary_cpu(void) { - uint64_t ttbr; - - /* Change to this CPU's pagetables */ - ttbr = (uintptr_t)virt_to_maddr(THIS_CPU_PGTABLE); - WRITE_TTBR(ttbr); - /* From now on, no mapping may be both writable and executable. */ WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); flush_xen_text_tlb(); @@ -603,7 +638,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, while ( base_mfn < end_mfn ) { int slot = zeroeth_table_offset(vaddr); - lpae_t *p = &boot_pgtable[slot]; + lpae_t *p = &xen_pgtable[slot]; if ( p->pt.valid ) { @@ -670,7 +705,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { pte = mfn_to_xen_entry(second_base + i); pte.pt.table = 1; - write_pte(&boot_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); + write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } create_32mb_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT); #else diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d615b4a..b2c4101 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -592,7 +592,7 @@ void __init setup_cache(void) * MPIDR values related to logical cpus * Code base on Linux arch/arm/kernel/devtree.c */ -static void __init init_cpus_maps(void) +static void __init smp_init_cpus(void) { register_t mpidr; struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); @@ -604,6 +604,14 @@ static void __init init_cpus_maps(void) [0 ... NR_CPUS - 1] = MPIDR_INVALID }; bool_t bootcpu_valid = 0; + int rc; + + if ( (rc = arch_smp_init()) < 0 ) + { + printk(XENLOG_WARNING "SMP init failed (%d)\n" + "Using only 1 CPU\n", rc); + return; + } mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; @@ -673,13 +681,20 @@ static void __init init_cpus_maps(void) if ( cpuidx > NR_CPUS ) { - printk(XENLOG_WARNING "DT /cpu %u node greater than max cores %u, capping them\n", + printk(XENLOG_WARNING + "DT /cpu %u node greater than max cores %u, capping them\n", cpuidx, NR_CPUS); cpuidx = NR_CPUS; break; } - tmp_map[i] = hwid; + if ( (rc = arch_cpu_init(i, cpu)) < 0 ) + { + printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); + tmp_map[i] = MPIDR_INVALID; + } + else + tmp_map[i] = hwid; } if ( !bootcpu_valid ) @@ -691,6 +706,8 @@ static void __init init_cpus_maps(void) for ( i = 0; i < cpuidx; i++ ) { + if ( tmp_map[i] == MPIDR_INVALID ) + continue; cpumask_set_cpu(i, &cpu_possible_map); cpu_logical_map(i) = tmp_map[i]; } @@ -732,15 +749,14 @@ void __init start_xen(unsigned long boot_phys_offset, processor_id(); - init_cpus_maps(); - cpus = smp_get_max_cpus(); - platform_init(); + smp_init_cpus(); + cpus = smp_get_max_cpus(); + init_xen_time(); gic_init(); - make_cpus_ready(cpus, boot_phys_offset); set_current((struct vcpu *)0xfffff000); /* debug sanity */ idle_vcpu[0] = current; diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 234748e..2cb0f36 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -56,12 +56,10 @@ struct init_info __initdata init_data = }; /* Shared state for coordinating CPU bringup */ -unsigned long smp_up_cpu = 0; +unsigned long smp_up_cpu = MPIDR_INVALID; +/* Shared state for coordinating CPU teardown */ static bool_t cpu_is_dead = 0; -/* Number of non-boot CPUs ready to enter C */ -unsigned long __initdata ready_cpus = 0; - /* ID of the PCPU we're running on */ DEFINE_PER_CPU(unsigned int, cpu_id); /* XXX these seem awfully x86ish... */ @@ -103,7 +101,6 @@ smp_get_max_cpus (void) return max_cpus; } - void __init smp_prepare_cpus (unsigned int max_cpus) { @@ -112,32 +109,6 @@ smp_prepare_cpus (unsigned int max_cpus) setup_cpu_sibling_map(0); } -void __init -make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) -{ - unsigned long *gate; - paddr_t gate_pa; - int i; - - printk("Waiting for %i other CPUs to be ready\n", max_cpus - 1); - /* We use the unrelocated copy of smp_up_cpu as that's the one the - * others can see. */ - gate_pa = ((paddr_t) (unsigned long) &smp_up_cpu) + boot_phys_offset; - gate = map_domain_page(gate_pa >> PAGE_SHIFT) + (gate_pa & ~PAGE_MASK); - for ( i = 1; i < max_cpus; i++ ) - { - /* Tell the next CPU to get ready */ - *gate = cpu_logical_map(i); - flush_xen_dcache(*gate); - isb(); - sev(); - /* And wait for it to respond */ - while ( ready_cpus < i ) - smp_rmb(); - } - unmap_domain_page(gate); -} - /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, unsigned long fdt_paddr, @@ -176,6 +147,7 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, wmb(); /* Now report this CPU is up */ + smp_up_cpu = MPIDR_INVALID; cpumask_set_cpu(cpuid, &cpu_online_map); wmb(); @@ -226,6 +198,8 @@ int __cpu_up(unsigned int cpu) { int rc; + printk("Bringing up CPU%d\n", cpu); + rc = init_secondary_pagetables(cpu); if ( rc < 0 ) return rc; @@ -236,14 +210,22 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU what is it's logical CPU ID */ init_data.cpuid = cpu; - /* Unblock the CPU. It should be waiting in the loop in head.S - * for an event to arrive when smp_up_cpu matches its cpuid. */ + /* Open the gate for this CPU */ smp_up_cpu = cpu_logical_map(cpu); - /* we need to make sure that the change to smp_up_cpu is visible to - * secondary cpus with D-cache off */ flush_xen_dcache(smp_up_cpu); - isb(); - sev(); + + rc = arch_cpu_up(cpu); + + if ( rc < 0 ) + { + printk("Failed to bring up CPU%d\n", cpu); + return rc; + } + + /* We don't know the GIC ID of the CPU until it has woken up, so just signal + * everyone and rely on our own smp_up_cpu gate to ensure only the one we + * want gets through. */ + send_SGI_allbutself(GIC_SGI_EVENT_CHECK); while ( !cpu_online(cpu) ) { @@ -272,7 +254,6 @@ void __cpu_die(unsigned int cpu) mb(); } - /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 0129cd1..ce66099 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -149,7 +149,8 @@ extern unsigned long total_pages; extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); /* Remove early mappings */ extern void remove_early_mappings(void); -/* Allocate and initialise pagetables for a secondary CPU */ +/* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the + * new page table */ extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void __cpuinit mmu_init_secondary_cpu(void); diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index ee5bdfa..af30608 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -14,20 +14,6 @@ #define S5P_PA_SYSRAM 0x02020000 -/* Constants below is only used in assembly because the DTS is not yet parsed */ -#ifdef __ASSEMBLY__ - -/* GIC Base Address */ -#define EXYNOS5_GIC_BASE_ADDRESS 0x10480000 - -/* Timer's frequency */ -#define EXYNOS5_TIMER_FREQUENCY (24 * 1000 * 1000) /* 24 MHz */ - -/* Arndale machine ID */ -#define MACH_TYPE_SMDK5250 3774 - -#endif /* __ASSEMBLY__ */ - #endif /* __ASM_ARM_PLATFORMS_EXYNOS5_H */ /* * Local variables: diff --git a/xen/include/asm-arm/platforms/vexpress.h b/xen/include/asm-arm/platforms/vexpress.h index 982a293..5cf3aba 100644 --- a/xen/include/asm-arm/platforms/vexpress.h +++ b/xen/include/asm-arm/platforms/vexpress.h @@ -32,17 +32,6 @@ int vexpress_syscfg(int write, int function, int device, uint32_t *data); #endif -/* Constants below is only used in assembly because the DTS is not yet parsed */ -#ifdef __ASSEMBLY__ - -/* GIC base address */ -#define V2M_GIC_BASE_ADDRESS 0x2c000000 - -/* Timer's frequency */ -#define V2M_TIMER_FREQUENCY 0x5f5e100 /* 100 Mhz */ - -#endif /* __ASSEMBLY__ */ - #endif /* __ASM_ARM_PLATFORMS_VEXPRESS_H */ /* * Local variables: diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 1added5..83add6c 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -17,12 +17,6 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); extern void stop_cpu(void); -/* Bring the non-boot CPUs up to paging and ready to enter C. - * Must be called after Xen is relocated but before the original copy of - * .text gets overwritten. */ -extern void -make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset); - extern int arch_smp_init(void); extern int arch_cpu_init(int cpu, struct dt_device_node *dn); extern int arch_cpu_up(int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFb-0005BN-Q2; Sat, 28 Sep 2013 17:24:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFZ-0005An-2M for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:13 +0000 Received: from [85.158.139.211:55975] by server-9.bemta-5.messagelabs.com id C6/1B-24493-CB017425; Sat, 28 Sep 2013 17:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1380389047!5174927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1948 invoked from network); 28 Sep 2013 17:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFT-0008CA-0P for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFS-0005oS-R3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:06 +0000 Date: Sat, 28 Sep 2013 17:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rewrite start of day page table and cpu bring up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4557c2292854d047ba8e44a69e2d60d99533d155 Author: Ian Campbell AuthorDate: Thu Aug 29 16:25:00 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: rewrite start of day page table and cpu bring up This is unfortunately a rather large monolithic patch. Rather than bringing up all CPUs in lockstep as we setup paging and relocate Xen instead create a simplified set of dedicated boot time pagetables. This allows secondary CPUs to remain powered down or in the firmware until we actually want to enable them. The bringup is now done later on in C and can be driven by DT etc. I have included code for the vexpress platform, but other platforms will need to be added. The mechanism for deciding how to bring up a CPU differs between arm32 and arm64. On arm32 it is essentially a per-platform property, with the exception of PSCI which can be implemented globally (but isn't here). On arm64 there is a per-cpu property in the device tree. Secondary CPUs are brought up directly into the relocated Xen image, instead of relying on being able to launch on the unrelocated Xen and hoping that it hasn't been clobbered. As part of this change drop support for switching from secure mode to NS HYP as well as the early CPU kick. Xen now requires that it is launched in NS HYP mode and that firmware configure things such that secondary CPUs can be woken up by a primarly CPU in HYP mode. This may require fixes to bootloaders or the use of a boot wrapper. The changes done here (re)exposed an issue with relocating Xen and the compiler spilling values to the stack between the copy and the actual switch to the relocaed copy of Xen in setup_pagetables. Therefore switch to doing the copy and switch in a single asm function where we can control precisely what gets spilled to the stack etc. Since we now have a separate set of boot pagetables it is much easier to build the real Xen pagetables inplace before relocating rather than the more complex approach of rewriting the pagetables in the relocated copy before switching. This will also enable Xen to be loaded above the 4GB boundary on 64-bit. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 - xen/arch/arm/arm32/head.S | 391 +++++++++++++++++++----------- xen/arch/arm/arm32/mode_switch.S | 158 ------------ xen/arch/arm/arm64/Makefile | 1 - xen/arch/arm/arm64/head.S | 396 ++++++++++++++++++++---------- xen/arch/arm/arm64/mode_switch.S | 89 ------- xen/arch/arm/mm.c | 197 +++++++++------ xen/arch/arm/setup.c | 30 ++- xen/arch/arm/smpboot.c | 57 ++--- xen/include/asm-arm/mm.h | 3 +- xen/include/asm-arm/platforms/exynos5.h | 14 - xen/include/asm-arm/platforms/vexpress.h | 11 - xen/include/asm-arm/smp.h | 6 - 13 files changed, 679 insertions(+), 675 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 463b1f5..aacdcb9 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -1,7 +1,6 @@ subdir-y += lib obj-y += entry.o -obj-y += mode_switch.o obj-y += proc-v7.o obj-y += traps.o diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index bbcb3a0..510ccff 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -37,6 +37,25 @@ #include EARLY_PRINTK_INC #endif +/* + * Common register usage in this file: + * r0 - + * r1 - + * r2 - + * r3 - + * r4 - + * r5 - + * r6 - + * r7 - CPUID + * r8 - DTB address (boot CPU only) + * r9 - paddr(start) + * r10 - phys offset + * r11 - UART address + * r12 - is_secondary_cpu + * r13 - SP + * r14 - LR + * r15 - PC + */ /* Macro to print a string to the UART, if there is one. * Clobbers r0-r3. */ #ifdef EARLY_PRINTK @@ -59,7 +78,6 @@ * or the initial pagetable code below will need adjustment. */ .global start start: -GLOBAL(init_secondary) /* currently unused */ /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ @@ -77,7 +95,6 @@ past_zImage: cpsid aif /* Disable all interrupts */ /* Save the bootloader arguments in less-clobberable registers */ - mov r5, r1 /* r5: ARM-linux machine type */ mov r8, r2 /* r8 := DTB base address */ /* Find out where we are */ @@ -91,53 +108,55 @@ past_zImage: add r8, r10 /* r8 := paddr(DTB) */ #endif - /* Are we the boot CPU? */ - mov r12, #0 /* r12 := CPU ID */ - mrc CP32(r0, MPIDR) - tst r0, #(1<<31) /* Multiprocessor extension supported? */ - beq boot_cpu - tst r0, #(1<<30) /* Uniprocessor system? */ - bne boot_cpu - bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ - beq boot_cpu /* If we're CPU 0, boot now */ - - /* Non-boot CPUs wait here to be woken up one at a time. */ -1: dsb - ldr r0, =smp_up_cpu /* VA of gate */ - add r0, r0, r10 /* PA of gate */ - ldr r1, [r0] /* Which CPU is being booted? */ - teq r1, r12 /* Is it us? */ - wfene - bne 1b + mov r12, #0 /* r12 := is_secondary_cpu */ + + b common_start + +GLOBAL(init_secondary) + cpsid aif /* Disable all interrupts */ + + /* Find out where we are */ + ldr r0, =start + adr r9, start /* r9 := paddr (start) */ + sub r10, r9, r0 /* r10 := phys-offset */ + + mov r12, #1 /* r12 := is_secondary_cpu */ + +common_start: + mov r7, #0 /* r7 := CPU ID. Initialy zero until we + * find that multiprocessor extensions are + * present and the system is SMP */ + mrc CP32(r1, MPIDR) + tst r1, #(1<<31) /* Multiprocessor extension supported? */ + beq 1f + tst r1, #(1<<30) /* Uniprocessor system? */ + bne 1f + bic r7, r1, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ +1: + + /* Non-boot CPUs wait here until __cpu_up is ready for them */ + teq r12, #0 + beq 1f + + ldr r0, =smp_up_cpu + add r0, r0, r10 /* Apply physical offset */ + dsb +2: ldr r1, [r0] + cmp r1, r7 + beq 1f + wfe + b 2b +1: -boot_cpu: #ifdef EARLY_PRINTK ldr r11, =EARLY_UART_BASE_ADDRESS /* r11 := UART base address */ - teq r12, #0 /* CPU 0 sets up the UART too */ + teq r12, #0 /* Boot CPU sets up the UART too */ bleq init_uart PRINT("- CPU ") - mov r0, r12 + mov r0, r7 bl putn PRINT(" booting -\r\n") #endif - /* Secondary CPUs doesn't have machine ID - * - Store machine ID on boot CPU - * - Load machine ID on secondary CPUs - * Machine ID is needed in kick_cpus and enter_hyp_mode */ - ldr r0, =machine_id /* VA of machine_id */ - add r0, r0, r10 /* PA of machine_id */ - teq r12, #0 - streq r5, [r0] /* On boot CPU save machine ID */ - ldrne r5, [r0] /* If non boot cpu r5 := machine ID */ - - /* Wake up secondary cpus */ - teq r12, #0 - bleq kick_cpus - - PRINT("- Machine ID ") - mov r0, r5 - bl putn - PRINT(" -\r\n") /* Check that this CPU has Hyp mode */ mrc CP32(r0, ID_PFR1) @@ -147,28 +166,19 @@ boot_cpu: PRINT("- CPU doesn't support the virtualization extensions -\r\n") b fail 1: - /* Check if we're already in it */ + + /* Check that we're already in Hyp mode */ mrs r0, cpsr and r0, r0, #0x1f /* Mode is in the low 5 bits of CPSR */ teq r0, #0x1a /* Hyp Mode? */ - bne 1f - PRINT("- Started in Hyp mode -\r\n") - b hyp -1: - /* Otherwise, it must have been Secure Supervisor mode */ - mrc CP32(r0, SCR) - tst r0, #0x1 /* Not-Secure bit set? */ - beq 1f - PRINT("- CPU is not in Hyp mode or Secure state -\r\n") + beq hyp + + /* OK, we're boned. */ + PRINT("- Xen must be entered in NS Hyp mode -\r\n" \ + "- Please update the bootloader -\r\n") b fail -1: - /* OK, we're in Secure state. */ - PRINT("- Started in Secure state -\r\n- Entering Hyp mode -\r\n") - ldr r0, =enter_hyp_mode /* VA of function */ - adr lr, hyp /* Set return address for call */ - add pc, r0, r10 /* Call PA of function */ -hyp: +hyp: PRINT("- Xen starting in Hyp mode -\r\n") /* Zero BSS On the boot CPU to avoid nasty surprises */ teq r12, #0 @@ -208,8 +218,8 @@ skip_bss: bl putn PRINT(" -\r\n") b fail - 2: + /* Jump to cpu_init */ ldr r1, [r1, #PROCINFO_cpu_init] /* r1 := vaddr(init func) */ adr lr, cpu_init_done /* Save return address */ @@ -242,68 +252,69 @@ cpu_init_done: ldr r0, =(HSCTLR_BASE|SCTLR_A) mcr CP32(r0, HSCTLR) + /* Rebuild the boot pagetable's first-level entries. The structure + * is described in mm.c. + * + * After the CPU enables paging it will add the fixmap mapping + * to these page tables, however this may clash with the 1:1 + * mapping. So each CPU must rebuild the page tables here with + * the 1:1 in place. */ + /* Write Xen's PT's paddr into the HTTBR */ ldr r4, =boot_pgtable - add r4, r4, r10 /* r4 := paddr (xen_pagetable) */ - mov r5, #0 /* r4:r5 is paddr (xen_pagetable) */ + add r4, r4, r10 /* r4 := paddr (boot_pagetable) */ + mov r5, #0 /* r4:r5 is paddr (boot_pagetable) */ mcrr CP64(r4, r5, HTTBR) - /* Non-boot CPUs don't need to rebuild the pagetable */ - teq r12, #0 - bne pt_ready - - /* console fixmap */ -#if defined(EARLY_PRINTK) - ldr r1, =xen_fixmap - add r1, r1, r10 /* r1 := paddr (xen_fixmap) */ - mov r3, #0 - lsr r2, r11, #12 - lsl r2, r2, #12 /* 4K aligned paddr of UART */ - orr r2, r2, #PT_UPPER(DEV_L3) - orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ - strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ -#endif - - /* Build the baseline idle pagetable's first-level entries */ - ldr r1, =xen_second - add r1, r1, r10 /* r1 := paddr (xen_second) */ + /* Setup boot_pgtable: */ + ldr r1, =boot_second + add r1, r1, r10 /* r1 := paddr (boot_second) */ mov r3, #0x0 - orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of xen_second */ + + /* ... map boot_second in boot_pgtable[0] */ + orr r2, r1, #PT_UPPER(PT) /* r2:r3 := table map of boot_second */ orr r2, r2, #PT_LOWER(PT) /* (+ rights for linear PT) */ strd r2, r3, [r4, #0] /* Map it in slot 0 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #8] /* Map 2nd page in slot 1 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #16] /* Map 3rd page in slot 2 */ - add r2, r2, #0x1000 - strd r2, r3, [r4, #24] /* Map 4th page in slot 3 */ - - /* Now set up the second-level entries */ - orr r2, r9, #PT_UPPER(MEM) - orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB normal map of Xen */ - mov r4, r9, lsr #18 /* Slot for paddr(start) */ - strd r2, r3, [r1, r4] /* Map Xen there */ - ldr r4, =start - lsr r4, #18 /* Slot for vaddr(start) */ - strd r2, r3, [r1, r4] /* Map Xen there too */ - - /* xen_fixmap pagetable */ - ldr r2, =xen_fixmap - add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ - orr r2, r2, #PT_UPPER(PT) - orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ - add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ - mov r3, #0x0 - lsr r2, r8, #21 - lsl r2, r2, #21 /* 2MB-aligned paddr of DTB */ - orr r2, r2, #PT_UPPER(MEM) - orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ - add r4, r4, #8 - strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ + /* ... map of paddr(start) in boot_pgtable */ + lsrs r1, r9, #30 /* Offset of base paddr in boot_pgtable */ + beq 1f /* If it is in slot 0 then map in boot_second + * later on */ + lsl r2, r1, #30 /* Base address for 1GB mapping */ + orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ + orr r2, r2, #PT_LOWER(MEM) + lsl r1, r1, #3 /* r1 := Slot offset */ + strd r2, r3, [r4, r1] /* Mapping of paddr(start) */ + +1: /* Setup boot_second: */ + ldr r4, =boot_second + add r4, r4, r10 /* r1 := paddr (boot_second) */ + + lsr r2, r9, #20 /* Base address for 2MB mapping */ + lsl r2, r2, #20 + orr r2, r2, #PT_UPPER(MEM) /* r2:r3 := section map */ + orr r2, r2, #PT_LOWER(MEM) + + /* ... map of vaddr(start) in boot_second */ + ldr r1, =start + lsr r1, #18 /* Slot for vaddr(start) */ + strd r2, r3, [r4, r1] /* Map vaddr(start) */ + + /* ... map of paddr(start) in boot_second */ + lsrs r1, r9, #30 /* Base paddr */ + bne 1f /* If paddr(start) is not in slot 0 + * then the mapping was done in + * boot_pgtable above */ + + mov r1, r9, lsr #18 /* Slot for paddr(start) */ + strd r2, r3, [r4, r1] /* Map Xen there */ +1: + + /* Defer fixmap and dtb mapping until after paging enabled, to + * avoid them clashing with the 1:1 mapping. */ + + /* boot pagetable setup complete */ -pt_ready: PRINT("- Turning on paging -\r\n") ldr r1, =paging /* Explicit vaddr, not RIP-relative */ @@ -315,11 +326,53 @@ pt_ready: mov pc, r1 /* Get a proper vaddr into PC */ paging: + /* Now we can install the fixmap and dtb mappings, since we + * don't need the 1:1 map any more */ + dsb +#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ + /* Non-boot CPUs don't need to rebuild the fixmap itself, just + * the mapping from boot_second to xen_fixmap */ + teq r12, #0 + bne 1f + + /* Add UART to the fixmap table */ + ldr r1, =xen_fixmap /* r1 := vaddr (xen_fixmap) */ + mov r3, #0 + lsr r2, r11, #12 + lsl r2, r2, #12 /* 4K aligned paddr of UART */ + orr r2, r2, #PT_UPPER(DEV_L3) + orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ + strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +1: + + /* Map fixmap into boot_second */ + ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ + ldr r2, =xen_fixmap + add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ + orr r2, r2, #PT_UPPER(PT) + orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ + ldr r4, =FIXMAP_ADDR(0) + mov r4, r4, lsr #18 /* r4 := Slot for FIXMAP(0) */ + strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ -#ifdef EARLY_PRINTK /* Use a virtual address to access the UART. */ ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) #endif + /* Map the DTB in the boot misc slot */ + teq r12, #0 /* Only on boot CPU */ + bne 1f + + ldr r1, =boot_second + mov r3, #0x0 + lsr r2, r8, #21 + lsl r2, r2, #21 /* r2: 2MB-aligned paddr of DTB */ + orr r2, r2, #PT_UPPER(MEM) + orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ + ldr r4, =BOOT_FDT_VIRT_START + mov r4, r4, lsr #18 /* Slot for BOOT_FDT_VIRT_START */ + strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ + dsb +1: PRINT("- Ready -\r\n") @@ -327,10 +380,10 @@ paging: teq r12, #0 beq launch - /* Non-boot CPUs need to move on to the relocated pagetables */ - mov r0, #0 - ldr r4, =boot_ttbr /* VA of HTTBR value stashed by CPU 0 */ - add r4, r4, r10 /* PA of it */ + /* Non-boot CPUs need to move on to the proper pagetables, which were + * setup in init_secondary_pagetables. */ + + ldr r4, =init_ttbr /* VA of HTTBR value stashed by CPU 0 */ ldrd r4, r5, [r4] /* Actual value */ dsb mcrr CP64(r4, r5, HTTBR) @@ -342,29 +395,6 @@ paging: dsb /* Ensure completion of TLB+BP flush */ isb - /* Non-boot CPUs report that they've got this far */ - ldr r0, =ready_cpus -1: ldrex r1, [r0] /* { read # of ready CPUs } */ - add r1, r1, #1 /* Atomically { ++ } */ - strex r2, r1, [r0] /* { writeback } */ - teq r2, #0 - bne 1b - dsb - mcr CP32(r0, DCCMVAC) /* flush D-Cache */ - dsb - - /* Here, the non-boot CPUs must wait again -- they're now running on - * the boot CPU's pagetables so it's safe for the boot CPU to - * overwrite the non-relocated copy of Xen. Once it's done that, - * and brought up the memory allocator, non-boot CPUs can get their - * own stacks and enter C. */ -1: wfe - dsb - ldr r0, =smp_up_cpu - ldr r1, [r0] /* Which CPU is being booted? */ - teq r1, r12 /* Is it us? */ - bne 1b - launch: ldr r0, =init_data add r0, #INITINFO_stack /* Find the boot-time stack */ @@ -373,7 +403,7 @@ launch: sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ mov r1, r8 /* - DTB address */ - movs r2, r12 /* - CPU ID */ + movs r2, r7 /* - CPU ID */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ @@ -383,6 +413,82 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b +/* Copy Xen to new location and switch TTBR + * r1:r0 ttbr + * r2 source address + * r3 destination address + * [sp]=>r4 length + * + * Source and destination must be word aligned, length is rounded up + * to a 16 byte boundary. + * + * MUST BE VERY CAREFUL when saving things to RAM over the copy */ +ENTRY(relocate_xen) + push {r4,r5,r6,r7,r8,r9,r10,r11} + + ldr r4, [sp, #8*4] /* Get 4th argument from stack */ + + /* Copy 16 bytes at a time using: + * r5: counter + * r6: data + * r7: data + * r8: data + * r9: data + * r10: source + * r11: destination + */ + mov r5, r4 + mov r10, r2 + mov r11, r3 +1: ldmia r10!, {r6, r7, r8, r9} + stmia r11!, {r6, r7, r8, r9} + + subs r5, r5, #16 + bgt 1b + + /* Flush destination from dcache using: + * r5: counter + * r6: step + * r7: vaddr + */ + dsb /* So the CPU issues all writes to the range */ + + mov r5, r4 + ldr r6, =cacheline_bytes /* r6 := step */ + ldr r6, [r6] + mov r7, r3 + +1: mcr CP32(r7, DCCMVAC) + + add r7, r7, r6 + subs r5, r5, r6 + bgt 1b + + dsb /* Ensure the flushes happen before + * continuing */ + isb /* Ensure synchronization with previous + * changes to text */ + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ + mcr CP32(r0, BPIALL) /* Flush branch predictor */ + dsb /* Ensure completion of TLB+BP flush */ + isb + + mcrr CP64(r0, r1, HTTBR) + + dsb /* ensure memory accesses do not cross + * over the TTBR0 write */ + isb /* Ensure synchronization with previous + * changes to text */ + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ + mcr CP32(r0, BPIALL) /* Flush branch predictor */ + dsb /* Ensure completion of TLB+BP flush */ + isb + + pop {r4, r5,r6,r7,r8,r9,r10,r11} + + mov pc, lr #ifdef EARLY_PRINTK /* Bring up the UART. @@ -439,9 +545,6 @@ putn: mov pc, lr #endif /* !EARLY_PRINTK */ -/* Place holder for machine ID */ -machine_id: .word 0x0 - /* * Local variables: * mode: ASM diff --git a/xen/arch/arm/arm32/mode_switch.S b/xen/arch/arm/arm32/mode_switch.S deleted file mode 100644 index 2cd5888..0000000 --- a/xen/arch/arm/arm32/mode_switch.S +++ /dev/null @@ -1,158 +0,0 @@ -/* - * xen/arch/arm/mode_switch.S - * - * Start-of day code to take a CPU from Secure mode to Hyp mode. - * - * Tim Deegan - * Copyright (c) 2011-2012 Citrix Systems. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include - -/* Wake up secondary cpus - * This code relies on Machine ID and only works for Vexpress and the Arndale - * TODO: Move this code either later (via platform specific desc) or in a bootwrapper - * r5: Machine ID - * Clobber r0 r2 */ -GLOBAL(kick_cpus) - ldr r0, =MACH_TYPE_SMDK5250 - teq r5, r0 /* Are we running on the arndale? */ - beq kick_cpus_arndale - /* otherwise versatile express */ - /* write start paddr to v2m sysreg FLAGSSET register */ - ldr r0, =(V2M_SYS_MMIO_BASE) /* base V2M sysreg MMIO address */ - dsb - mov r2, #0xffffffff - str r2, [r0, #(V2M_SYS_FLAGSCLR)] - dsb - ldr r2, =start - add r2, r2, r10 - str r2, [r0, #(V2M_SYS_FLAGSSET)] - dsb - ldr r2, =V2M_GIC_BASE_ADDRESS /* r2 := VE gic base address */ - b kick_cpus_sgi -kick_cpus_arndale: - /* write start paddr to CPU 1 sysreg register */ - ldr r0, =(S5P_PA_SYSRAM) - ldr r2, =start - add r2, r2, r10 - str r2, [r0] - dsb - ldr r2, =EXYNOS5_GIC_BASE_ADDRESS /* r2 := Exynos5 gic base address */ -kick_cpus_sgi: - /* send an interrupt */ - ldr r0, =GIC_DR_OFFSET /* GIC distributor offset */ - add r0, r2 /* r0 := r0 + gic base address */ - mov r2, #0x1 - str r2, [r0, #(GICD_CTLR * 4)] /* enable distributor */ - mov r2, #0xfe0000 - str r2, [r0, #(GICD_SGIR * 4)] /* send IPI to everybody, SGI0 = Event check */ - dsb - str r2, [r0, #(GICD_CTLR * 4)] /* disable distributor */ - mov pc, lr - - -/* Get up a CPU into Hyp mode. Clobbers r0-r3. - * - * r5: Machine ID - * r12: CPU number - * - * This code is specific to the VE model/Arndale, and not intended to be used - * on production systems. As such it's a bit hackier than the main - * boot code in head.S. In future it will be replaced by better - * integration with the bootloader/firmware so that Xen always starts - * in Hyp mode. - * Clobber r0 - r4 */ -GLOBAL(enter_hyp_mode) - mov r3, lr /* Put return address in non-banked reg */ - cpsid aif, #0x16 /* Enter Monitor mode */ - mrc CP32(r0, SCR) - orr r0, r0, #0x100 /* Set HCE */ - orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ - bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ - mcr CP32(r0, SCR) - - ldr r2, =MACH_TYPE_SMDK5250 /* r4 := Arndale machine ID */ - /* By default load Arndale defaults values */ - ldr r0, =EXYNOS5_TIMER_FREQUENCY /* r0 := timer's frequency */ - ldr r1, =EXYNOS5_GIC_BASE_ADDRESS /* r1 := GIC base address */ - /* If it's not the Arndale machine ID, load VE values */ - teq r5, r2 - ldrne r0, =V2M_TIMER_FREQUENCY - ldrne r1, =V2M_GIC_BASE_ADDRESS - - /* Ugly: the system timer's frequency register is only - * programmable in Secure state. Since we don't know where its - * memory-mapped control registers live, we can't find out the - * right frequency. */ - mcr CP32(r0, CNTFRQ) - - mrc CP32(r0,NSACR) - ldr r4, =0x3fff /* Allow access to all co-processors in NS mode */ - orr r0, r0, r4 - orr r0, r0, #(1<<18) /* CA7/CA15: Allow access to ACTLR.SMP in NS mode */ - mcr CP32(r0, NSACR) - - add r0, r1, #GIC_DR_OFFSET - /* Disable the GIC distributor, on the boot CPU only */ - mov r4, #0 - teq r12, #0 /* Is this the boot CPU? */ - streq r4, [r0] - /* Continuing ugliness: Set up the GIC so NS state owns interrupts, - * The first 32 interrupts (SGIs & PPIs) must be configured on all - * CPUs while the remainder are SPIs and only need to be done one, on - * the boot CPU. */ - add r0, r0, #0x80 /* GICD_IGROUP0 */ - mov r2, #0xffffffff /* All interrupts to group 1 */ - str r2, [r0] /* Interrupts 0-31 (SGI & PPI) */ - teq r12, #0 /* Boot CPU? */ - bne skip_spis /* Don't route SPIs on secondary CPUs */ - - add r4, r1, #GIC_DR_OFFSET - ldr r4, [r4, #4] /* r4 := Interrupt Controller Type Reg */ - and r4, r4, #GICD_TYPE_LINES /* r4 := number of SPIs */ -1: teq r4, #0 - beq skip_spis - add r0, r0, #4 /* Go to the new group */ - str r2, [r0] /* Update the group */ - sub r4, r4, #1 - b 1b -skip_spis: - /* Disable the GIC CPU interface on all processors */ - add r0, r1, #GIC_CR_OFFSET - mov r1, #0 - str r1, [r0] - /* Must drop priority mask below 0x80 before entering NS state */ - ldr r1, =0xff - str r1, [r0, #0x4] /* -> GICC_PMR */ - /* Reset a few config registers */ - mov r0, #0 - mcr CP32(r0, FCSEIDR) - mcr CP32(r0, CONTEXTIDR) - - mrs r0, cpsr /* Copy the CPSR */ - add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ - msr spsr_cxsf, r0 /* into the SPSR */ - movs pc, r3 /* Exception-return into Hyp mode */ - -/* - * Local variables: - * mode: ASM - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 30fb480..5d28bad 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -1,7 +1,6 @@ subdir-y += lib obj-y += entry.o -obj-y += mode_switch.o obj-y += traps.o obj-y += domain.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index ac1b75a..b2d44cc 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -33,6 +33,41 @@ #include EARLY_PRINTK_INC #endif +/* + * Common register usage in this file: + * x0 - + * x1 - + * x2 - + * x3 - + * x4 - + * x5 - + * x6 - + * x7 - + * x8 - + * x9 - + * x10 - + * x11 - + * x12 - + * x13 - + * x14 - + * x15 - + * x16 - + * x17 - + * x18 - + * x19 - paddr(start) + * x20 - phys offset + * x21 - DTB address (boot cpu only) + * x22 - is_secondary_cpu + * x23 - UART address + * x24 - cpuid + * x25 - + * x26 - + * x27 - + * x28 - + * x29 - + * x30 - lr + */ + /* Macro to print a string to the UART, if there is one. * Clobbers x0-x3. */ #ifdef EARLY_PRINTK @@ -65,7 +100,6 @@ .global start start: -GLOBAL(init_secondary) /* currently unused */ /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -100,69 +134,73 @@ real_start: add x21, x21, x20 /* x21 := paddr(DTB) */ #endif - /* Are we the boot CPU? */ - mov x22, #0 /* x22 := CPU ID */ + mov x22, #0 /* x22 := is_secondary_cpu */ + + b common_start + +GLOBAL(init_secondary) + msr DAIFSet, 0xf /* Disable all interrupts */ + + /* Find out where we are */ + ldr x0, =start + adr x19, start /* x19 := paddr (start) */ + sub x20, x19, x0 /* x20 := phys-offset */ + + mov x22, #1 /* x22 := is_secondary_cpu */ + +common_start: + mov x24, #0 /* x24 := CPU ID. Initialy zero until we + * find that multiprocessor extensions are + * present and the system is SMP */ mrs x0, mpidr_el1 - tbz x0, 31, boot_cpu /* Multiprocessor extension supported? */ - tbnz x0, 30, boot_cpu /* Uniprocessor system? */ + tbz x0, 31, 1f /* Multiprocessor extension not supported? */ + tbnz x0, 30, 1f /* Uniprocessor system? */ mov x13, #(0xff << 24) - bics x22, x0, x13 /* Mask out flags to get CPU ID */ - b.eq boot_cpu /* If we're CPU 0, boot now */ - - /* Non-boot CPUs wait here to be woken up one at a time. */ -1: dsb sy - ldr x0, =smp_up_cpu /* VA of gate */ - add x0, x0, x20 /* PA of gate */ - ldr x1, [x0] /* Which CPU is being booted? */ - cmp x1, x22 /* Is it us? */ - b.eq 2f + bic x24, x0, x13 /* Mask out flags to get CPU ID */ +1: + + /* Non-boot CPUs wait here until __cpu_up is ready for them */ + cbz x22, 1f + + ldr x0, =smp_up_cpu + add x0, x0, x20 /* Apply physical offset */ + dsb sy +2: ldr x1, [x0] + cmp x1, x24 + beq 1f wfe - b 1b -2: + b 2b +1: -boot_cpu: #ifdef EARLY_PRINTK ldr x23, =EARLY_UART_BASE_ADDRESS /* x23 := UART base address */ cbnz x22, 1f -#ifdef EARLY_PRINTK_INIT_UART - bl init_uart /* CPU 0 sets up the UART too */ -#endif + bl init_uart /* Boot CPU sets up the UART too */ 1: PRINT("- CPU ") - mov x0, x22 + mov x0, x24 bl putn PRINT(" booting -\r\n") #endif PRINT("- Current EL ") - mrs x0, CurrentEL + mrs x4, CurrentEL + mov x0, x4 bl putn PRINT(" -\r\n") - /* Are we in EL3 */ - mrs x0, CurrentEL - cmp x0, #PSR_MODE_EL3t - ccmp x0, #PSR_MODE_EL3h, #0x4, ne - b.eq 1f /* Yes */ - /* Are we in EL2 */ - cmp x0, #PSR_MODE_EL2t - ccmp x0, #PSR_MODE_EL2h, #0x4, ne - b.eq 2f /* Yes */ + cmp x4, #PSR_MODE_EL2t + ccmp x4, #PSR_MODE_EL2h, #0x4, ne + b.eq el2 /* Yes */ - /* Otherwise, it must have been EL0 or EL1 */ - PRINT("- CPU is not in EL3 or EL2 -\r\n") - b fail + /* OK, we're boned. */ + PRINT("- Xen must be entered in NS EL2 mode -\r\n" \ + "- Please update the bootloader -\r\n") + b fail -1: PRINT("- Started in EL3 -\r\n- Entering EL2 -\r\n") - ldr x1, =enter_el2_mode /* VA of function */ - add x1, x1, x20 /* PA of function */ - adr x30, el2 /* Set return address for call */ - br x1 /* Call function */ +el2: PRINT("- Xen starting at EL2 -\r\n") -2: PRINT("- Started in EL2 mode -\r\n") - -el2: /* Zero BSS On the boot CPU to avoid nasty surprises */ cbnz x22, skip_bss @@ -177,9 +215,10 @@ el2: b.lo 1b skip_bss: - PRINT("- Setting up control registers -\r\n") + /* XXXX call PROCINFO_cpu_init here */ + /* Set up memory attribute type tables */ ldr x0, =MAIRVAL msr mair_el2, x0 @@ -193,7 +232,7 @@ skip_bss: ldr x0, =0x80802500 msr tcr_el2, x0 - /* Set up the HSCTLR: + /* Set up the SCTLR_EL2: * Exceptions in LE ARM, * Low-latency IRQs disabled, * Write-implies-XN disabled (for now), @@ -204,69 +243,90 @@ skip_bss: ldr x0, =(HSCTLR_BASE|SCTLR_A) msr SCTLR_EL2, x0 - /* Write Xen's PT's paddr into the HTTBR */ + /* Rebuild the boot pagetable's first-level entries. The structure + * is described in mm.c. + * + * After the CPU enables paging it will add the fixmap mapping + * to these page tables, however this may clash with the 1:1 + * mapping. So each CPU must rebuild the page tables here with + * the 1:1 in place. */ + + /* Write Xen's PT's paddr into TTBR0_EL2 */ ldr x4, =boot_pgtable - add x4, x4, x20 /* x4 := paddr (xen_pagetable) */ + add x4, x4, x20 /* x4 := paddr (boot_pagetable) */ msr TTBR0_EL2, x4 - /* Non-boot CPUs don't need to rebuild the pagetable */ - cbnz x22, pt_ready - + /* Setup boot_pgtable: */ ldr x1, =boot_first - add x1, x1, x20 /* x1 := paddr (xen_first) */ - mov x3, #PT_PT /* x2 := table map of xen_first */ - orr x2, x1, x3 /* (+ rights for linear PT) */ - str x2, [x4, #0] /* Map it in slot 0 */ + add x1, x1, x20 /* x1 := paddr (boot_first) */ - mov x4, x1 /* Next level into xen_first */ + /* ... map boot_first in boot_pgtable[0] */ + mov x3, #PT_PT /* x2 := table map of boot_first */ + orr x2, x1, x3 /* + rights for linear PT */ + str x2, [x4, #0] /* Map it in slot 0 */ - /* console fixmap */ - ldr x1, =xen_fixmap - add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ - lsr x2, x23, #12 - lsl x2, x2, #12 /* 4K aligned paddr of UART */ - mov x3, #PT_DEV_L3 - orr x2, x2, x3 /* x2 := 4K dev map including UART */ - str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ + /* ... map of paddr(start) in boot_pgtable */ + lsr x1, x19, #39 /* Offset of base paddr in boot_pgtable */ + cbz x1, 1f /* It's in slot 0, map in boot_first + * or boot_second later on */ - /* Build the baseline idle pagetable's first-level entries */ - ldr x1, =xen_second - add x1, x1, x20 /* x1 := paddr (xen_second) */ - mov x3, #PT_PT /* x2 := table map of xen_second */ - orr x2, x1, x3 /* (+ rights for linear PT) */ + lsl x2, x1, #39 /* Base address for 512GB mapping */ + mov x3, #PT_MEM /* x2 := Section mapping */ + orr x2, x2, x3 + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Mapping of paddr(start)*/ + +1: /* Setup boot_first: */ + ldr x4, =boot_first /* Next level into boot_first */ + add x4, x4, x20 /* x4 := paddr(boot_first) */ + + /* ... map boot_second in boot_first[0] */ + ldr x1, =boot_second + add x1, x1, x20 /* x1 := paddr(boot_second) */ + mov x3, #PT_PT /* x2 := table map of boot_first */ + orr x2, x1, x3 /* + rights for linear PT */ str x2, [x4, #0] /* Map it in slot 0 */ - add x2, x2, #0x1000 - str x2, [x4, #8] /* Map 2nd page in slot 1 */ - add x2, x2, #0x1000 - str x2, [x4, #16] /* Map 3rd page in slot 2 */ - add x2, x2, #0x1000 - str x2, [x4, #24] /* Map 4th page in slot 3 */ - - /* Now set up the second-level entries */ - mov x3, #PT_MEM - orr x2, x19, x3 /* x2 := 2MB normal map of Xen */ - orr x4, xzr, x19, lsr #18 - str x2, [x1, x4] /* Map Xen there */ - ldr x4, =start - lsr x4, x4, #18 /* Slot for vaddr(start) */ - str x2, [x1, x4] /* Map Xen there too */ - - /* xen_fixmap pagetable */ - ldr x2, =xen_fixmap - add x2, x2, x20 /* x2 := paddr (xen_fixmap) */ - mov x3, #PT_PT - orr x2, x2, x3 /* x2 := table map of xen_fixmap */ - add x4, x4, #8 - str x2, [x1, x4] /* Map it in the fixmap's slot */ - lsr x2, x21, #21 - lsl x2, x2, #21 /* 2MB-aligned paddr of DTB */ - mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ + /* ... map of paddr(start) in boot_first */ + lsr x2, x19, #30 /* x2 := Offset of base paddr in boot_first */ + and x1, x2, 0x1ff /* x1 := Slot to use */ + cbz x1, 1f /* It's in slot 0, map in boot_second */ + + lsl x2, x2, #30 /* Base address for 1GB mapping */ + mov x3, #PT_MEM /* x2 := Section map */ orr x2, x2, x3 - add x4, x4, #8 - str x2, [x1, x4] /* Map it in the early fdt slot */ + lsl x1, x1, #3 /* x1 := Slot offset */ + str x2, [x4, x1] /* Create mapping of paddr(start)*/ + +1: /* Setup boot_second: */ + ldr x4, =boot_second + add x4, x4, x20 /* x4 := paddr (boot_second) */ + + lsr x2, x19, #20 /* Base address for 2MB mapping */ + lsl x2, x2, #20 + mov x3, #PT_MEM /* x2 := Section map */ + orr x2, x2, x3 + + /* ... map of vaddr(start) in boot_second */ + ldr x1, =start + lsr x1, x1, #18 /* Slot for vaddr(start) */ + str x2, [x4, x1] /* Map vaddr(start) */ + + /* ... map of paddr(start) in boot_second */ + lsr x1, x19, #30 /* Base paddr */ + cbnz x1, 1f /* If paddr(start) is not in slot 0 + * then the mapping was done in + * boot_pgtable or boot_first above */ + + lsr x1, x19, #18 /* Slot for paddr(start) */ + str x2, [x4, x1] /* Map Xen there */ +1: + + /* Defer fixmap and dtb mapping until after paging enabled, to + * avoid them clashing with the 1:1 mapping. */ + + /* boot pagetable setup complete */ -pt_ready: PRINT("- Turning on paging -\r\n") ldr x1, =paging /* Explicit vaddr, not RIP-relative */ @@ -279,17 +339,60 @@ pt_ready: br x1 /* Get a proper vaddr into PC */ paging: + /* Now we can install the fixmap and dtb mappings, since we + * don't need the 1:1 map any more */ + dsb sy +#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ + /* Non-boot CPUs don't need to rebuild the fixmap itself, just + * the mapping from boot_second to xen_fixmap */ + cbnz x22, 1f + + /* Add UART to the fixmap table */ + ldr x1, =xen_fixmap + add x1, x1, x20 /* x1 := paddr (xen_fixmap) */ + lsr x2, x23, #12 + lsl x2, x2, #12 /* 4K aligned paddr of UART */ + mov x3, #PT_DEV_L3 + orr x2, x2, x3 /* x2 := 4K dev map including UART */ + str x2, [x1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +1: + + /* Map fixmap into boot_second */ + ldr x4, =boot_second /* x4 := vaddr (boot_second) */ + ldr x2, =xen_fixmap + add x2, x2, x20 /* x2 := paddr (xen_fixmap) */ + mov x3, #PT_PT + orr x2, x2, x3 /* x2 := table map of xen_fixmap */ + ldr x1, =FIXMAP_ADDR(0) + lsr x1, x1, #18 /* x1 := Slot for FIXMAP(0) */ + str x2, [x4, x1] /* Map it in the fixmap's slot */ + /* Use a virtual address to access the UART. */ ldr x23, =FIXMAP_ADDR(FIXMAP_CONSOLE) +#endif + + /* Map the DTB in the boot misc slot */ + cbnz x22, 1f /* Only on boot CPU */ + + lsr x2, x21, #21 + lsl x2, x2, #21 /* x2 := 2MB-aligned paddr of DTB */ + mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ + orr x2, x2, x3 + ldr x1, =BOOT_FDT_VIRT_START + lsr x1, x1, #18 /* x4 := Slot for BOOT_FDT_VIRT_START */ + str x2, [x4, x1] /* Map it in the early fdt slot */ + dsb sy +1: PRINT("- Ready -\r\n") /* The boot CPU should go straight into C now */ cbz x22, launch - /* Non-boot CPUs need to move on to the relocated pagetables */ - ldr x4, =boot_ttbr /* VA of TTBR0_EL2 stashed by CPU 0 */ - add x4, x4, x20 /* PA of it */ + /* Non-boot CPUs need to move on to the proper pagetables, which were + * setup in init_secondary_pagetables. */ + + ldr x4, =init_ttbr /* VA of TTBR0_EL2 stashed by CPU 0 */ ldr x4, [x4] /* Actual value */ dsb sy msr TTBR0_EL2, x4 @@ -299,28 +402,6 @@ paging: dsb sy /* Ensure completion of TLB flush */ isb - /* Non-boot CPUs report that they've got this far */ - ldr x0, =ready_cpus -1: ldaxr x1, [x0] /* { read # of ready CPUs } */ - add x1, x1, #1 /* Atomically { ++ } */ - stlxr w2, x1, [x0] /* { writeback } */ - cbnz w2, 1b - dsb sy - dc cvac, x0 /* Flush D-Cache */ - dsb sy - - /* Here, the non-boot CPUs must wait again -- they're now running on - * the boot CPU's pagetables so it's safe for the boot CPU to - * overwrite the non-relocated copy of Xen. Once it's done that, - * and brought up the memory allocator, non-boot CPUs can get their - * own stacks and enter C. */ -1: wfe - dsb sy - ldr x0, =smp_up_cpu - ldr x1, [x0] /* Which CPU is being booted? */ - cmp x1, x22 /* Is it us? */ - b.ne 1b - launch: ldr x0, =init_data add x0, x0, #INITINFO_stack /* Find the boot-time stack */ @@ -331,7 +412,7 @@ launch: mov x0, x20 /* Marshal args: - phys_offset */ mov x1, x21 /* - FDT */ - mov x2, x22 /* - CPU ID */ + mov x2, x24 /* - CPU ID */ cbz x22, start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ @@ -341,13 +422,80 @@ fail: PRINT("- Boot failed -\r\n") 1: wfe b 1b -#ifdef EARLY_PRINTK +/* Copy Xen to new location and switch TTBR + * x0 ttbr + * x1 source address + * x2 destination address + * x3 length + * + * Source and destination must be word aligned, length is rounded up + * to a 16 byte boundary. + * + * MUST BE VERY CAREFUL when saving things to RAM over the copy */ +ENTRY(relocate_xen) + /* Copy 16 bytes at a time using: + * x9: counter + * x10: data + * x11: data + * x12: source + * x13: destination + */ + mov x9, x3 + mov x12, x1 + mov x13, x2 +1: ldp x10, x11, [x12], #16 + stp x10, x11, [x13], #16 + + subs x9, x9, #16 + bgt 1b + + /* Flush destination from dcache using: + * x9: counter + * x10: step + * x11: vaddr + */ + dsb sy /* So the CPU issues all writes to the range */ + + mov x9, x3 + ldr x10, =cacheline_bytes /* x10 := step */ + ldr x10, [x10] + mov x11, x2 + +1: dc cvac, x11 + + add x11, x11, x10 + subs x9, x9, x10 + bgt 1b + + dsb sy /* Ensure the flushes happen before + * continuing */ + isb /* Ensure synchronization with previous + * changes to text */ + tlbi alle2 /* Flush hypervisor TLB */ + ic iallu /* Flush I-cache */ + dsb sy /* Ensure completion of TLB flush */ + isb + + msr TTBR0_EL2, x0 + + isb /* Ensure synchronization with previous + * changes to text */ + tlbi alle2 /* Flush hypervisor TLB */ + ic iallu /* Flush I-cache */ + dsb sy /* Ensure completion of TLB flush */ + isb + + ret + +#ifdef EARLY_PRINTK /* Bring up the UART. * x23: Early UART base address * Clobbers x0-x1 */ init_uart: +#ifdef EARLY_PRINTK_INIT_UART early_uart_init x23, 0 +#endif adr x0, 1f b puts 1: .asciz "- UART enabled -\r\n" diff --git a/xen/arch/arm/arm64/mode_switch.S b/xen/arch/arm/arm64/mode_switch.S deleted file mode 100644 index ea64f22..0000000 --- a/xen/arch/arm/arm64/mode_switch.S +++ /dev/null @@ -1,89 +0,0 @@ -/* - * xen/arch/arm/arm64/mode_switch.S - * - * Start-of day code to take a CPU from EL3 to EL2. Largely taken from - * bootwrapper. - * - * Ian Campbell - * Copyright (c) 2012 Citrix Systems. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -/* Get up a CPU into EL2. Clobbers x0-x3. - * - * Expects x22 == CPU number - * Expects x30 == EL2 entry point - * - * This code is specific to the VE model, and not intended to be used - * on production systems. As such it's a bit hackier than the main - * boot code in head.S. In future it will be replaced by better - * integration with the bootloader/firmware so that Xen always starts - * at EL2. - */ -GLOBAL(enter_el2_mode) - mov x0, #0x30 // RES1 - orr x0, x0, #(1 << 0) // Non-secure EL1 - orr x0, x0, #(1 << 8) // HVC enable - orr x0, x0, #(1 << 10) // 64-bit EL2 - msr scr_el3, x0 - - msr cptr_el3, xzr // Disable copro. traps to EL3 - - ldr x0, =0x01800000 // 24Mhz - msr cntfrq_el0, x0 - - /* - * Check for the primary CPU to avoid a race on the distributor - * registers. - */ - cbnz x22, 1f - - ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_DR_OFFSET) // GICD_CTLR - mov w0, #3 // EnableGrp0 | EnableGrp1 - str w0, [x1] - -1: ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_DR_OFFSET+0x80) // GICD_IGROUPR - mov w0, #~0 // Grp1 interrupts - str w0, [x1], #4 - b.ne 2f // Only local interrupts for secondary CPUs - str w0, [x1], #4 - str w0, [x1], #4 - -2: ldr x1, =(V2M_GIC_BASE_ADDRESS+GIC_CR_OFFSET) // GICC_CTLR - ldr w0, [x1] - mov w0, #3 // EnableGrp0 | EnableGrp1 - str w0, [x1] - - mov w0, #1 << 7 // allow NS access to GICC_PMR - str w0, [x1, #4] // GICC_PMR - - msr sctlr_el2, xzr - - /* - * Prepare the switch to the EL2_SP1 mode from EL3 - */ - msr elr_el3, x30 // Return to desired function - mov x1, #0x3c9 // EL2_SP1 | D | A | I | F - msr spsr_el3, x1 - eret - -/* - * Local variables: - * mode: ASM - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 89d9f57..969a361 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -43,40 +43,70 @@ struct domain *dom_xen, *dom_io, *dom_cow; -/* Static start-of-day pagetables that we use before the - * allocators are up. These go on to become the boot CPU's real pagetables. +/* Static start-of-day pagetables that we use before the allocators + * are up. These are used by all CPUs during bringup before switching + * to the CPUs own pagetables. + * + * These pagetables have a very simple structure. They include: + * - a 2MB mapping of xen at XEN_VIRT_START, boot_first and + * boot_second are used to populate the trie down to that mapping. + * - a 1:1 mapping of xen at its current physical address. This uses a + * section mapping at whichever of boot_{pgtable,first,second} + * covers that physical address. + * + * For the boot CPU these mappings point to the address where Xen was + * loaded by the bootloader. For secondary CPUs they point to the + * relocated copy of Xen for the benefit of secondary CPUs. + * + * In addition to the above for the boot CPU the device-tree is + * initially mapped in the boot misc slot. This mapping is not present + * for secondary CPUs. + * + * Finally, if EARLY_PRINTK is enabled then xen_fixmap will be mapped + * by the CPU once it has moved off the 1:1 mapping. */ lpae_t boot_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #ifdef CONFIG_ARM_64 lpae_t boot_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); -/* The first page of the first level mapping of the xenheap. The - * subsequent xenheap first level pages are dynamically allocated, but - * we need this one to bootstrap ourselves. */ -lpae_t xenheap_first_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); -/* The zeroeth level slot which uses xenheap_first_first. Used because - * setup_xenheap_mappings otherwise relies on mfn_to_virt which isn't - * valid for a non-xenheap mapping. */ -static __initdata int xenheap_first_first_slot = -1; #endif +lpae_t boot_second[LPAE_ENTRIES] __attribute__((__aligned__(4096))); + +/* Main runtime page tables */ /* - * xen_pgtable and xen_dommap are per-PCPU and are allocated before - * bringing up each CPU. On 64-bit a first level table is also allocated. + * For arm32 xen_pgtable and xen_dommap are per-PCPU and are allocated before + * bringing up each CPU. For arm64 xen_pgtable is common to all PCPUs. * - * xen_second, xen_fixmap and xen_xenmap are shared between all PCPUs. + * xen_second, xen_fixmap and xen_xenmap are always shared between all + * PCPUs. */ #ifdef CONFIG_ARM_64 -#define THIS_CPU_PGTABLE boot_pgtable +lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t xen_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +#define THIS_CPU_PGTABLE xen_pgtable #else /* Per-CPU pagetable pages */ /* xen_pgtable == root of the trie (zeroeth level on 64-bit, first on 32-bit) */ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); #define THIS_CPU_PGTABLE this_cpu(xen_pgtable) /* xen_dommap == pages used by map_domain_page, these pages contain - * the second level pagetables which mapp the domheap region + * the second level pagetables which map the domheap region * DOMHEAP_VIRT_START...DOMHEAP_VIRT_END in 2MB chunks. */ static DEFINE_PER_CPU(lpae_t *, xen_dommap); +/* Root of the trie for cpu0 */ +lpae_t cpu0_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +#endif + +#ifdef CONFIG_ARM_64 +/* The first page of the first level mapping of the xenheap. The + * subsequent xenheap first level pages are dynamically allocated, but + * we need this one to bootstrap ourselves. */ +lpae_t xenheap_first_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +/* The zeroeth level slot which uses xenheap_first_first. Used because + * setup_xenheap_mappings otherwise relies on mfn_to_virt which isn't + * valid for a non-xenheap mapping. */ +static __initdata int xenheap_first_first_slot = -1; #endif /* Common pagetable leaves */ @@ -104,9 +134,8 @@ lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); * as appropriate. */ static lpae_t xen_xenmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); - /* Non-boot CPUs use this to find the correct pagetables. */ -uint64_t boot_ttbr; +uint64_t init_ttbr; static paddr_t phys_offset; @@ -131,6 +160,12 @@ static inline void check_memory_layout_alignment_constraints(void) { BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK); /* 1GB aligned regions */ BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK); + /* Page table structure constraints */ +#ifdef CONFIG_ARM_64 + BUILD_BUG_ON(zeroeth_table_offset(XEN_VIRT_START)); +#endif + BUILD_BUG_ON(first_table_offset(XEN_VIRT_START)); + BUILD_BUG_ON(second_linear_offset(XEN_VIRT_START) >= LPAE_ENTRIES); #ifdef CONFIG_DOMAIN_PAGE BUILD_BUG_ON(DOMHEAP_VIRT_START & ~FIRST_MASK); #endif @@ -344,16 +379,6 @@ void __cpuinit setup_virt_paging(void) WRITE_SYSREG32(0x80002558, VTCR_EL2); isb(); } -/* This needs to be a macro to stop the compiler spilling to the stack - * which will change when we change pagetables */ -#define WRITE_TTBR(ttbr) \ - flush_xen_text_tlb(); \ - WRITE_SYSREG64(ttbr, TTBR0_EL2); \ - dsb(); /* ensure memory accesses do not cross over the TTBR0 write */ \ - /* flush_xen_text_tlb contains an initial isb which ensures the \ - * write to TTBR0 has completed. */ \ - flush_xen_text_tlb() - static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; @@ -368,70 +393,77 @@ void __init remove_early_mappings(void) flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, SECOND_SIZE); } +extern void relocate_xen(uint64_t ttbr, void *src, void *dst, size_t len); + /* Boot-time pagetable setup. * Changes here may need matching changes in head.S */ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) { + uint64_t ttbr; unsigned long dest_va; lpae_t pte, *p; int i; - /* Map the destination in the boot misc area. */ - dest_va = BOOT_RELOC_VIRT_START; - pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); - write_pte(xen_second + second_table_offset(dest_va), pte); - flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); - /* Calculate virt-to-phys offset for the new location */ phys_offset = xen_paddr - (unsigned long) _start; - /* Copy */ - memcpy((void *) dest_va, _start, _end - _start); - - /* Beware! Any state we modify between now and the PT switch may be - * discarded when we switch over to the copy. */ - - /* Update the copy of boot_pgtable to use the new paddrs */ - p = (void *) boot_pgtable + dest_va - (unsigned long) _start; #ifdef CONFIG_ARM_64 - p[0].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - p = (void *) boot_first + dest_va - (unsigned long) _start; + p = (void *) xen_pgtable; + p[0] = pte_of_xenaddr((uintptr_t)xen_first); + p[0].pt.table = 1; + p[0].pt.xn = 0; + p = (void *) xen_first; +#else + p = (void *) cpu0_pgtable; #endif - for ( i = 0; i < 4; i++) - p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - p = (void *) xen_second + dest_va - (unsigned long) _start; - if ( boot_phys_offset != 0 ) + /* Initialise first level entries, to point to second level entries */ + for ( i = 0; i < 4; i++) { - /* Remove the old identity mapping of the boot paddr */ - vaddr_t va = (vaddr_t)_start + boot_phys_offset; - p[second_linear_offset(va)].bits = 0; + p[i] = pte_of_xenaddr((uintptr_t)(xen_second+i*LPAE_ENTRIES)); + p[i].pt.table = 1; + p[i].pt.xn = 0; } - for ( i = 0; i < 4 * LPAE_ENTRIES; i++) - /* The FDT is not relocated */ - if ( p[i].pt.valid && i != second_linear_offset(BOOT_FDT_VIRT_START) ) - p[i].pt.base += (phys_offset - boot_phys_offset) >> PAGE_SHIFT; - /* Change pagetables to the copy in the relocated Xen */ - boot_ttbr = (uintptr_t) boot_pgtable + phys_offset; - flush_xen_dcache(boot_ttbr); - flush_xen_dcache_va_range((void*)dest_va, _end - _start); + /* Initialise xen second level entries ... */ + /* ... Xen's text etc */ - WRITE_TTBR(boot_ttbr); + pte = mfn_to_xen_entry(xen_paddr>>PAGE_SHIFT); + pte.pt.xn = 0;/* Contains our text mapping! */ + xen_second[second_table_offset(XEN_VIRT_START)] = pte; - /* Undo the temporary map */ - pte.bits = 0; - write_pte(xen_second + second_table_offset(dest_va), pte); - flush_xen_text_tlb(); - - /* Link in the fixmap pagetable */ + /* ... Fixmap */ pte = pte_of_xenaddr((vaddr_t)xen_fixmap); pte.pt.table = 1; - write_pte(xen_second + second_table_offset(FIXMAP_ADDR(0)), pte); - /* - * No flush required here. Individual flushes are done in - * set_fixmap as entries are used. - */ + xen_second[second_table_offset(FIXMAP_ADDR(0))] = pte; + + /* ... DTB */ + pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START)]; + xen_second[second_table_offset(BOOT_FDT_VIRT_START)] = pte; + + /* Map the destination in the boot misc area. */ + dest_va = BOOT_RELOC_VIRT_START; + pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); + write_pte(boot_second + second_table_offset(dest_va), pte); + flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); +#ifdef CONFIG_ARM_64 + ttbr = (uintptr_t) xen_pgtable + phys_offset; +#else + ttbr = (uintptr_t) cpu0_pgtable + phys_offset; +#endif + + relocate_xen(ttbr, _start, (void*)dest_va, _end - _start); + + /* Clear the copy of the boot pagetables. Each secondary CPU + * rebuilds these itself (see head.S) */ + memset(boot_pgtable, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_pgtable); +#ifdef CONFIG_ARM_64 + memset(boot_pgtable, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_first); +#endif + memset(boot_second, 0x0, PAGE_SIZE); + flush_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) @@ -452,6 +484,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) write_pte(xen_xenmap + i, pte); /* No flush required here as page table is not hooked in yet. */ } + pte = pte_of_xenaddr((vaddr_t)xen_xenmap); pte.pt.table = 1; write_pte(xen_second + second_linear_offset(XEN_VIRT_START), pte); @@ -463,7 +496,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) flush_xen_text_tlb(); #ifdef CONFIG_ARM_32 - per_cpu(xen_pgtable, 0) = boot_pgtable; + per_cpu(xen_pgtable, 0) = cpu0_pgtable; per_cpu(xen_dommap, 0) = xen_second + second_linear_offset(DOMHEAP_VIRT_START); @@ -474,10 +507,14 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) DOMHEAP_SECOND_PAGES*PAGE_SIZE); #endif } + #ifdef CONFIG_ARM_64 int init_secondary_pagetables(int cpu) { - /* All CPUs share a single page table on 64 bit */ + /* Set init_ttbr for this CPU coming up. All CPus share a single setof + * pagetables, but rewrite it each time for consistency with 32 bit. */ + init_ttbr = (uintptr_t) xen_pgtable + phys_offset; + flush_xen_dcache(init_ttbr); return 0; } #else @@ -498,7 +535,7 @@ int init_secondary_pagetables(int cpu) } /* Initialise root pagetable from root of boot tables */ - memcpy(first, boot_pgtable, PAGE_SIZE); + memcpy(first, cpu0_pgtable, PAGE_SIZE); /* Ensure the domheap has no stray mappings */ memset(domheap, 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); @@ -518,6 +555,10 @@ int init_secondary_pagetables(int cpu) per_cpu(xen_pgtable, cpu) = first; per_cpu(xen_dommap, cpu) = domheap; + /* Set init_ttbr for this CPU coming up */ + init_ttbr = __pa(first); + flush_xen_dcache(init_ttbr); + return 0; } #endif @@ -525,12 +566,6 @@ int init_secondary_pagetables(int cpu) /* MMU setup for secondary CPUS (which already have paging enabled) */ void __cpuinit mmu_init_secondary_cpu(void) { - uint64_t ttbr; - - /* Change to this CPU's pagetables */ - ttbr = (uintptr_t)virt_to_maddr(THIS_CPU_PGTABLE); - WRITE_TTBR(ttbr); - /* From now on, no mapping may be both writable and executable. */ WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); flush_xen_text_tlb(); @@ -603,7 +638,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, while ( base_mfn < end_mfn ) { int slot = zeroeth_table_offset(vaddr); - lpae_t *p = &boot_pgtable[slot]; + lpae_t *p = &xen_pgtable[slot]; if ( p->pt.valid ) { @@ -670,7 +705,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { pte = mfn_to_xen_entry(second_base + i); pte.pt.table = 1; - write_pte(&boot_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); + write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } create_32mb_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT); #else diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d615b4a..b2c4101 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -592,7 +592,7 @@ void __init setup_cache(void) * MPIDR values related to logical cpus * Code base on Linux arch/arm/kernel/devtree.c */ -static void __init init_cpus_maps(void) +static void __init smp_init_cpus(void) { register_t mpidr; struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); @@ -604,6 +604,14 @@ static void __init init_cpus_maps(void) [0 ... NR_CPUS - 1] = MPIDR_INVALID }; bool_t bootcpu_valid = 0; + int rc; + + if ( (rc = arch_smp_init()) < 0 ) + { + printk(XENLOG_WARNING "SMP init failed (%d)\n" + "Using only 1 CPU\n", rc); + return; + } mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; @@ -673,13 +681,20 @@ static void __init init_cpus_maps(void) if ( cpuidx > NR_CPUS ) { - printk(XENLOG_WARNING "DT /cpu %u node greater than max cores %u, capping them\n", + printk(XENLOG_WARNING + "DT /cpu %u node greater than max cores %u, capping them\n", cpuidx, NR_CPUS); cpuidx = NR_CPUS; break; } - tmp_map[i] = hwid; + if ( (rc = arch_cpu_init(i, cpu)) < 0 ) + { + printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); + tmp_map[i] = MPIDR_INVALID; + } + else + tmp_map[i] = hwid; } if ( !bootcpu_valid ) @@ -691,6 +706,8 @@ static void __init init_cpus_maps(void) for ( i = 0; i < cpuidx; i++ ) { + if ( tmp_map[i] == MPIDR_INVALID ) + continue; cpumask_set_cpu(i, &cpu_possible_map); cpu_logical_map(i) = tmp_map[i]; } @@ -732,15 +749,14 @@ void __init start_xen(unsigned long boot_phys_offset, processor_id(); - init_cpus_maps(); - cpus = smp_get_max_cpus(); - platform_init(); + smp_init_cpus(); + cpus = smp_get_max_cpus(); + init_xen_time(); gic_init(); - make_cpus_ready(cpus, boot_phys_offset); set_current((struct vcpu *)0xfffff000); /* debug sanity */ idle_vcpu[0] = current; diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 234748e..2cb0f36 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -56,12 +56,10 @@ struct init_info __initdata init_data = }; /* Shared state for coordinating CPU bringup */ -unsigned long smp_up_cpu = 0; +unsigned long smp_up_cpu = MPIDR_INVALID; +/* Shared state for coordinating CPU teardown */ static bool_t cpu_is_dead = 0; -/* Number of non-boot CPUs ready to enter C */ -unsigned long __initdata ready_cpus = 0; - /* ID of the PCPU we're running on */ DEFINE_PER_CPU(unsigned int, cpu_id); /* XXX these seem awfully x86ish... */ @@ -103,7 +101,6 @@ smp_get_max_cpus (void) return max_cpus; } - void __init smp_prepare_cpus (unsigned int max_cpus) { @@ -112,32 +109,6 @@ smp_prepare_cpus (unsigned int max_cpus) setup_cpu_sibling_map(0); } -void __init -make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) -{ - unsigned long *gate; - paddr_t gate_pa; - int i; - - printk("Waiting for %i other CPUs to be ready\n", max_cpus - 1); - /* We use the unrelocated copy of smp_up_cpu as that's the one the - * others can see. */ - gate_pa = ((paddr_t) (unsigned long) &smp_up_cpu) + boot_phys_offset; - gate = map_domain_page(gate_pa >> PAGE_SHIFT) + (gate_pa & ~PAGE_MASK); - for ( i = 1; i < max_cpus; i++ ) - { - /* Tell the next CPU to get ready */ - *gate = cpu_logical_map(i); - flush_xen_dcache(*gate); - isb(); - sev(); - /* And wait for it to respond */ - while ( ready_cpus < i ) - smp_rmb(); - } - unmap_domain_page(gate); -} - /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, unsigned long fdt_paddr, @@ -176,6 +147,7 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, wmb(); /* Now report this CPU is up */ + smp_up_cpu = MPIDR_INVALID; cpumask_set_cpu(cpuid, &cpu_online_map); wmb(); @@ -226,6 +198,8 @@ int __cpu_up(unsigned int cpu) { int rc; + printk("Bringing up CPU%d\n", cpu); + rc = init_secondary_pagetables(cpu); if ( rc < 0 ) return rc; @@ -236,14 +210,22 @@ int __cpu_up(unsigned int cpu) /* Tell the remote CPU what is it's logical CPU ID */ init_data.cpuid = cpu; - /* Unblock the CPU. It should be waiting in the loop in head.S - * for an event to arrive when smp_up_cpu matches its cpuid. */ + /* Open the gate for this CPU */ smp_up_cpu = cpu_logical_map(cpu); - /* we need to make sure that the change to smp_up_cpu is visible to - * secondary cpus with D-cache off */ flush_xen_dcache(smp_up_cpu); - isb(); - sev(); + + rc = arch_cpu_up(cpu); + + if ( rc < 0 ) + { + printk("Failed to bring up CPU%d\n", cpu); + return rc; + } + + /* We don't know the GIC ID of the CPU until it has woken up, so just signal + * everyone and rely on our own smp_up_cpu gate to ensure only the one we + * want gets through. */ + send_SGI_allbutself(GIC_SGI_EVENT_CHECK); while ( !cpu_online(cpu) ) { @@ -272,7 +254,6 @@ void __cpu_die(unsigned int cpu) mb(); } - /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 0129cd1..ce66099 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -149,7 +149,8 @@ extern unsigned long total_pages; extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); /* Remove early mappings */ extern void remove_early_mappings(void); -/* Allocate and initialise pagetables for a secondary CPU */ +/* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the + * new page table */ extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void __cpuinit mmu_init_secondary_cpu(void); diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index ee5bdfa..af30608 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -14,20 +14,6 @@ #define S5P_PA_SYSRAM 0x02020000 -/* Constants below is only used in assembly because the DTS is not yet parsed */ -#ifdef __ASSEMBLY__ - -/* GIC Base Address */ -#define EXYNOS5_GIC_BASE_ADDRESS 0x10480000 - -/* Timer's frequency */ -#define EXYNOS5_TIMER_FREQUENCY (24 * 1000 * 1000) /* 24 MHz */ - -/* Arndale machine ID */ -#define MACH_TYPE_SMDK5250 3774 - -#endif /* __ASSEMBLY__ */ - #endif /* __ASM_ARM_PLATFORMS_EXYNOS5_H */ /* * Local variables: diff --git a/xen/include/asm-arm/platforms/vexpress.h b/xen/include/asm-arm/platforms/vexpress.h index 982a293..5cf3aba 100644 --- a/xen/include/asm-arm/platforms/vexpress.h +++ b/xen/include/asm-arm/platforms/vexpress.h @@ -32,17 +32,6 @@ int vexpress_syscfg(int write, int function, int device, uint32_t *data); #endif -/* Constants below is only used in assembly because the DTS is not yet parsed */ -#ifdef __ASSEMBLY__ - -/* GIC base address */ -#define V2M_GIC_BASE_ADDRESS 0x2c000000 - -/* Timer's frequency */ -#define V2M_TIMER_FREQUENCY 0x5f5e100 /* 100 Mhz */ - -#endif /* __ASSEMBLY__ */ - #endif /* __ASM_ARM_PLATFORMS_VEXPRESS_H */ /* * Local variables: diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 1added5..83add6c 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -17,12 +17,6 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); extern void stop_cpu(void); -/* Bring the non-boot CPUs up to paging and ready to enter C. - * Must be called after Xen is relocated but before the original copy of - * .text gets overwritten. */ -extern void -make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset); - extern int arch_smp_init(void); extern int arch_cpu_init(int cpu, struct dt_device_node *dn); extern int arch_cpu_up(int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyFh-0005Ce-0o; Sat, 28 Sep 2013 17:24:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFf-0005CM-U1 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:20 +0000 Received: from [85.158.139.211:60196] by server-2.bemta-5.messagelabs.com id 58/30-26841-3C017425; Sat, 28 Sep 2013 17:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380389057!5174326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11911 invoked from network); 28 Sep 2013 17:24:18 -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; 28 Sep 2013 17:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFd-0008CD-6j for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFd-0005pc-4E for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:17 +0000 Date: Sat, 28 Sep 2013 17:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use symbolic names for MPIDR 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 9a7aada6811a9777d10ac67eb53b5985cd70a509 Author: Ian Campbell AuthorDate: Fri Sep 20 17:51:20 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: use symbolic names for MPIDR bits. arm32 already uses MPIDR_HWID_MASK, use it on arm64 too. Add MPIDR_{SMP,UP} (and bitwise equivalents) and use them. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm32/head.S | 4 ++-- xen/arch/arm/arm64/head.S | 6 +++--- xen/include/asm-arm/processor.h | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 510ccff..92b3c48 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -127,9 +127,9 @@ common_start: * find that multiprocessor extensions are * present and the system is SMP */ mrc CP32(r1, MPIDR) - tst r1, #(1<<31) /* Multiprocessor extension supported? */ + tst r1, #MPIDR_SMP /* Multiprocessor extension supported? */ beq 1f - tst r1, #(1<<30) /* Uniprocessor system? */ + tst r1, #MPIDR_UP /* Uniprocessor system? */ bne 1f bic r7, r1, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ 1: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b2d44cc..062645e 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -153,10 +153,10 @@ common_start: * find that multiprocessor extensions are * present and the system is SMP */ mrs x0, mpidr_el1 - tbz x0, 31, 1f /* Multiprocessor extension not supported? */ - tbnz x0, 30, 1f /* Uniprocessor system? */ + tbz x0, _MPIDR_SMP, 1f /* Multiprocessor extension not supported? */ + tbnz x0, _MPIDR_UP, 1f /* Uniprocessor system? */ - mov x13, #(0xff << 24) + mov x13, #(~MPIDR_HWID_MASK) bic x24, x0, x13 /* Mask out flags to get CPU ID */ 1: diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 0646422..5294421 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -8,11 +8,13 @@ #define MIDR_MASK 0xff0ffff0 /* MPIDR Multiprocessor Affinity Register */ -#define MPIDR_UP (1 << 30) -#define MPIDR_SMP (1 << 31) +#define _MPIDR_UP (30) +#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define _MPIDR_SMP (31) +#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) #define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) -#define MPIDR_HWID_MASK 0xffffff +#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK _AC(0xffffff,U) #define MPIDR_INVALID (~MPIDR_HWID_MASK) /* TTBCR Translation Table Base Control Register */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyFh-0005Ce-0o; Sat, 28 Sep 2013 17:24:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFf-0005CM-U1 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:20 +0000 Received: from [85.158.139.211:60196] by server-2.bemta-5.messagelabs.com id 58/30-26841-3C017425; Sat, 28 Sep 2013 17:24:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1380389057!5174326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11911 invoked from network); 28 Sep 2013 17:24:18 -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; 28 Sep 2013 17:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFd-0008CD-6j for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFd-0005pc-4E for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:17 +0000 Date: Sat, 28 Sep 2013 17:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: use symbolic names for MPIDR 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 9a7aada6811a9777d10ac67eb53b5985cd70a509 Author: Ian Campbell AuthorDate: Fri Sep 20 17:51:20 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: use symbolic names for MPIDR bits. arm32 already uses MPIDR_HWID_MASK, use it on arm64 too. Add MPIDR_{SMP,UP} (and bitwise equivalents) and use them. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/arm32/head.S | 4 ++-- xen/arch/arm/arm64/head.S | 6 +++--- xen/include/asm-arm/processor.h | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 510ccff..92b3c48 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -127,9 +127,9 @@ common_start: * find that multiprocessor extensions are * present and the system is SMP */ mrc CP32(r1, MPIDR) - tst r1, #(1<<31) /* Multiprocessor extension supported? */ + tst r1, #MPIDR_SMP /* Multiprocessor extension supported? */ beq 1f - tst r1, #(1<<30) /* Uniprocessor system? */ + tst r1, #MPIDR_UP /* Uniprocessor system? */ bne 1f bic r7, r1, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ 1: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b2d44cc..062645e 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -153,10 +153,10 @@ common_start: * find that multiprocessor extensions are * present and the system is SMP */ mrs x0, mpidr_el1 - tbz x0, 31, 1f /* Multiprocessor extension not supported? */ - tbnz x0, 30, 1f /* Uniprocessor system? */ + tbz x0, _MPIDR_SMP, 1f /* Multiprocessor extension not supported? */ + tbnz x0, _MPIDR_UP, 1f /* Uniprocessor system? */ - mov x13, #(0xff << 24) + mov x13, #(~MPIDR_HWID_MASK) bic x24, x0, x13 /* Mask out flags to get CPU ID */ 1: diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 0646422..5294421 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -8,11 +8,13 @@ #define MIDR_MASK 0xff0ffff0 /* MPIDR Multiprocessor Affinity Register */ -#define MPIDR_UP (1 << 30) -#define MPIDR_SMP (1 << 31) +#define _MPIDR_UP (30) +#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define _MPIDR_SMP (31) +#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) #define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) -#define MPIDR_HWID_MASK 0xffffff +#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK _AC(0xffffff,U) #define MPIDR_INVALID (~MPIDR_HWID_MASK) /* TTBCR Translation Table Base Control Register */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyFr-0005Ei-3n; Sat, 28 Sep 2013 17:24:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFp-0005EV-U8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:30 +0000 Received: from [85.158.143.35:53438] by server-1.bemta-4.messagelabs.com id 6D/00-11076-DC017425; Sat, 28 Sep 2013 17:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1380389067!2369367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14723 invoked from network); 28 Sep 2013 17:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFn-0008CM-Cf for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFn-0005q0-B1 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:27 +0000 Date: Sat, 28 Sep 2013 17:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: configure TCR_EL2 for 40 bit physical address space X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cb9d1510c75e910e5a5a29ea23af90fc2e40463 Author: Ian Campbell AuthorDate: Mon Sep 16 21:39:22 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: configure TCR_EL2 for 40 bit physical address space Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/arm64/head.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 062645e..b8b5902 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -224,12 +224,12 @@ skip_bss: msr mair_el2, x0 /* Set up the HTCR: - * PASize -- 4G + * PASize -- 40 bits / 1TB * Top byte is used * PT walks use Outer-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80802500 + ldr x0, =0x80822500 msr tcr_el2, x0 /* Set up the SCTLR_EL2: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyFr-0005Ei-3n; Sat, 28 Sep 2013 17:24:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFp-0005EV-U8 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:30 +0000 Received: from [85.158.143.35:53438] by server-1.bemta-4.messagelabs.com id 6D/00-11076-DC017425; Sat, 28 Sep 2013 17:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1380389067!2369367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14723 invoked from network); 28 Sep 2013 17:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFn-0008CM-Cf for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFn-0005q0-B1 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:27 +0000 Date: Sat, 28 Sep 2013 17:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: configure TCR_EL2 for 40 bit physical address space X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cb9d1510c75e910e5a5a29ea23af90fc2e40463 Author: Ian Campbell AuthorDate: Mon Sep 16 21:39:22 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:51 2013 +0100 xen: arm: configure TCR_EL2 for 40 bit physical address space Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Tim Deegan --- xen/arch/arm/arm64/head.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 062645e..b8b5902 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -224,12 +224,12 @@ skip_bss: msr mair_el2, x0 /* Set up the HTCR: - * PASize -- 4G + * PASize -- 40 bits / 1TB * Top byte is used * PT walks use Outer-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80802500 + ldr x0, =0x80822500 msr tcr_el2, x0 /* Set up the SCTLR_EL2: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG1-0005GU-6e; Sat, 28 Sep 2013 17:24:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG0-0005GC-Eu for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:40 +0000 Received: from [85.158.137.68:55994] by server-11.bemta-3.messagelabs.com id A5/FE-16607-7D017425; Sat, 28 Sep 2013 17:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1380389077!5316510!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3489 invoked from network); 28 Sep 2013 17:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFx-0008CU-IH for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFx-0005qT-Fs for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:37 +0000 Date: Sat, 28 Sep 2013 17:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: split cpu0's domheap mapping PTs out from xen_second X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb0fa994b9c90abeafec2d9dc2c1f2fdffc1acef Author: Ian Campbell AuthorDate: Mon Sep 16 21:26:48 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:52 2013 +0100 xen: arm: split cpu0's domheap mapping PTs out from xen_second Now that bringup has been rewritten we don't need these 4 contiguous pages for the 1:1 map. So split them out and only allocate them for 32 bit Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 969a361..068d7a0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -94,8 +94,11 @@ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); * the second level pagetables which map the domheap region * DOMHEAP_VIRT_START...DOMHEAP_VIRT_END in 2MB chunks. */ static DEFINE_PER_CPU(lpae_t *, xen_dommap); -/* Root of the trie for cpu0 */ +/* Root of the trie for cpu0, other CPU's PTs are dynamically allocated */ lpae_t cpu0_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +/* cpu0's domheap page tables */ +lpae_t cpu0_dommap[LPAE_ENTRIES*DOMHEAP_SECOND_PAGES] + __attribute__((__aligned__(4096*DOMHEAP_SECOND_PAGES))); #endif #ifdef CONFIG_ARM_64 @@ -115,19 +118,8 @@ static __initdata int xenheap_first_first_slot = -1; * The second-level table is 2 contiguous pages long, and covers all * addresses from 0 to 0x7fffffff. Offsets into it are calculated * with second_linear_offset(), not second_table_offset(). - * - * On 32bit addresses 0x80000000 to 0xffffffff are covered by the - * per-cpu xen_domheap mappings described above. We allocate 4 pages - * here for use in the boot page tables and the second two pages - * become the boot CPUs xen_dommap pages. - * - * On 64bit addresses 0x80000000 to 0xffffffff are unused. However we - * allocate 4 pages here for use while relocating Xen, which currently - * expects a second level page to exist for all addresses in the first - * 4GB. We need to keep these extra mappings in place for seconary CPU - * bring up too. For now we just leave them forever. */ -lpae_t xen_second[LPAE_ENTRIES*4] __attribute__((__aligned__(4096*4))); +lpae_t xen_second[LPAE_ENTRIES*2] __attribute__((__aligned__(4096*2))); /* First level page table used for fixmap */ lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* First level page table used to map Xen itself with the XN bit set @@ -418,13 +410,22 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #endif /* Initialise first level entries, to point to second level entries */ - for ( i = 0; i < 4; i++) + for ( i = 0; i < 2; i++) { p[i] = pte_of_xenaddr((uintptr_t)(xen_second+i*LPAE_ENTRIES)); p[i].pt.table = 1; p[i].pt.xn = 0; } +#ifdef CONFIG_ARM_32 + for ( i = 0; i < DOMHEAP_SECOND_PAGES; i++ ) + { + p[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)] + = pte_of_xenaddr((uintptr_t)(cpu0_dommap+i*LPAE_ENTRIES)); + p[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)].pt.table = 1; + } +#endif + /* Initialise xen second level entries ... */ /* ... Xen's text etc */ @@ -497,11 +498,9 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #ifdef CONFIG_ARM_32 per_cpu(xen_pgtable, 0) = cpu0_pgtable; - per_cpu(xen_dommap, 0) = xen_second + - second_linear_offset(DOMHEAP_VIRT_START); + per_cpu(xen_dommap, 0) = cpu0_dommap; - /* Some of these slots may have been used during start of day and/or - * relocation. Make sure they are clear now. */ + /* Make sure it is clear */ memset(this_cpu(xen_dommap), 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); flush_xen_dcache_va_range(this_cpu(xen_dommap), DOMHEAP_SECOND_PAGES*PAGE_SIZE); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG1-0005GU-6e; Sat, 28 Sep 2013 17:24:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG0-0005GC-Eu for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:40 +0000 Received: from [85.158.137.68:55994] by server-11.bemta-3.messagelabs.com id A5/FE-16607-7D017425; Sat, 28 Sep 2013 17:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1380389077!5316510!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3489 invoked from network); 28 Sep 2013 17:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 17:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyFx-0008CU-IH for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyFx-0005qT-Fs for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:37 +0000 Date: Sat, 28 Sep 2013 17:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: split cpu0's domheap mapping PTs out from xen_second X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eb0fa994b9c90abeafec2d9dc2c1f2fdffc1acef Author: Ian Campbell AuthorDate: Mon Sep 16 21:26:48 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:52 2013 +0100 xen: arm: split cpu0's domheap mapping PTs out from xen_second Now that bringup has been rewritten we don't need these 4 contiguous pages for the 1:1 map. So split them out and only allocate them for 32 bit Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 969a361..068d7a0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -94,8 +94,11 @@ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); * the second level pagetables which map the domheap region * DOMHEAP_VIRT_START...DOMHEAP_VIRT_END in 2MB chunks. */ static DEFINE_PER_CPU(lpae_t *, xen_dommap); -/* Root of the trie for cpu0 */ +/* Root of the trie for cpu0, other CPU's PTs are dynamically allocated */ lpae_t cpu0_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +/* cpu0's domheap page tables */ +lpae_t cpu0_dommap[LPAE_ENTRIES*DOMHEAP_SECOND_PAGES] + __attribute__((__aligned__(4096*DOMHEAP_SECOND_PAGES))); #endif #ifdef CONFIG_ARM_64 @@ -115,19 +118,8 @@ static __initdata int xenheap_first_first_slot = -1; * The second-level table is 2 contiguous pages long, and covers all * addresses from 0 to 0x7fffffff. Offsets into it are calculated * with second_linear_offset(), not second_table_offset(). - * - * On 32bit addresses 0x80000000 to 0xffffffff are covered by the - * per-cpu xen_domheap mappings described above. We allocate 4 pages - * here for use in the boot page tables and the second two pages - * become the boot CPUs xen_dommap pages. - * - * On 64bit addresses 0x80000000 to 0xffffffff are unused. However we - * allocate 4 pages here for use while relocating Xen, which currently - * expects a second level page to exist for all addresses in the first - * 4GB. We need to keep these extra mappings in place for seconary CPU - * bring up too. For now we just leave them forever. */ -lpae_t xen_second[LPAE_ENTRIES*4] __attribute__((__aligned__(4096*4))); +lpae_t xen_second[LPAE_ENTRIES*2] __attribute__((__aligned__(4096*2))); /* First level page table used for fixmap */ lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* First level page table used to map Xen itself with the XN bit set @@ -418,13 +410,22 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #endif /* Initialise first level entries, to point to second level entries */ - for ( i = 0; i < 4; i++) + for ( i = 0; i < 2; i++) { p[i] = pte_of_xenaddr((uintptr_t)(xen_second+i*LPAE_ENTRIES)); p[i].pt.table = 1; p[i].pt.xn = 0; } +#ifdef CONFIG_ARM_32 + for ( i = 0; i < DOMHEAP_SECOND_PAGES; i++ ) + { + p[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)] + = pte_of_xenaddr((uintptr_t)(cpu0_dommap+i*LPAE_ENTRIES)); + p[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)].pt.table = 1; + } +#endif + /* Initialise xen second level entries ... */ /* ... Xen's text etc */ @@ -497,11 +498,9 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) #ifdef CONFIG_ARM_32 per_cpu(xen_pgtable, 0) = cpu0_pgtable; - per_cpu(xen_dommap, 0) = xen_second + - second_linear_offset(DOMHEAP_VIRT_START); + per_cpu(xen_dommap, 0) = cpu0_dommap; - /* Some of these slots may have been used during start of day and/or - * relocation. Make sure they are clear now. */ + /* Make sure it is clear */ memset(this_cpu(xen_dommap), 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); flush_xen_dcache_va_range(this_cpu(xen_dommap), DOMHEAP_SECOND_PAGES*PAGE_SIZE); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyGC-0005IS-A8; Sat, 28 Sep 2013 17:24:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyGB-0005I7-EE for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:51 +0000 Received: from [85.158.139.211:56935] by server-10.bemta-5.messagelabs.com id 27/E2-23973-2E017425; Sat, 28 Sep 2013 17:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380389088!5172091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31966 invoked from network); 28 Sep 2013 17:24:49 -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; 28 Sep 2013 17:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG7-0008Ca-PE for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyG7-0005qr-NH for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:47 +0000 Date: Sat, 28 Sep 2013 17:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move smp_init_cpus to smpboot.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1eb47fdc02a9ed1317210d319c1bd4ffc614006a Author: Ian Campbell AuthorDate: Fri Sep 27 10:30:29 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:52 2013 +0100 xen: arm: move smp_init_cpus to smpboot.c Seems like a better home. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/setup.c | 125 -------------------------------------------- xen/arch/arm/smpboot.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/smp.h | 1 + 3 files changed, 127 insertions(+), 125 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b2c4101..49f344c 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -588,131 +588,6 @@ void __init setup_cache(void) cacheline_bytes = 1U << (4 + (ccsid & 0x7)); } -/* Parse the device tree and build the logical map array containing - * MPIDR values related to logical cpus - * Code base on Linux arch/arm/kernel/devtree.c - */ -static void __init smp_init_cpus(void) -{ - register_t mpidr; - struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); - struct dt_device_node *cpu; - unsigned int i, j; - unsigned int cpuidx = 1; - static u32 tmp_map[NR_CPUS] __initdata = - { - [0 ... NR_CPUS - 1] = MPIDR_INVALID - }; - bool_t bootcpu_valid = 0; - int rc; - - if ( (rc = arch_smp_init()) < 0 ) - { - printk(XENLOG_WARNING "SMP init failed (%d)\n" - "Using only 1 CPU\n", rc); - return; - } - - mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; - - if ( !cpus ) - { - printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" - "Using only 1 CPU\n"); - return; - } - - dt_for_each_child_node( cpus, cpu ) - { - u32 hwid; - - if ( !dt_device_type_is_equal(cpu, "cpu") ) - continue; - - if ( !dt_property_read_u32(cpu, "reg", &hwid) ) - { - printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", - dt_node_full_name(cpu)); - continue; - } - - /* - * 8 MSBs must be set to 0 in the DT since the reg property - * defines the MPIDR[23:0] - */ - if ( hwid & ~MPIDR_HWID_MASK ) - { - printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", - dt_node_full_name(cpu), hwid); - continue; - } - - /* - * Duplicate MPIDRs are a recipe for disaster. Scan all initialized - * entries and check for duplicates. If any found just skip the node. - * temp values values are initialized to MPIDR_INVALID to avoid - * matching valid MPIDR[23:0] values. - */ - for ( j = 0; j < cpuidx; j++ ) - { - if ( tmp_map[j] == hwid ) - { - printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", - dt_node_full_name(cpu)); - continue; - } - } - - /* - * Build a stashed array of MPIDR values. Numbering scheme requires - * that if detected the boot CPU must be assigned logical id 0. Other - * CPUs get sequential indexes starting from 1. If a CPU node - * with a reg property matching the boot CPU MPIDR is detected, - * this is recorded and so that the logical map build from DT is - * validated and can be used to set the map. - */ - if ( hwid == mpidr ) - { - i = 0; - bootcpu_valid = 1; - } - else - i = cpuidx++; - - if ( cpuidx > NR_CPUS ) - { - printk(XENLOG_WARNING - "DT /cpu %u node greater than max cores %u, capping them\n", - cpuidx, NR_CPUS); - cpuidx = NR_CPUS; - break; - } - - if ( (rc = arch_cpu_init(i, cpu)) < 0 ) - { - printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); - tmp_map[i] = MPIDR_INVALID; - } - else - tmp_map[i] = hwid; - } - - if ( !bootcpu_valid ) - { - printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" - "Using only 1 CPU\n"); - return; - } - - for ( i = 0; i < cpuidx; i++ ) - { - if ( tmp_map[i] == MPIDR_INVALID ) - continue; - cpumask_set_cpu(i, &cpu_possible_map); - cpu_logical_map(i) = tmp_map[i]; - } -} - /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, unsigned long fdt_paddr, diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 2cb0f36..b836be4 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -89,6 +89,132 @@ smp_clear_cpu_maps (void) cpu_logical_map(0) = READ_SYSREG(MPIDR_EL1) & MPIDR_HWID_MASK; } +/* Parse the device tree and build the logical map array containing + * MPIDR values related to logical cpus + * Code base on Linux arch/arm/kernel/devtree.c + */ +void __init smp_init_cpus(void) +{ + register_t mpidr; + struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + struct dt_device_node *cpu; + unsigned int i, j; + unsigned int cpuidx = 1; + static u32 tmp_map[NR_CPUS] __initdata = + { + [0 ... NR_CPUS - 1] = MPIDR_INVALID + }; + bool_t bootcpu_valid = 0; + int rc; + + if ( (rc = arch_smp_init()) < 0 ) + { + printk(XENLOG_WARNING "SMP init failed (%d)\n" + "Using only 1 CPU\n", rc); + return; + } + + mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; + + if ( !cpus ) + { + printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" + "Using only 1 CPU\n"); + return; + } + + dt_for_each_child_node( cpus, cpu ) + { + u32 hwid; + + if ( !dt_device_type_is_equal(cpu, "cpu") ) + continue; + + if ( !dt_property_read_u32(cpu, "reg", &hwid) ) + { + printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", + dt_node_full_name(cpu)); + continue; + } + + /* + * 8 MSBs must be set to 0 in the DT since the reg property + * defines the MPIDR[23:0] + */ + if ( hwid & ~MPIDR_HWID_MASK ) + { + printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", + dt_node_full_name(cpu), hwid); + continue; + } + + /* + * Duplicate MPIDRs are a recipe for disaster. Scan all initialized + * entries and check for duplicates. If any found just skip the node. + * temp values values are initialized to MPIDR_INVALID to avoid + * matching valid MPIDR[23:0] values. + */ + for ( j = 0; j < cpuidx; j++ ) + { + if ( tmp_map[j] == hwid ) + { + printk(XENLOG_WARNING + "cpu node `%s`: duplicate /cpu reg properties in the DT\n", + dt_node_full_name(cpu)); + continue; + } + } + + /* + * Build a stashed array of MPIDR values. Numbering scheme requires + * that if detected the boot CPU must be assigned logical id 0. Other + * CPUs get sequential indexes starting from 1. If a CPU node + * with a reg property matching the boot CPU MPIDR is detected, + * this is recorded and so that the logical map build from DT is + * validated and can be used to set the map. + */ + if ( hwid == mpidr ) + { + i = 0; + bootcpu_valid = 1; + } + else + i = cpuidx++; + + if ( cpuidx > NR_CPUS ) + { + printk(XENLOG_WARNING + "DT /cpu %u node greater than max cores %u, capping them\n", + cpuidx, NR_CPUS); + cpuidx = NR_CPUS; + break; + } + + if ( (rc = arch_cpu_init(i, cpu)) < 0 ) + { + printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); + tmp_map[i] = MPIDR_INVALID; + } + else + tmp_map[i] = hwid; + } + + if ( !bootcpu_valid ) + { + printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" + "Using only 1 CPU\n"); + return; + } + + for ( i = 0; i < cpuidx; i++ ) + { + if ( tmp_map[i] == MPIDR_INVALID ) + continue; + cpumask_set_cpu(i, &cpu_possible_map); + cpu_logical_map(i) = tmp_map[i]; + } +} + int __init smp_get_max_cpus (void) { diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 83add6c..1485cc6 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -24,6 +24,7 @@ extern int arch_cpu_up(int cpu); /* Secondary CPU entry point */ extern void init_secondary(void); +extern void smp_init_cpus(void); extern void smp_clear_cpu_maps (void); extern int smp_get_max_cpus (void); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 17:24:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 17:24: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 1VPyGC-0005IS-A8; Sat, 28 Sep 2013 17:24:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyGB-0005I7-EE for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:51 +0000 Received: from [85.158.139.211:56935] by server-10.bemta-5.messagelabs.com id 27/E2-23973-2E017425; Sat, 28 Sep 2013 17:24:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1380389088!5172091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31966 invoked from network); 28 Sep 2013 17:24:49 -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; 28 Sep 2013 17:24:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VPyG7-0008Ca-PE for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VPyG7-0005qr-NH for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 17:24:47 +0000 Date: Sat, 28 Sep 2013 17:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move smp_init_cpus to smpboot.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1eb47fdc02a9ed1317210d319c1bd4ffc614006a Author: Ian Campbell AuthorDate: Fri Sep 27 10:30:29 2013 +0100 Commit: Ian Campbell CommitDate: Fri Sep 27 16:49:52 2013 +0100 xen: arm: move smp_init_cpus to smpboot.c Seems like a better home. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/setup.c | 125 -------------------------------------------- xen/arch/arm/smpboot.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/smp.h | 1 + 3 files changed, 127 insertions(+), 125 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b2c4101..49f344c 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -588,131 +588,6 @@ void __init setup_cache(void) cacheline_bytes = 1U << (4 + (ccsid & 0x7)); } -/* Parse the device tree and build the logical map array containing - * MPIDR values related to logical cpus - * Code base on Linux arch/arm/kernel/devtree.c - */ -static void __init smp_init_cpus(void) -{ - register_t mpidr; - struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); - struct dt_device_node *cpu; - unsigned int i, j; - unsigned int cpuidx = 1; - static u32 tmp_map[NR_CPUS] __initdata = - { - [0 ... NR_CPUS - 1] = MPIDR_INVALID - }; - bool_t bootcpu_valid = 0; - int rc; - - if ( (rc = arch_smp_init()) < 0 ) - { - printk(XENLOG_WARNING "SMP init failed (%d)\n" - "Using only 1 CPU\n", rc); - return; - } - - mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; - - if ( !cpus ) - { - printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" - "Using only 1 CPU\n"); - return; - } - - dt_for_each_child_node( cpus, cpu ) - { - u32 hwid; - - if ( !dt_device_type_is_equal(cpu, "cpu") ) - continue; - - if ( !dt_property_read_u32(cpu, "reg", &hwid) ) - { - printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", - dt_node_full_name(cpu)); - continue; - } - - /* - * 8 MSBs must be set to 0 in the DT since the reg property - * defines the MPIDR[23:0] - */ - if ( hwid & ~MPIDR_HWID_MASK ) - { - printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", - dt_node_full_name(cpu), hwid); - continue; - } - - /* - * Duplicate MPIDRs are a recipe for disaster. Scan all initialized - * entries and check for duplicates. If any found just skip the node. - * temp values values are initialized to MPIDR_INVALID to avoid - * matching valid MPIDR[23:0] values. - */ - for ( j = 0; j < cpuidx; j++ ) - { - if ( tmp_map[j] == hwid ) - { - printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", - dt_node_full_name(cpu)); - continue; - } - } - - /* - * Build a stashed array of MPIDR values. Numbering scheme requires - * that if detected the boot CPU must be assigned logical id 0. Other - * CPUs get sequential indexes starting from 1. If a CPU node - * with a reg property matching the boot CPU MPIDR is detected, - * this is recorded and so that the logical map build from DT is - * validated and can be used to set the map. - */ - if ( hwid == mpidr ) - { - i = 0; - bootcpu_valid = 1; - } - else - i = cpuidx++; - - if ( cpuidx > NR_CPUS ) - { - printk(XENLOG_WARNING - "DT /cpu %u node greater than max cores %u, capping them\n", - cpuidx, NR_CPUS); - cpuidx = NR_CPUS; - break; - } - - if ( (rc = arch_cpu_init(i, cpu)) < 0 ) - { - printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); - tmp_map[i] = MPIDR_INVALID; - } - else - tmp_map[i] = hwid; - } - - if ( !bootcpu_valid ) - { - printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" - "Using only 1 CPU\n"); - return; - } - - for ( i = 0; i < cpuidx; i++ ) - { - if ( tmp_map[i] == MPIDR_INVALID ) - continue; - cpumask_set_cpu(i, &cpu_possible_map); - cpu_logical_map(i) = tmp_map[i]; - } -} - /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, unsigned long fdt_paddr, diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 2cb0f36..b836be4 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -89,6 +89,132 @@ smp_clear_cpu_maps (void) cpu_logical_map(0) = READ_SYSREG(MPIDR_EL1) & MPIDR_HWID_MASK; } +/* Parse the device tree and build the logical map array containing + * MPIDR values related to logical cpus + * Code base on Linux arch/arm/kernel/devtree.c + */ +void __init smp_init_cpus(void) +{ + register_t mpidr; + struct dt_device_node *cpus = dt_find_node_by_path("/cpus"); + struct dt_device_node *cpu; + unsigned int i, j; + unsigned int cpuidx = 1; + static u32 tmp_map[NR_CPUS] __initdata = + { + [0 ... NR_CPUS - 1] = MPIDR_INVALID + }; + bool_t bootcpu_valid = 0; + int rc; + + if ( (rc = arch_smp_init()) < 0 ) + { + printk(XENLOG_WARNING "SMP init failed (%d)\n" + "Using only 1 CPU\n", rc); + return; + } + + mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; + + if ( !cpus ) + { + printk(XENLOG_WARNING "WARNING: Can't find /cpus in the device tree.\n" + "Using only 1 CPU\n"); + return; + } + + dt_for_each_child_node( cpus, cpu ) + { + u32 hwid; + + if ( !dt_device_type_is_equal(cpu, "cpu") ) + continue; + + if ( !dt_property_read_u32(cpu, "reg", &hwid) ) + { + printk(XENLOG_WARNING "cpu node `%s`: missing reg property\n", + dt_node_full_name(cpu)); + continue; + } + + /* + * 8 MSBs must be set to 0 in the DT since the reg property + * defines the MPIDR[23:0] + */ + if ( hwid & ~MPIDR_HWID_MASK ) + { + printk(XENLOG_WARNING "cpu node `%s`: invalid hwid value (0x%x)\n", + dt_node_full_name(cpu), hwid); + continue; + } + + /* + * Duplicate MPIDRs are a recipe for disaster. Scan all initialized + * entries and check for duplicates. If any found just skip the node. + * temp values values are initialized to MPIDR_INVALID to avoid + * matching valid MPIDR[23:0] values. + */ + for ( j = 0; j < cpuidx; j++ ) + { + if ( tmp_map[j] == hwid ) + { + printk(XENLOG_WARNING + "cpu node `%s`: duplicate /cpu reg properties in the DT\n", + dt_node_full_name(cpu)); + continue; + } + } + + /* + * Build a stashed array of MPIDR values. Numbering scheme requires + * that if detected the boot CPU must be assigned logical id 0. Other + * CPUs get sequential indexes starting from 1. If a CPU node + * with a reg property matching the boot CPU MPIDR is detected, + * this is recorded and so that the logical map build from DT is + * validated and can be used to set the map. + */ + if ( hwid == mpidr ) + { + i = 0; + bootcpu_valid = 1; + } + else + i = cpuidx++; + + if ( cpuidx > NR_CPUS ) + { + printk(XENLOG_WARNING + "DT /cpu %u node greater than max cores %u, capping them\n", + cpuidx, NR_CPUS); + cpuidx = NR_CPUS; + break; + } + + if ( (rc = arch_cpu_init(i, cpu)) < 0 ) + { + printk("cpu%d init failed (hwid %x): %d\n", i, hwid, rc); + tmp_map[i] = MPIDR_INVALID; + } + else + tmp_map[i] = hwid; + } + + if ( !bootcpu_valid ) + { + printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n" + "Using only 1 CPU\n"); + return; + } + + for ( i = 0; i < cpuidx; i++ ) + { + if ( tmp_map[i] == MPIDR_INVALID ) + continue; + cpumask_set_cpu(i, &cpu_possible_map); + cpu_logical_map(i) = tmp_map[i]; + } +} + int __init smp_get_max_cpus (void) { diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index 83add6c..1485cc6 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -24,6 +24,7 @@ extern int arch_cpu_up(int cpu); /* Secondary CPU entry point */ extern void init_secondary(void); +extern void smp_init_cpus(void); extern void smp_clear_cpu_maps (void); extern int smp_get_max_cpus (void); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19: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 1VQ0bc-00087E-Rh; Sat, 28 Sep 2013 19:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bc-000876-3r for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:08 +0000 Received: from [85.158.137.68:9114] by server-1.bemta-3.messagelabs.com id 24/93-04901-B1437425; Sat, 28 Sep 2013 19:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1380398105!5334517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21075 invoked from network); 28 Sep 2013 19:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bY-0001Lo-Lx for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bY-0001Rm-9f for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:04 +0000 Date: Sat, 28 Sep 2013 19:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xen/conring: Write to console ring even if console lock is busted X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a2210f134fda565c7c3256215694aa2b8a2cebc Author: Andrew Cooper AuthorDate: Fri Sep 27 11:53:26 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:53:26 2013 +0200 xen/conring: Write to console ring even if console lock is busted console_lock_busted gets set when an NMI/MCE/Double Fault handler decides to bring Xen down in an emergency. conring_puts() cannot block and does not have problematic interactions with the console_lock. Therefore, choosing to not put the string into the console ring simply means that the kexec environment cant find any panic() message caused by an IST interrupt, which is unhelpful for debugging purposes. In the case that two pcpus fight with console_force_unlock(), having slightly garbled strings in the console ring is far more useful than having nothing at all. Signed-off-by: Andrew Cooper Acked-by: Matt Wilson Acked-by: Keir Fraser master commit: 66450c1d1ab3c4480bbba949113b95d1ab6a943a master date: 2013-08-06 17:45:00 +0200 --- xen/drivers/char/console.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7cd7bf6..bf16d49 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -463,12 +463,11 @@ static void __putstr(const char *str) sercon_puts(str); video_puts(str); + while ( (c = *str++) != '\0' ) + putchar_console_ring(c); + if ( !console_locks_busted ) - { - while ( (c = *str++) != '\0' ) - putchar_console_ring(c); tasklet_schedule(¬ify_dom0_con_ring_tasklet); - } } static int printk_prefix_check(char *p, char **pp) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19: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 1VQ0bc-00087E-Rh; Sat, 28 Sep 2013 19:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bc-000876-3r for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:08 +0000 Received: from [85.158.137.68:9114] by server-1.bemta-3.messagelabs.com id 24/93-04901-B1437425; Sat, 28 Sep 2013 19:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1380398105!5334517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21075 invoked from network); 28 Sep 2013 19:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bY-0001Lo-Lx for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bY-0001Rm-9f for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:04 +0000 Date: Sat, 28 Sep 2013 19:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xen/conring: Write to console ring even if console lock is busted X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a2210f134fda565c7c3256215694aa2b8a2cebc Author: Andrew Cooper AuthorDate: Fri Sep 27 11:53:26 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:53:26 2013 +0200 xen/conring: Write to console ring even if console lock is busted console_lock_busted gets set when an NMI/MCE/Double Fault handler decides to bring Xen down in an emergency. conring_puts() cannot block and does not have problematic interactions with the console_lock. Therefore, choosing to not put the string into the console ring simply means that the kexec environment cant find any panic() message caused by an IST interrupt, which is unhelpful for debugging purposes. In the case that two pcpus fight with console_force_unlock(), having slightly garbled strings in the console ring is far more useful than having nothing at all. Signed-off-by: Andrew Cooper Acked-by: Matt Wilson Acked-by: Keir Fraser master commit: 66450c1d1ab3c4480bbba949113b95d1ab6a943a master date: 2013-08-06 17:45:00 +0200 --- xen/drivers/char/console.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 7cd7bf6..bf16d49 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -463,12 +463,11 @@ static void __putstr(const char *str) sercon_puts(str); video_puts(str); + while ( (c = *str++) != '\0' ) + putchar_console_ring(c); + if ( !console_locks_busted ) - { - while ( (c = *str++) != '\0' ) - putchar_console_ring(c); tasklet_schedule(¬ify_dom0_con_ring_tasklet); - } } static int printk_prefix_check(char *p, char **pp) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bn-00088A-0Y; Sat, 28 Sep 2013 19:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bm-000881-2x for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:18 +0000 Received: from [193.109.254.147:22367] by server-2.bemta-14.messagelabs.com id 07/89-18933-52437425; Sat, 28 Sep 2013 19:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380398115!4921608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30093 invoked from network); 28 Sep 2013 19:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bj-0001Lr-63 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bi-0001SA-QT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:14 +0000 Date: Sat, 28 Sep 2013 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] watchdog/crash: Always disable watchdog in console_force_unlock() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8294ffb817a795f93e241192c59e34c9da281b8b Author: Andrew Cooper AuthorDate: Fri Sep 27 11:54:42 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:54:42 2013 +0200 watchdog/crash: Always disable watchdog in console_force_unlock() Depending on the state of the conring and serial_tx_buffer, console_force_unlock() can be a long running operation, usually because of serial_start_sync() XenServer testing has found a reliable case where console_force_unlock() on one PCPU takes long enough for another PCPU to timeout due to the watchdog (such as waiting for a tlb flush callin). The watchdog timeout causes the second PCPU to repeat the console_force_unlock(), at which point the first PCPU typically fails an assertion in spin_unlock_irqrestore(&port->tx_lock) (because the tx_lock has been unlocked behind itself). console_force_unlock() is only on emergency paths, so one way or another the host is going down. Disable the watchdog before forcing the console lock to help prevent having pcpus completing with each other to bring the host down. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 7b9fa702ca323164d6b49e8b639a57f880454a8c master date: 2013-08-13 14:31:01 +0200 --- xen/arch/x86/x86_64/traps.c | 2 -- xen/drivers/char/console.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index bcd7609..1054480 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -226,8 +226,6 @@ void do_double_fault(struct cpu_user_regs *regs) unsigned int cpu; unsigned long crs[8]; - watchdog_disable(); - console_force_unlock(); asm ( "lsll %1, %0" : "=r" (cpu) : "rm" (PER_CPU_GDT_ENTRY << 3) ); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index bf16d49..110addc 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -736,6 +736,9 @@ void console_end_log_everything(void) void console_force_unlock(void) { +#ifdef CONFIG_X86 + watchdog_disable(); +#endif spin_lock_init(&console_lock); serial_force_unlock(sercon_handle); console_locks_busted = 1; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bn-00088A-0Y; Sat, 28 Sep 2013 19:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bm-000881-2x for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:18 +0000 Received: from [193.109.254.147:22367] by server-2.bemta-14.messagelabs.com id 07/89-18933-52437425; Sat, 28 Sep 2013 19:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1380398115!4921608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30093 invoked from network); 28 Sep 2013 19:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bj-0001Lr-63 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bi-0001SA-QT for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:14 +0000 Date: Sat, 28 Sep 2013 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] watchdog/crash: Always disable watchdog in console_force_unlock() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8294ffb817a795f93e241192c59e34c9da281b8b Author: Andrew Cooper AuthorDate: Fri Sep 27 11:54:42 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:54:42 2013 +0200 watchdog/crash: Always disable watchdog in console_force_unlock() Depending on the state of the conring and serial_tx_buffer, console_force_unlock() can be a long running operation, usually because of serial_start_sync() XenServer testing has found a reliable case where console_force_unlock() on one PCPU takes long enough for another PCPU to timeout due to the watchdog (such as waiting for a tlb flush callin). The watchdog timeout causes the second PCPU to repeat the console_force_unlock(), at which point the first PCPU typically fails an assertion in spin_unlock_irqrestore(&port->tx_lock) (because the tx_lock has been unlocked behind itself). console_force_unlock() is only on emergency paths, so one way or another the host is going down. Disable the watchdog before forcing the console lock to help prevent having pcpus completing with each other to bring the host down. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 7b9fa702ca323164d6b49e8b639a57f880454a8c master date: 2013-08-13 14:31:01 +0200 --- xen/arch/x86/x86_64/traps.c | 2 -- xen/drivers/char/console.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index bcd7609..1054480 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -226,8 +226,6 @@ void do_double_fault(struct cpu_user_regs *regs) unsigned int cpu; unsigned long crs[8]; - watchdog_disable(); - console_force_unlock(); asm ( "lsll %1, %0" : "=r" (cpu) : "rm" (PER_CPU_GDT_ENTRY << 3) ); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index bf16d49..110addc 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -736,6 +736,9 @@ void console_end_log_everything(void) void console_force_unlock(void) { +#ifdef CONFIG_X86 + watchdog_disable(); +#endif spin_lock_init(&console_lock); serial_force_unlock(sercon_handle); console_locks_busted = 1; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19: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 1VQ0by-00089N-3U; Sat, 28 Sep 2013 19:55:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bw-000897-Jm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:28 +0000 Received: from [85.158.143.35:2741] by server-3.bemta-4.messagelabs.com id C9/EE-24907-F2437425; Sat, 28 Sep 2013 19:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1380398125!7467184!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18519 invoked from network); 28 Sep 2013 19:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bt-0001Ly-G3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bt-0001T3-AF for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:25 +0000 Date: Sat, 28 Sep 2013 19:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched_credit: filter node-affinity mask against online cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb272e48312cf1ba377aa1415461a271a3e06986 Author: Dario Faggioli AuthorDate: Fri Sep 27 11:57:59 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:57:59 2013 +0200 sched_credit: filter node-affinity mask against online cpus in _csched_cpu_pick(), as not doing so may result in the domain's node-affinity mask (as retrieved by csched_balance_cpumask() ) and online mask (as retrieved by cpupool_scheduler_cpumask() ) having an empty intersection. Therefore, when attempting a node-affinity load balancing step and running this: ... /* Pick an online CPU from the proper affinity mask */ csched_balance_cpumask(vc, balance_step, &cpus); cpumask_and(&cpus, &cpus, online); ... we end up with an empty cpumask (in cpus). At this point, in the following code: .... /* If present, prefer vc's current processor */ cpu = cpumask_test_cpu(vc->processor, &cpus) ? vc->processor : cpumask_cycle(vc->processor, &cpus); .... an ASSERT (from inside cpumask_cycle() ) triggers like this: (XEN) Xen call trace: (XEN) [] _csched_cpu_pick+0x1d2/0x652 (XEN) [] csched_cpu_pick+0xe/0x10 (XEN) [] vcpu_migrate+0x167/0x31e (XEN) [] cpu_disable_scheduler+0x1c8/0x287 (XEN) [] cpupool_unassign_cpu_helper+0x20/0xb4 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5f/0x8b (XEN) [] idle_loop+0x57/0x5e (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 1: (XEN) Assertion 'cpu < nr_cpu_ids' failed at /home/dario/Sources/xen/xen/xen.git/xen/include/xe:16481 It is for example sufficient to have a domain with node-affinity to NUMA node 1 running, and issueing a `xl cpupool-numa-split' would make the above happen. That is because, by default, all the existing domains remain assigned to the first cpupool, and it now (after the cpupool-numa-split) only includes NUMA node 0. This change prevents that by generalizing the function used for figuring out whether a node-affinity load balancing step is legit or not. This way we can, in _csched_cpu_pick(), figure out early enough that the mask would end up empty, skip the step all together and avoid the splat. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap master commit: 5e5a44b6c942d6ea47f15d6f1ed02b03e0d69445 master date: 2013-09-20 11:37:28 +0200 --- xen/common/sched_credit.c | 57 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 3188310..24f70c6 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -296,15 +296,28 @@ static void csched_set_node_affinity( * vcpu-affinity balancing is always necessary and must never be skipped. * OTOH, if a domain's node-affinity is said to be automatically computed * (or if it just spans all the nodes), we can safely avoid dealing with - * node-affinity entirely. Ah, node-affinity is also deemed meaningless - * in case it has empty intersection with the vcpu's vcpu-affinity, as it - * would mean trying to schedule it on _no_ pcpu! + * node-affinity entirely. + * + * Node-affinity is also deemed meaningless in case it has empty + * intersection with mask, to cover the cases where using the node-affinity + * mask seems legit, but would instead led to trying to schedule the vcpu + * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's + * vcpu-affinity, or to the && of vcpu-affinity and the set of online cpus + * in the domain's cpupool. */ -#define __vcpu_has_node_affinity(vc) \ - ( !(cpumask_full(CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || !cpumask_intersects(vc->cpu_affinity, \ - CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || vc->domain->auto_node_affinity == 1) ) +static inline int __vcpu_has_node_affinity(const struct vcpu *vc, + const cpumask_t *mask) +{ + const struct domain *d = vc->domain; + const struct csched_dom *sdom = CSCHED_DOM(d); + + if ( d->auto_node_affinity + || cpumask_full(sdom->node_affinity_cpumask) + || !cpumask_intersects(sdom->node_affinity_cpumask, mask) ) + return 0; + + return 1; +} /* * Each csched-balance step uses its own cpumask. This function determines @@ -393,7 +406,8 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) int new_idlers_empty; if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(new->vcpu) ) + && !__vcpu_has_node_affinity(new->vcpu, + new->vcpu->cpu_affinity) ) continue; /* Are there idlers suitable for new (for this balance step)? */ @@ -626,11 +640,32 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) int cpu = vc->processor; int balance_step; + /* Store in cpus the mask of online cpus on which the domain can run */ online = cpupool_scheduler_cpumask(vc->domain->cpupool); + cpumask_and(&cpus, vc->cpu_affinity, online); + for_each_csched_balance_step( balance_step ) { + /* + * We want to pick up a pcpu among the ones that are online and + * can accommodate vc, which is basically what we computed above + * and stored in cpus. As far as vcpu-affinity is concerned, + * there always will be at least one of these pcpus, hence cpus + * is never empty and the calls to cpumask_cycle() and + * cpumask_test_cpu() below are ok. + * + * On the other hand, when considering node-affinity too, it + * is possible for the mask to become empty (for instance, if the + * domain has been put in a cpupool that does not contain any of the + * nodes in its node-affinity), which would result in the ASSERT()-s + * inside cpumask_*() operations triggering (in debug builds). + * + * Therefore, in this case, we filter the node-affinity mask against + * cpus and, if the result is empty, we just skip the node-affinity + * balancing step all together. + */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, &cpus) ) continue; /* Pick an online CPU from the proper affinity mask */ @@ -1449,7 +1484,7 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) * or counter. */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, vc->cpu_affinity) ) continue; csched_balance_cpumask(vc, balance_step, csched_balance_mask); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19: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 1VQ0by-00089N-3U; Sat, 28 Sep 2013 19:55:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bw-000897-Jm for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:28 +0000 Received: from [85.158.143.35:2741] by server-3.bemta-4.messagelabs.com id C9/EE-24907-F2437425; Sat, 28 Sep 2013 19:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1380398125!7467184!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18519 invoked from network); 28 Sep 2013 19:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0bt-0001Ly-G3 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0bt-0001T3-AF for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:25 +0000 Date: Sat, 28 Sep 2013 19:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched_credit: filter node-affinity mask against online cpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb272e48312cf1ba377aa1415461a271a3e06986 Author: Dario Faggioli AuthorDate: Fri Sep 27 11:57:59 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:57:59 2013 +0200 sched_credit: filter node-affinity mask against online cpus in _csched_cpu_pick(), as not doing so may result in the domain's node-affinity mask (as retrieved by csched_balance_cpumask() ) and online mask (as retrieved by cpupool_scheduler_cpumask() ) having an empty intersection. Therefore, when attempting a node-affinity load balancing step and running this: ... /* Pick an online CPU from the proper affinity mask */ csched_balance_cpumask(vc, balance_step, &cpus); cpumask_and(&cpus, &cpus, online); ... we end up with an empty cpumask (in cpus). At this point, in the following code: .... /* If present, prefer vc's current processor */ cpu = cpumask_test_cpu(vc->processor, &cpus) ? vc->processor : cpumask_cycle(vc->processor, &cpus); .... an ASSERT (from inside cpumask_cycle() ) triggers like this: (XEN) Xen call trace: (XEN) [] _csched_cpu_pick+0x1d2/0x652 (XEN) [] csched_cpu_pick+0xe/0x10 (XEN) [] vcpu_migrate+0x167/0x31e (XEN) [] cpu_disable_scheduler+0x1c8/0x287 (XEN) [] cpupool_unassign_cpu_helper+0x20/0xb4 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5f/0x8b (XEN) [] idle_loop+0x57/0x5e (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 1: (XEN) Assertion 'cpu < nr_cpu_ids' failed at /home/dario/Sources/xen/xen/xen.git/xen/include/xe:16481 It is for example sufficient to have a domain with node-affinity to NUMA node 1 running, and issueing a `xl cpupool-numa-split' would make the above happen. That is because, by default, all the existing domains remain assigned to the first cpupool, and it now (after the cpupool-numa-split) only includes NUMA node 0. This change prevents that by generalizing the function used for figuring out whether a node-affinity load balancing step is legit or not. This way we can, in _csched_cpu_pick(), figure out early enough that the mask would end up empty, skip the step all together and avoid the splat. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap master commit: 5e5a44b6c942d6ea47f15d6f1ed02b03e0d69445 master date: 2013-09-20 11:37:28 +0200 --- xen/common/sched_credit.c | 57 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 3188310..24f70c6 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -296,15 +296,28 @@ static void csched_set_node_affinity( * vcpu-affinity balancing is always necessary and must never be skipped. * OTOH, if a domain's node-affinity is said to be automatically computed * (or if it just spans all the nodes), we can safely avoid dealing with - * node-affinity entirely. Ah, node-affinity is also deemed meaningless - * in case it has empty intersection with the vcpu's vcpu-affinity, as it - * would mean trying to schedule it on _no_ pcpu! + * node-affinity entirely. + * + * Node-affinity is also deemed meaningless in case it has empty + * intersection with mask, to cover the cases where using the node-affinity + * mask seems legit, but would instead led to trying to schedule the vcpu + * on _no_ pcpu! Typical use cases are for mask to be equal to the vcpu's + * vcpu-affinity, or to the && of vcpu-affinity and the set of online cpus + * in the domain's cpupool. */ -#define __vcpu_has_node_affinity(vc) \ - ( !(cpumask_full(CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || !cpumask_intersects(vc->cpu_affinity, \ - CSCHED_DOM(vc->domain)->node_affinity_cpumask) \ - || vc->domain->auto_node_affinity == 1) ) +static inline int __vcpu_has_node_affinity(const struct vcpu *vc, + const cpumask_t *mask) +{ + const struct domain *d = vc->domain; + const struct csched_dom *sdom = CSCHED_DOM(d); + + if ( d->auto_node_affinity + || cpumask_full(sdom->node_affinity_cpumask) + || !cpumask_intersects(sdom->node_affinity_cpumask, mask) ) + return 0; + + return 1; +} /* * Each csched-balance step uses its own cpumask. This function determines @@ -393,7 +406,8 @@ __runq_tickle(unsigned int cpu, struct csched_vcpu *new) int new_idlers_empty; if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(new->vcpu) ) + && !__vcpu_has_node_affinity(new->vcpu, + new->vcpu->cpu_affinity) ) continue; /* Are there idlers suitable for new (for this balance step)? */ @@ -626,11 +640,32 @@ _csched_cpu_pick(const struct scheduler *ops, struct vcpu *vc, bool_t commit) int cpu = vc->processor; int balance_step; + /* Store in cpus the mask of online cpus on which the domain can run */ online = cpupool_scheduler_cpumask(vc->domain->cpupool); + cpumask_and(&cpus, vc->cpu_affinity, online); + for_each_csched_balance_step( balance_step ) { + /* + * We want to pick up a pcpu among the ones that are online and + * can accommodate vc, which is basically what we computed above + * and stored in cpus. As far as vcpu-affinity is concerned, + * there always will be at least one of these pcpus, hence cpus + * is never empty and the calls to cpumask_cycle() and + * cpumask_test_cpu() below are ok. + * + * On the other hand, when considering node-affinity too, it + * is possible for the mask to become empty (for instance, if the + * domain has been put in a cpupool that does not contain any of the + * nodes in its node-affinity), which would result in the ASSERT()-s + * inside cpumask_*() operations triggering (in debug builds). + * + * Therefore, in this case, we filter the node-affinity mask against + * cpus and, if the result is empty, we just skip the node-affinity + * balancing step all together. + */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, &cpus) ) continue; /* Pick an online CPU from the proper affinity mask */ @@ -1449,7 +1484,7 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) * or counter. */ if ( balance_step == CSCHED_BALANCE_NODE_AFFINITY - && !__vcpu_has_node_affinity(vc) ) + && !__vcpu_has_node_affinity(vc, vc->cpu_affinity) ) continue; csched_balance_cpumask(vc, balance_step, csched_balance_mask); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55: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 1VQ0c8-0008Ae-6a; Sat, 28 Sep 2013 19:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0c6-0008AQ-IU for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:38 +0000 Received: from [85.158.139.211:5919] by server-12.bemta-5.messagelabs.com id 45/6B-18373-93437425; Sat, 28 Sep 2013 19:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380398135!5159834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9938 invoked from network); 28 Sep 2013 19:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0c3-0001M5-MY for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0c3-0001TT-Kc for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:35 +0000 Date: Sat, 28 Sep 2013 19:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: linear address must be canonical for the whole accessed range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6db5da83ecaebfb1a651178334a10e7d1fa13dcc Author: Jan Beulich AuthorDate: Fri Sep 27 11:59:14 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:59:14 2013 +0200 x86/HVM: linear address must be canonical for the whole accessed range ... rather than just for the first byte. While at it, also - make the real mode case at least dpo a wrap around check - drop the mis-named "gpf" label (we're not generating faults here) and use in-place returns instead Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 7f12732670b31b2fea899a4160d455574658474f master date: 2013-09-23 09:53:55 +0200 --- xen/arch/x86/hvm/hvm.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a2fb715..20ff58c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1938,8 +1938,7 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr) { - unsigned long addr = offset; - uint32_t last_byte; + unsigned long addr = offset, last_byte; if ( !(current->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE) ) { @@ -1948,6 +1947,9 @@ int hvm_virtual_to_linear_addr( * Certain of them are not done in native real mode anyway. */ addr = (uint32_t)(addr + reg->base); + last_byte = (uint32_t)addr + bytes - 1; + if ( last_byte < addr ) + return 0; } else if ( addr_size != 64 ) { @@ -1959,17 +1961,17 @@ int hvm_virtual_to_linear_addr( { case hvm_access_read: if ( (reg->attr.fields.type & 0xa) == 0x8 ) - goto gpf; /* execute-only code segment */ + return 0; /* execute-only code segment */ break; case hvm_access_write: if ( (reg->attr.fields.type & 0xa) != 0x2 ) - goto gpf; /* not a writable data segment */ + return 0; /* not a writable data segment */ break; default: break; } - last_byte = offset + bytes - 1; + last_byte = (uint32_t)offset + bytes - 1; /* Is this a grows-down data segment? Special limit check if so. */ if ( (reg->attr.fields.type & 0xc) == 0x4 ) @@ -1980,10 +1982,10 @@ int hvm_virtual_to_linear_addr( /* Check first byte and last byte against respective bounds. */ if ( (offset <= reg->limit) || (last_byte < offset) ) - goto gpf; + return 0; } else if ( (last_byte > reg->limit) || (last_byte < offset) ) - goto gpf; /* last byte is beyond limit or wraps 0xFFFFFFFF */ + return 0; /* last byte is beyond limit or wraps 0xFFFFFFFF */ /* * Hardware truncates to 32 bits in compatibility mode. @@ -2000,15 +2002,14 @@ int hvm_virtual_to_linear_addr( if ( (seg == x86_seg_fs) || (seg == x86_seg_gs) ) addr += reg->base; - if ( !is_canonical_address(addr) ) - goto gpf; + last_byte = addr + bytes - 1; + if ( !is_canonical_address(addr) || last_byte < addr || + !is_canonical_address(last_byte) ) + return 0; } *linear_addr = addr; return 1; - - gpf: - return 0; } /* On non-NULL return, we leave this function holding an additional -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55: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 1VQ0c8-0008Ae-6a; Sat, 28 Sep 2013 19:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0c6-0008AQ-IU for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:38 +0000 Received: from [85.158.139.211:5919] by server-12.bemta-5.messagelabs.com id 45/6B-18373-93437425; Sat, 28 Sep 2013 19:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1380398135!5159834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9938 invoked from network); 28 Sep 2013 19:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 19:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0c3-0001M5-MY for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0c3-0001TT-Kc for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:35 +0000 Date: Sat, 28 Sep 2013 19:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: linear address must be canonical for the whole accessed range X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6db5da83ecaebfb1a651178334a10e7d1fa13dcc Author: Jan Beulich AuthorDate: Fri Sep 27 11:59:14 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:59:14 2013 +0200 x86/HVM: linear address must be canonical for the whole accessed range ... rather than just for the first byte. While at it, also - make the real mode case at least dpo a wrap around check - drop the mis-named "gpf" label (we're not generating faults here) and use in-place returns instead Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 7f12732670b31b2fea899a4160d455574658474f master date: 2013-09-23 09:53:55 +0200 --- xen/arch/x86/hvm/hvm.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a2fb715..20ff58c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1938,8 +1938,7 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr) { - unsigned long addr = offset; - uint32_t last_byte; + unsigned long addr = offset, last_byte; if ( !(current->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE) ) { @@ -1948,6 +1947,9 @@ int hvm_virtual_to_linear_addr( * Certain of them are not done in native real mode anyway. */ addr = (uint32_t)(addr + reg->base); + last_byte = (uint32_t)addr + bytes - 1; + if ( last_byte < addr ) + return 0; } else if ( addr_size != 64 ) { @@ -1959,17 +1961,17 @@ int hvm_virtual_to_linear_addr( { case hvm_access_read: if ( (reg->attr.fields.type & 0xa) == 0x8 ) - goto gpf; /* execute-only code segment */ + return 0; /* execute-only code segment */ break; case hvm_access_write: if ( (reg->attr.fields.type & 0xa) != 0x2 ) - goto gpf; /* not a writable data segment */ + return 0; /* not a writable data segment */ break; default: break; } - last_byte = offset + bytes - 1; + last_byte = (uint32_t)offset + bytes - 1; /* Is this a grows-down data segment? Special limit check if so. */ if ( (reg->attr.fields.type & 0xc) == 0x4 ) @@ -1980,10 +1982,10 @@ int hvm_virtual_to_linear_addr( /* Check first byte and last byte against respective bounds. */ if ( (offset <= reg->limit) || (last_byte < offset) ) - goto gpf; + return 0; } else if ( (last_byte > reg->limit) || (last_byte < offset) ) - goto gpf; /* last byte is beyond limit or wraps 0xFFFFFFFF */ + return 0; /* last byte is beyond limit or wraps 0xFFFFFFFF */ /* * Hardware truncates to 32 bits in compatibility mode. @@ -2000,15 +2002,14 @@ int hvm_virtual_to_linear_addr( if ( (seg == x86_seg_fs) || (seg == x86_seg_gs) ) addr += reg->base; - if ( !is_canonical_address(addr) ) - goto gpf; + last_byte = addr + bytes - 1; + if ( !is_canonical_address(addr) || last_byte < addr || + !is_canonical_address(last_byte) ) + return 0; } *linear_addr = addr; return 1; - - gpf: - return 0; } /* On non-NULL return, we leave this function holding an additional -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cI-0008CF-9e; Sat, 28 Sep 2013 19:55:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cG-0008Bw-T2 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:49 +0000 Received: from [85.158.139.211:6131] by server-12.bemta-5.messagelabs.com id 1D/6B-18373-44437425; Sat, 28 Sep 2013 19:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1380398146!5186450!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10994 invoked from network); 28 Sep 2013 19:55:47 -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; 28 Sep 2013 19:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cD-0001ME-TV for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0cD-0001Tp-SL for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:45 +0000 Date: Sat, 28 Sep 2013 19:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: refuse doing string operations in certain situations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e1ecba84056a6a8f545fae7a72702097cede4fa Author: Jan Beulich AuthorDate: Fri Sep 27 11:59:54 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:59:54 2013 +0200 x86/HVM: refuse doing string operations in certain situations We shouldn't do any acceleration for - "rep movs" when either side is passed through MMIO or when both sides are handled by qemu - "rep ins" and "rep outs" when the memory operand is any kind of MMIO Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 14fcce2fa883405bab26b60821a6cc5f2c770833 master date: 2013-09-23 09:55:14 +0200 --- xen/arch/x86/hvm/emulate.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 4ce4e0c..b206997 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -686,6 +686,7 @@ static int hvmemul_rep_ins( unsigned long addr; uint32_t pfec = PFEC_page_present | PFEC_write_access; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -702,6 +703,10 @@ static int hvmemul_rep_ins( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -719,6 +724,7 @@ static int hvmemul_rep_outs( unsigned long addr; uint32_t pfec = PFEC_page_present; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -735,6 +741,10 @@ static int hvmemul_rep_outs( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -787,6 +797,10 @@ static int hvmemul_rep_movs( (void) get_gfn_query_unlocked(current->domain, sgpa >> PAGE_SHIFT, &sp2mt); (void) get_gfn_query_unlocked(current->domain, dgpa >> PAGE_SHIFT, &dp2mt); + if ( sp2mt == p2m_mmio_direct || dp2mt == p2m_mmio_direct || + (sp2mt == p2m_mmio_dm && dp2mt == p2m_mmio_dm) ) + return X86EMUL_UNHANDLEABLE; + if ( sp2mt == p2m_mmio_dm ) return hvmemul_do_mmio( sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 19:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 19:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cI-0008CF-9e; Sat, 28 Sep 2013 19:55:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cG-0008Bw-T2 for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:49 +0000 Received: from [85.158.139.211:6131] by server-12.bemta-5.messagelabs.com id 1D/6B-18373-44437425; Sat, 28 Sep 2013 19:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1380398146!5186450!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10994 invoked from network); 28 Sep 2013 19:55:47 -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; 28 Sep 2013 19:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ0cD-0001ME-TV for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ0cD-0001Tp-SL for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 19:55:45 +0000 Date: Sat, 28 Sep 2013 19:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: refuse doing string operations in certain situations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e1ecba84056a6a8f545fae7a72702097cede4fa Author: Jan Beulich AuthorDate: Fri Sep 27 11:59:54 2013 +0200 Commit: Jan Beulich CommitDate: Fri Sep 27 11:59:54 2013 +0200 x86/HVM: refuse doing string operations in certain situations We shouldn't do any acceleration for - "rep movs" when either side is passed through MMIO or when both sides are handled by qemu - "rep ins" and "rep outs" when the memory operand is any kind of MMIO Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 14fcce2fa883405bab26b60821a6cc5f2c770833 master date: 2013-09-23 09:55:14 +0200 --- xen/arch/x86/hvm/emulate.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 4ce4e0c..b206997 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -686,6 +686,7 @@ static int hvmemul_rep_ins( unsigned long addr; uint32_t pfec = PFEC_page_present | PFEC_write_access; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -702,6 +703,10 @@ static int hvmemul_rep_ins( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(src_port, reps, bytes_per_rep, gpa, IOREQ_READ, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -719,6 +724,7 @@ static int hvmemul_rep_outs( unsigned long addr; uint32_t pfec = PFEC_page_present; paddr_t gpa; + p2m_type_t p2mt; int rc; rc = hvmemul_virtual_to_linear( @@ -735,6 +741,10 @@ static int hvmemul_rep_outs( if ( rc != X86EMUL_OKAY ) return rc; + (void) get_gfn_query_unlocked(current->domain, gpa >> PAGE_SHIFT, &p2mt); + if ( p2mt == p2m_mmio_direct || p2mt == p2m_mmio_dm ) + return X86EMUL_UNHANDLEABLE; + return hvmemul_do_pio(dst_port, reps, bytes_per_rep, gpa, IOREQ_WRITE, !!(ctxt->regs->eflags & X86_EFLAGS_DF), NULL); } @@ -787,6 +797,10 @@ static int hvmemul_rep_movs( (void) get_gfn_query_unlocked(current->domain, sgpa >> PAGE_SHIFT, &sp2mt); (void) get_gfn_query_unlocked(current->domain, dgpa >> PAGE_SHIFT, &dp2mt); + if ( sp2mt == p2m_mmio_direct || dp2mt == p2m_mmio_direct || + (sp2mt == p2m_mmio_dm && dp2mt == p2m_mmio_dm) ) + return X86EMUL_UNHANDLEABLE; + if ( sp2mt == p2m_mmio_dm ) return hvmemul_do_mmio( sgpa, reps, bytes_per_rep, dgpa, IOREQ_READ, df, NULL); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 28 21:44:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 21:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J5-0000rd-6e; Sat, 28 Sep 2013 21:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J3-0000rY-UR for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:06 +0000 Received: from [85.158.137.68:40551] by server-16.bemta-3.messagelabs.com id 3E/8C-30005-5AD47425; Sat, 28 Sep 2013 21:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1380404643!5364482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22916 invoked from network); 28 Sep 2013 21:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 21:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J1-0002eU-0r for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ2J0-0004P9-Mw for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:02 +0000 Date: Sat, 28 Sep 2013 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/xsave: initialize unused register state when restoring for guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5238678b8fec15a90460378fc8c67362f73f6fdc Author: Jan Beulich AuthorDate: Wed Sep 25 12:11:52 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 12:11:52 2013 +0200 x86/xsave: initialize unused register state when restoring for guest In order to avoid leaking register contents from the prior use of the registers restored through xrstor due to a guest enabling certain xcr0 bits late (particularly after the context restor in question), force restoring of all known registers (the ones that never got saved would be forced to their init state). This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/i387.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index bba14ca..011a55a 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -103,9 +103,9 @@ void setup_fpu(struct vcpu *v) { /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set all supported feature mask before restoring. */ - set_xcr0(v->arch.xcr0_accum); + set_xcr0(xfeature_mask); xrstor(v); set_xcr0(v->arch.xcr0); } @@ -149,7 +149,7 @@ void save_init_fpu(struct vcpu *v) if ( xsave_enabled(v) ) { /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + * we set all accumulated feature mask before saving. */ set_xcr0(v->arch.xcr0_accum); if ( cpu_has_xsaveopt ) -- 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 Sep 28 21:44:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 28 Sep 2013 21:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J5-0000rd-6e; Sat, 28 Sep 2013 21:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J3-0000rY-UR for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:06 +0000 Received: from [85.158.137.68:40551] by server-16.bemta-3.messagelabs.com id 3E/8C-30005-5AD47425; Sat, 28 Sep 2013 21:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1380404643!5364482!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22916 invoked from network); 28 Sep 2013 21:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2013 21:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQ2J1-0002eU-0r for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQ2J0-0004P9-Mw for xen-changelog@lists.xensource.com; Sat, 28 Sep 2013 21:44:02 +0000 Date: Sat, 28 Sep 2013 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/xsave: initialize unused register state when restoring for guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5238678b8fec15a90460378fc8c67362f73f6fdc Author: Jan Beulich AuthorDate: Wed Sep 25 12:11:52 2013 +0200 Commit: Jan Beulich CommitDate: Wed Sep 25 12:11:52 2013 +0200 x86/xsave: initialize unused register state when restoring for guest In order to avoid leaking register contents from the prior use of the registers restored through xrstor due to a guest enabling certain xcr0 bits late (particularly after the context restor in question), force restoring of all known registers (the ones that never got saved would be forced to their init state). This is CVE-2013-1442 / XSA-62. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 63a75ba0de817d6f384f96d25427a05c313e2179 master date: 2013-09-25 10:41:25 +0200 --- xen/arch/x86/i387.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index bba14ca..011a55a 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -103,9 +103,9 @@ void setup_fpu(struct vcpu *v) { /* * XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all supported feature mask before doing save/restore. + * we set all supported feature mask before restoring. */ - set_xcr0(v->arch.xcr0_accum); + set_xcr0(xfeature_mask); xrstor(v); set_xcr0(v->arch.xcr0); } @@ -149,7 +149,7 @@ void save_init_fpu(struct vcpu *v) if ( xsave_enabled(v) ) { /* XCR0 normally represents what guest OS set. In case of Xen itself, - * we set all accumulated feature mask before doing save/restore. + * we set all accumulated feature mask before saving. */ set_xcr0(v->arch.xcr0_accum); if ( cpu_has_xsaveopt ) -- 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 Sep 30 21:22:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Sep 2013 21:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkuv-000631-PF; Mon, 30 Sep 2013 21:22:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkut-00062s-Uv for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:08 +0000 Received: from [193.109.254.147:58913] by server-15.bemta-14.messagelabs.com id 66/55-10716-F7BE9425; Mon, 30 Sep 2013 21:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1380576125!4299250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10180 invoked from network); 30 Sep 2013 21:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Sep 2013 21:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkur-0007Vu-37 for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQkuq-0008Ao-AC for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:04 +0000 Date: Mon, 30 Sep 2013 21:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: properly handle hvm_copy_from_guest_{phys, virt}() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62f395f6ae43a0f2c3d48db4ca2b2535cb6f490f Author: Jan Beulich AuthorDate: Mon Sep 30 14:26:18 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 30 14:26:18 2013 +0200 x86: properly handle hvm_copy_from_guest_{phys,virt}() errors Ignoring them generally implies using uninitialized data and, in all but two of the cases dealt with here, potentially leaking hypervisor stack contents to guests. This is CVE-2013-4355 / XSA-63. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 6bb838e7375f5b031e9ac346b353775c90de45dc master date: 2013-09-30 14:17:46 +0200 --- xen/arch/x86/hvm/hvm.c | 18 ++++--------- xen/arch/x86/hvm/intercept.c | 49 +++++++++++++++++++++++++++++++------- xen/arch/x86/hvm/io.c | 24 +++++++++++++----- xen/arch/x86/hvm/vmx/realmode.c | 6 ++-- 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7792ca8..02b9b55 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2247,11 +2247,7 @@ void hvm_task_switch( rc = hvm_copy_from_guest_virt( &tss, prev_tr.base, sizeof(tss), PFEC_page_present); - if ( rc == HVMCOPY_bad_gva_to_gfn ) - goto out; - if ( rc == HVMCOPY_gfn_paged_out ) - goto out; - if ( rc == HVMCOPY_gfn_shared ) + if ( rc != HVMCOPY_okay ) goto out; eflags = regs->eflags; @@ -2296,13 +2292,11 @@ void hvm_task_switch( rc = hvm_copy_from_guest_virt( &tss, tr.base, sizeof(tss), PFEC_page_present); - if ( rc == HVMCOPY_bad_gva_to_gfn ) - goto out; - if ( rc == HVMCOPY_gfn_paged_out ) - goto out; - /* Note: this could be optimised, if the callee functions knew we want RO - * access */ - if ( rc == HVMCOPY_gfn_shared ) + /* + * Note: The HVMCOPY_gfn_shared case could be optimised, if the callee + * functions knew we want RO access. + */ + if ( rc != HVMCOPY_okay ) goto out; diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index af22d11..2ccc39e 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -87,17 +87,28 @@ static int hvm_mmio_access(struct vcpu *v, { for ( i = 0; i < p->count; i++ ) { - int ret; - - ret = hvm_copy_from_guest_phys(&data, - p->data + (sign * i * p->size), - p->size); - if ( (ret == HVMCOPY_gfn_paged_out) || - (ret == HVMCOPY_gfn_shared) ) + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: rc = X86EMUL_RETRY; break; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + rc = X86EMUL_UNHANDLEABLE; + break; } + if ( rc != X86EMUL_OKAY ) + break; rc = write_handler(v, p->addr + (sign * i * p->size), p->size, data); if ( rc != X86EMUL_OKAY ) @@ -165,8 +176,28 @@ static int process_portio_intercept(portio_action_t action, ioreq_t *p) for ( i = 0; i < p->count; i++ ) { data = 0; - (void)hvm_copy_from_guest_phys(&data, p->data + sign*i*p->size, - p->size); + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) + { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: + rc = X86EMUL_RETRY; + break; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + rc = X86EMUL_UNHANDLEABLE; + break; + } + if ( rc != X86EMUL_OKAY ) + break; rc = action(IOREQ_WRITE, p->addr, p->size, &data); if ( rc != X86EMUL_OKAY ) break; diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index c20f4e8..7cf0d36 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -340,14 +340,24 @@ static int dpci_ioport_write(uint32_t mport, ioreq_t *p) data = p->data; if ( p->data_is_ptr ) { - int ret; - - ret = hvm_copy_from_guest_phys(&data, - p->data + (sign * i * p->size), - p->size); - if ( (ret == HVMCOPY_gfn_paged_out) && - (ret == HVMCOPY_gfn_shared) ) + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) + { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: return X86EMUL_RETRY; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + return X86EMUL_UNHANDLEABLE; + } } switch ( p->size ) diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c index ce7a13b..a942b70 100644 --- a/xen/arch/x86/hvm/vmx/realmode.c +++ b/xen/arch/x86/hvm/vmx/realmode.c @@ -39,7 +39,9 @@ static void realmode_deliver_exception( again: last_byte = (vector * 4) + 3; - if ( idtr->limit < last_byte ) + if ( idtr->limit < last_byte || + hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4) != + HVMCOPY_okay ) { /* Software interrupt? */ if ( insn_len != 0 ) @@ -64,8 +66,6 @@ static void realmode_deliver_exception( } } - (void)hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4); - frame[0] = regs->eip + insn_len; frame[1] = csr->sel; frame[2] = regs->eflags & ~X86_EFLAGS_RF; -- 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 Mon Sep 30 21:22:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Sep 2013 21:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkuv-000631-PF; Mon, 30 Sep 2013 21:22:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkut-00062s-Uv for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:08 +0000 Received: from [193.109.254.147:58913] by server-15.bemta-14.messagelabs.com id 66/55-10716-F7BE9425; Mon, 30 Sep 2013 21:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1380576125!4299250!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10180 invoked from network); 30 Sep 2013 21:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Sep 2013 21:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkur-0007Vu-37 for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQkuq-0008Ao-AC for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:04 +0000 Date: Mon, 30 Sep 2013 21:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: properly handle hvm_copy_from_guest_{phys, virt}() errors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62f395f6ae43a0f2c3d48db4ca2b2535cb6f490f Author: Jan Beulich AuthorDate: Mon Sep 30 14:26:18 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 30 14:26:18 2013 +0200 x86: properly handle hvm_copy_from_guest_{phys,virt}() errors Ignoring them generally implies using uninitialized data and, in all but two of the cases dealt with here, potentially leaking hypervisor stack contents to guests. This is CVE-2013-4355 / XSA-63. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 6bb838e7375f5b031e9ac346b353775c90de45dc master date: 2013-09-30 14:17:46 +0200 --- xen/arch/x86/hvm/hvm.c | 18 ++++--------- xen/arch/x86/hvm/intercept.c | 49 +++++++++++++++++++++++++++++++------- xen/arch/x86/hvm/io.c | 24 +++++++++++++----- xen/arch/x86/hvm/vmx/realmode.c | 6 ++-- 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7792ca8..02b9b55 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2247,11 +2247,7 @@ void hvm_task_switch( rc = hvm_copy_from_guest_virt( &tss, prev_tr.base, sizeof(tss), PFEC_page_present); - if ( rc == HVMCOPY_bad_gva_to_gfn ) - goto out; - if ( rc == HVMCOPY_gfn_paged_out ) - goto out; - if ( rc == HVMCOPY_gfn_shared ) + if ( rc != HVMCOPY_okay ) goto out; eflags = regs->eflags; @@ -2296,13 +2292,11 @@ void hvm_task_switch( rc = hvm_copy_from_guest_virt( &tss, tr.base, sizeof(tss), PFEC_page_present); - if ( rc == HVMCOPY_bad_gva_to_gfn ) - goto out; - if ( rc == HVMCOPY_gfn_paged_out ) - goto out; - /* Note: this could be optimised, if the callee functions knew we want RO - * access */ - if ( rc == HVMCOPY_gfn_shared ) + /* + * Note: The HVMCOPY_gfn_shared case could be optimised, if the callee + * functions knew we want RO access. + */ + if ( rc != HVMCOPY_okay ) goto out; diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index af22d11..2ccc39e 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -87,17 +87,28 @@ static int hvm_mmio_access(struct vcpu *v, { for ( i = 0; i < p->count; i++ ) { - int ret; - - ret = hvm_copy_from_guest_phys(&data, - p->data + (sign * i * p->size), - p->size); - if ( (ret == HVMCOPY_gfn_paged_out) || - (ret == HVMCOPY_gfn_shared) ) + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: rc = X86EMUL_RETRY; break; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + rc = X86EMUL_UNHANDLEABLE; + break; } + if ( rc != X86EMUL_OKAY ) + break; rc = write_handler(v, p->addr + (sign * i * p->size), p->size, data); if ( rc != X86EMUL_OKAY ) @@ -165,8 +176,28 @@ static int process_portio_intercept(portio_action_t action, ioreq_t *p) for ( i = 0; i < p->count; i++ ) { data = 0; - (void)hvm_copy_from_guest_phys(&data, p->data + sign*i*p->size, - p->size); + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) + { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: + rc = X86EMUL_RETRY; + break; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + rc = X86EMUL_UNHANDLEABLE; + break; + } + if ( rc != X86EMUL_OKAY ) + break; rc = action(IOREQ_WRITE, p->addr, p->size, &data); if ( rc != X86EMUL_OKAY ) break; diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index c20f4e8..7cf0d36 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -340,14 +340,24 @@ static int dpci_ioport_write(uint32_t mport, ioreq_t *p) data = p->data; if ( p->data_is_ptr ) { - int ret; - - ret = hvm_copy_from_guest_phys(&data, - p->data + (sign * i * p->size), - p->size); - if ( (ret == HVMCOPY_gfn_paged_out) && - (ret == HVMCOPY_gfn_shared) ) + switch ( hvm_copy_from_guest_phys(&data, + p->data + sign * i * p->size, + p->size) ) + { + case HVMCOPY_okay: + break; + case HVMCOPY_gfn_paged_out: + case HVMCOPY_gfn_shared: return X86EMUL_RETRY; + case HVMCOPY_bad_gfn_to_mfn: + data = ~0; + break; + case HVMCOPY_bad_gva_to_gfn: + ASSERT(0); + /* fall through */ + default: + return X86EMUL_UNHANDLEABLE; + } } switch ( p->size ) diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c index ce7a13b..a942b70 100644 --- a/xen/arch/x86/hvm/vmx/realmode.c +++ b/xen/arch/x86/hvm/vmx/realmode.c @@ -39,7 +39,9 @@ static void realmode_deliver_exception( again: last_byte = (vector * 4) + 3; - if ( idtr->limit < last_byte ) + if ( idtr->limit < last_byte || + hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4) != + HVMCOPY_okay ) { /* Software interrupt? */ if ( insn_len != 0 ) @@ -64,8 +66,6 @@ static void realmode_deliver_exception( } } - (void)hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4); - frame[0] = regs->eip + insn_len; frame[1] = csr->sel; frame[2] = regs->eflags & ~X86_EFLAGS_RF; -- 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 Mon Sep 30 21:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Sep 2013 21:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv5-00063p-S2; Mon, 30 Sep 2013 21:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv4-00063f-AB for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:18 +0000 Received: from [85.158.137.68:29979] by server-7.bemta-3.messagelabs.com id 94/D8-24536-98BE9425; Mon, 30 Sep 2013 21:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1380576135!5715449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15411 invoked from network); 30 Sep 2013 21:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Sep 2013 21:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv1-0007Vy-GN for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQkv1-0008BD-9L for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:15 +0000 Date: Mon, 30 Sep 2013 21:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: properly set up fbld emulation operand 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 09962956f799de2a0f5d6589d52ed7755eaf6ac3 Author: Jan Beulich AuthorDate: Mon Sep 30 14:29:38 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 30 14:29:38 2013 +0200 x86: properly set up fbld emulation operand address This is CVE-2013-4361 / XSA-66. Signed-off-by: Jan Beulich Acked-by: Ian Jackson master commit: 28b706efb6abb637fabfd74cde70a50935a5640b master date: 2013-09-30 14:18:58 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1bac6b8..deefdb9 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3159,11 +3159,11 @@ x86_emulate( break; case 4: /* fbld m80dec */ ea.bytes = 10; - dst = ea; + src = ea; if ( (rc = ops->read(src.mem.seg, src.mem.off, &src.val, src.bytes, ctxt)) != 0 ) goto done; - emulate_fpu_insn_memdst("fbld", src.val); + emulate_fpu_insn_memsrc("fbld", src.val); break; case 5: /* fild m64i */ ea.bytes = 8; -- 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 Mon Sep 30 21:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Sep 2013 21:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv5-00063p-S2; Mon, 30 Sep 2013 21:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv4-00063f-AB for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:18 +0000 Received: from [85.158.137.68:29979] by server-7.bemta-3.messagelabs.com id 94/D8-24536-98BE9425; Mon, 30 Sep 2013 21:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1380576135!5715449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15411 invoked from network); 30 Sep 2013 21:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Sep 2013 21:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VQkv1-0007Vy-GN for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VQkv1-0008BD-9L for xen-changelog@lists.xensource.com; Mon, 30 Sep 2013 21:22:15 +0000 Date: Mon, 30 Sep 2013 21:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: properly set up fbld emulation operand 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 09962956f799de2a0f5d6589d52ed7755eaf6ac3 Author: Jan Beulich AuthorDate: Mon Sep 30 14:29:38 2013 +0200 Commit: Jan Beulich CommitDate: Mon Sep 30 14:29:38 2013 +0200 x86: properly set up fbld emulation operand address This is CVE-2013-4361 / XSA-66. Signed-off-by: Jan Beulich Acked-by: Ian Jackson master commit: 28b706efb6abb637fabfd74cde70a50935a5640b master date: 2013-09-30 14:18:58 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1bac6b8..deefdb9 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3159,11 +3159,11 @@ x86_emulate( break; case 4: /* fbld m80dec */ ea.bytes = 10; - dst = ea; + src = ea; if ( (rc = ops->read(src.mem.seg, src.mem.off, &src.val, src.bytes, ctxt)) != 0 ) goto done; - emulate_fpu_insn_memdst("fbld", src.val); + emulate_fpu_insn_memsrc("fbld", src.val); break; case 5: /* fild m64i */ ea.bytes = 8; -- 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