From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMgR-0000Zp-K9; Fri, 01 Nov 2013 21:55:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgQ-0000Zk-A5 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:10 +0000 Received: from [85.158.139.211:48771] by server-12.bemta-5.messagelabs.com id EF/15-15833-D3324725; Fri, 01 Nov 2013 21:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1383342906!1124024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32478 invoked from network); 1 Nov 2013 21:55:07 -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; 1 Nov 2013 21:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgL-0001U6-UU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgL-0007Jm-8D for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:05 +0000 Date: Fri, 01 Nov 2013 21:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: allow KeyedUnion members to be empty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb3eb6ad946b4daf0c4d3c0404bfa6abde6b3568 Author: Rob Hoes AuthorDate: Fri Oct 4 16:58:19 2013 +0100 Commit: Ian Campbell CommitDate: Thu Oct 31 18:00:39 2013 +0000 libxl: idl: allow KeyedUnion members to be empty This is useful when the key enum has an "invalid" option and avoids the need to declare a dummy struct. Use this for domain_build_info resulting in the generated API changing like so: --- tools/libxl/_libxl_BACKUP_types.h +++ tools/libxl/_libxl_types.h @@ -377,8 +377,6 @@ typedef struct libxl_domain_build_info { const char * features; libxl_defbool e820_host; } pv; - struct { - } invalid; } u; } libxl_domain_build_info; void libxl_domain_build_info_dispose(libxl_domain_build_info *p); + a related change to the JSON generation. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/gentest.py | 3 ++- tools/libxl/gentypes.py | 11 ++++++++--- tools/libxl/libxl_types.idl | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 84b4fd7..6fab493 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -46,7 +46,8 @@ def gen_rand_init(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += gen_rand_init(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += gen_rand_init(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Struct) \ diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 30f29ba..be06257 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -45,6 +45,8 @@ def libxl_C_type_define(ty, indent = ""): s += "typedef %s %s {\n" % (ty.kind, ty.typename) for f in ty.fields: + if isinstance(ty, idl.KeyedUnion) and f.type is None: continue + x = libxl_C_instance_of(f.type, f.name) if f.const: x = "const " + x @@ -67,7 +69,8 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Array): @@ -115,7 +118,8 @@ def _libxl_C_type_init(ty, v, indent = " ", parent = None, subinit=False): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += _libxl_C_type_init(f.type, fexpr, " ", nparent) + if f.type is not None: + s += _libxl_C_type_init(f.type, fexpr, " ", nparent) s += " break;\n" s += "}\n" else: @@ -214,7 +218,8 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None): diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index d2cea8a..5c43d6f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -362,7 +362,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Use host's E820 for PCI passthrough. ("e820_host", libxl_defbool), ])), - ("invalid", Struct(None, [])), + ("invalid", None), ], keyvar_init_val = "LIBXL_DOMAIN_TYPE_INVALID")), ], dir=DIR_IN ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMgR-0000Zp-K9; Fri, 01 Nov 2013 21:55:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgQ-0000Zk-A5 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:10 +0000 Received: from [85.158.139.211:48771] by server-12.bemta-5.messagelabs.com id EF/15-15833-D3324725; Fri, 01 Nov 2013 21:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1383342906!1124024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32478 invoked from network); 1 Nov 2013 21:55:07 -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; 1 Nov 2013 21:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgL-0001U6-UU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgL-0007Jm-8D for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:05 +0000 Date: Fri, 01 Nov 2013 21:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: allow KeyedUnion members to be empty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb3eb6ad946b4daf0c4d3c0404bfa6abde6b3568 Author: Rob Hoes AuthorDate: Fri Oct 4 16:58:19 2013 +0100 Commit: Ian Campbell CommitDate: Thu Oct 31 18:00:39 2013 +0000 libxl: idl: allow KeyedUnion members to be empty This is useful when the key enum has an "invalid" option and avoids the need to declare a dummy struct. Use this for domain_build_info resulting in the generated API changing like so: --- tools/libxl/_libxl_BACKUP_types.h +++ tools/libxl/_libxl_types.h @@ -377,8 +377,6 @@ typedef struct libxl_domain_build_info { const char * features; libxl_defbool e820_host; } pv; - struct { - } invalid; } u; } libxl_domain_build_info; void libxl_domain_build_info_dispose(libxl_domain_build_info *p); + a related change to the JSON generation. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson --- tools/libxl/gentest.py | 3 ++- tools/libxl/gentypes.py | 11 ++++++++--- tools/libxl/libxl_types.idl | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 84b4fd7..6fab493 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -46,7 +46,8 @@ def gen_rand_init(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += gen_rand_init(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += gen_rand_init(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Struct) \ diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 30f29ba..be06257 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -45,6 +45,8 @@ def libxl_C_type_define(ty, indent = ""): s += "typedef %s %s {\n" % (ty.kind, ty.typename) for f in ty.fields: + if isinstance(ty, idl.KeyedUnion) and f.type is None: continue + x = libxl_C_instance_of(f.type, f.name) if f.const: x = "const " + x @@ -67,7 +69,8 @@ def libxl_C_type_dispose(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Array): @@ -115,7 +118,8 @@ def _libxl_C_type_init(ty, v, indent = " ", parent = None, subinit=False): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += _libxl_C_type_init(f.type, fexpr, " ", nparent) + if f.type is not None: + s += _libxl_C_type_init(f.type, fexpr, " ", nparent) s += " break;\n" s += "}\n" else: @@ -214,7 +218,8 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None): for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) + if f.type is not None: + s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None): diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index d2cea8a..5c43d6f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -362,7 +362,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Use host's E820 for PCI passthrough. ("e820_host", libxl_defbool), ])), - ("invalid", Struct(None, [])), + ("invalid", None), ], keyvar_init_val = "LIBXL_DOMAIN_TYPE_INVALID")), ], dir=DIR_IN ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMga-0000aV-Ml; Fri, 01 Nov 2013 21:55:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgZ-0000aF-6I for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:19 +0000 Received: from [193.109.254.147:58861] by server-8.bemta-14.messagelabs.com id 7F/CF-03701-64324725; Fri, 01 Nov 2013 21:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1383342916!168475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24937 invoked from network); 1 Nov 2013 21:55:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgW-0001U9-EF for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgW-0007KB-2H for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:16 +0000 Date: Fri, 01 Nov 2013 21:55:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add META to list of generated files in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce15718ae5c0c922871a2971d7f26527688e13a8 Author: Rob Hoes AuthorDate: Mon Oct 21 14:32:31 2013 +0100 Commit: Ian Campbell CommitDate: Thu Oct 31 18:15:55 2013 +0000 libxl: ocaml: add META to list of generated files in Makefile Signed-off-by: Rob Hoes Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/ocaml/libs/xl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index c9e5274..4195bfc 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -19,7 +19,7 @@ OCAML_LIBRARY = xenlight GENERATED_FILES += xenlight.ml xenlight.ml.tmp xenlight.mli xenlight.mli.tmp GENERATED_FILES += _libxl_types.ml.in _libxl_types.mli.in -GENERATED_FILES += _libxl_types.inc +GENERATED_FILES += _libxl_types.inc META all: $(INTF) $(LIBS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMga-0000aV-Ml; Fri, 01 Nov 2013 21:55:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgZ-0000aF-6I for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:19 +0000 Received: from [193.109.254.147:58861] by server-8.bemta-14.messagelabs.com id 7F/CF-03701-64324725; Fri, 01 Nov 2013 21:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1383342916!168475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24937 invoked from network); 1 Nov 2013 21:55:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgW-0001U9-EF for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgW-0007KB-2H for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:16 +0000 Date: Fri, 01 Nov 2013 21:55:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add META to list of generated files in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce15718ae5c0c922871a2971d7f26527688e13a8 Author: Rob Hoes AuthorDate: Mon Oct 21 14:32:31 2013 +0100 Commit: Ian Campbell CommitDate: Thu Oct 31 18:15:55 2013 +0000 libxl: ocaml: add META to list of generated files in Makefile Signed-off-by: Rob Hoes Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/ocaml/libs/xl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index c9e5274..4195bfc 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -19,7 +19,7 @@ OCAML_LIBRARY = xenlight GENERATED_FILES += xenlight.ml xenlight.ml.tmp xenlight.mli xenlight.mli.tmp GENERATED_FILES += _libxl_types.ml.in _libxl_types.mli.in -GENERATED_FILES += _libxl_types.inc +GENERATED_FILES += _libxl_types.inc META all: $(INTF) $(LIBS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgl-0000bZ-Pg; Fri, 01 Nov 2013 21:55:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgk-0000bM-K8 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:31 +0000 Received: from [193.109.254.147:45767] by server-5.bemta-14.messagelabs.com id 15/69-13525-15324725; Fri, 01 Nov 2013 21:55:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383342927!157689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1431 invoked from network); 1 Nov 2013 21:55:27 -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; 1 Nov 2013 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgg-0001UF-Os for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgg-0007KX-KW for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:26 +0000 Date: Fri, 01 Nov 2013 21:55:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove unnecessary null pointer checks before frees X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c07134ccca7d61534aa00294126dadd9fd6cb2a2 Author: Matthew Daley AuthorDate: Tue Oct 15 18:18:02 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 20:04:25 2013 +0000 tools: remove unnecessary null pointer checks before frees Patch generated by the following semantic patch (http://coccinelle.lip6.fr/): @@ expression *P; @@ - if(P) free(P); + free(P); ...and then by filtering through the following command: filterdiff -p1 -x 'stubdom/*' -x 'tools/firmware/*' -x 'tools/qemu-*' -x 'tools/blktap*' Signed-off-by: Matthew Daley Acked-by: Samuel Thibault Acked-by: Ian Campbell --- extras/mini-os/blkfront.c | 14 ++++++------ extras/mini-os/console/xenbus.c | 8 +++--- extras/mini-os/fbfront.c | 38 +++++++++++++++++----------------- extras/mini-os/kernel.c | 4 +- extras/mini-os/lib/sys.c | 3 +- extras/mini-os/netfront.c | 18 ++++++++-------- extras/mini-os/pcifront.c | 14 ++++++------ tools/flask/utils/loadpolicy.c | 3 +- tools/libxc/xc_compression.c | 15 ++++--------- tools/libxc/xc_core_x86.c | 6 +--- tools/libxc/xc_domain_save.c | 6 +--- tools/libxc/xc_gnttab.c | 3 +- tools/libxc/xc_offline_page.c | 9 ++----- tools/libxl/libxl_event.c | 3 +- tools/libxl/libxl_qmp.c | 6 +--- tools/libxl/libxl_utils.c | 2 +- tools/memshr/bidir-hash.c | 4 +- tools/misc/gtraceview.c | 3 +- tools/tests/xen-access/xen-access.c | 6 +--- tools/xenbackendd/xenbackendd.c | 6 +--- 20 files changed, 74 insertions(+), 97 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index aead6bd..62a32c5 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -160,7 +160,7 @@ again: err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -271,7 +271,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_blkfront: error changing state to %d: %s\n", @@ -281,7 +281,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -294,16 +294,16 @@ void shutdown_blkfront(struct blkfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_blkfront(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index b317114..1c9a590 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -32,7 +32,7 @@ void free_consfront(struct consfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("free_consfront: error changing state to %d: %s\n", @@ -41,9 +41,9 @@ void free_consfront(struct consfront_dev *dev) } close: - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err) free(err); + free(err); mask_evtchn(dev->evtchn); unbind_evtchn(dev->evtchn); @@ -134,7 +134,7 @@ again: err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index a276193..1e01513 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -131,7 +131,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -171,7 +171,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -256,7 +256,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_kbdfront: error changing state to %d: %s\n", @@ -266,7 +266,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -279,19 +279,19 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_kbdfront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_kbdfront(dev); @@ -498,7 +498,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -538,7 +538,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -654,7 +654,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_fbfront: error changing state to %d: %s\n", @@ -664,7 +664,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) state = xenbus_read_integer(path); if (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -677,22 +677,22 @@ void shutdown_fbfront(struct fbfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_fbfront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_fbfront(dev); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 24fa25c..ea409f4 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -85,9 +85,9 @@ static void shutdown_thread(void *p) xenbus_wait_for_watch(&events); } err = xenbus_unwatch_path_token(XBT_NIL, path, token); - if (err) free(err); + free(err); err = xenbus_write(XBT_NIL, path, ""); - if (err) free(err); + free(err); printk("Shutting down (%s)\n", shutdown); if (!strcmp(shutdown, "poweroff")) diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index cfbdc90..13e7e59 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -1156,8 +1156,7 @@ LWIP_STUB(int, getsockname, (int s, struct sockaddr *name, socklen_t *namelen), static char *syslog_ident; void openlog(const char *ident, int option, int facility) { - if (syslog_ident) - free(syslog_ident); + free(syslog_ident); syslog_ident = strdup(ident); } diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 3a5be64..44c3995 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -412,7 +412,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -525,7 +525,7 @@ void shutdown_netfront(struct netfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_netfront: error changing state to %d: %s\n", @@ -535,7 +535,7 @@ void shutdown_netfront(struct netfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -548,22 +548,22 @@ void shutdown_netfront(struct netfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_netfront(dev); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index 7838021..16a4b49 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -212,7 +212,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -251,7 +251,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not avalable, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -342,7 +342,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_pcifront: error changing state to %d: %s\n", @@ -365,16 +365,16 @@ void shutdown_pcifront(struct pcifront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_pcifront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_pcifront(dev); diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c index f347b97..2edcf97 100644 --- a/tools/flask/utils/loadpolicy.c +++ b/tools/flask/utils/loadpolicy.c @@ -108,8 +108,7 @@ int main (int argCnt, const char *args[]) } done: - if ( polMemCp ) - free(polMemCp); + free(polMemCp); if ( polMem ) { ret = munmap(polMem, info.st_size); diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index 89f1be7..8f0b89d 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -457,16 +457,11 @@ void xc_compression_free_context(xc_interface *xch, comp_ctx *ctx) { if (!ctx) return; - if (ctx->inputbuf) - free(ctx->inputbuf); - if (ctx->sendbuf_pfns) - free(ctx->sendbuf_pfns); - if (ctx->cache_base) - free(ctx->cache_base); - if (ctx->pfn2cache) - free(ctx->pfn2cache); - if (ctx->cache) - free(ctx->cache); + free(ctx->inputbuf); + free(ctx->sendbuf_pfns); + free(ctx->cache_base); + free(ctx->pfn2cache); + free(ctx->cache); free(ctx); } diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index a9681f7..e328dcf 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -180,11 +180,9 @@ out: if ( live_p2m_frame_list ) munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); - if ( p2m_frame_list_list ) - free(p2m_frame_list_list); + free(p2m_frame_list_list); - if ( p2m_frame_list ) - free(p2m_frame_list); + free(p2m_frame_list); errno = err; return ret; diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index fbc15e9..673d1e9 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -773,11 +773,9 @@ static xen_pfn_t *map_and_save_p2m_table(xc_interface *xch, if ( live_p2m_frame_list ) munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); - if ( p2m_frame_list_list ) - free(p2m_frame_list_list); + free(p2m_frame_list_list); - if ( p2m_frame_list ) - free(p2m_frame_list); + free(p2m_frame_list); return success ? p2m : NULL; } diff --git a/tools/libxc/xc_gnttab.c b/tools/libxc/xc_gnttab.c index a8cc381..79dab40 100644 --- a/tools/libxc/xc_gnttab.c +++ b/tools/libxc/xc_gnttab.c @@ -124,8 +124,7 @@ static void *_gnttab_map_table(xc_interface *xch, int domid, int *gnt_num) err: if ( frame_list ) xc_hypercall_buffer_free(xch, frame_list); - if ( pfn_list ) - free(pfn_list); + free(pfn_list); return gnt; } diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 8195efb..0b4cdf9 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -626,14 +626,11 @@ failed: } } - if (mmu) - free(mmu); + free(mmu); - if (old_ptes.entries) - free(old_ptes.entries); + free(old_ptes.entries); - if (backup) - free(backup); + free(backup); if (gnttab_v1) munmap(gnttab_v1, gnt_num / (PAGE_SIZE/sizeof(grant_entry_v1_t))); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a5c52bc..c5e9426 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -578,8 +578,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, out_rc: if (use) LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); - if (path_copy) - free(path_copy); + free(path_copy); CTX_UNLOCK; return rc; } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index f681f3a..7e825ee 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -406,12 +406,10 @@ static void qmp_close(libxl__qmp_handler *qmp) close(qmp->qmp_fd); LIBXL_STAILQ_FOREACH(pp, &qmp->callback_list, next) { - if (tmp) - free(tmp); + free(tmp); tmp = pp; } - if (tmp) - free(tmp); + free(tmp); } static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 1bcac7e..682f874 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -355,7 +355,7 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, e = errno; assert(e != ENOENT); if (f) fclose(f); - if (data) free(data); + free(data); return e; } diff --git a/tools/memshr/bidir-hash.c b/tools/memshr/bidir-hash.c index bed8179..3d34637 100644 --- a/tools/memshr/bidir-hash.c +++ b/tools/memshr/bidir-hash.c @@ -208,8 +208,8 @@ static void free_buckets(struct __hash *h, struct bucket *buckets, struct bucket_lock *bucket_locks) { - if(buckets) free(buckets); - if(bucket_locks) free(bucket_locks); + free(buckets); + free(bucket_locks); } static int max_entries(struct __hash *h) diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c index d8b4589..cf9287c 100644 --- a/tools/misc/gtraceview.c +++ b/tools/misc/gtraceview.c @@ -959,8 +959,7 @@ int time_mode_rebuild(uint64_t start_time, uint64_t time_scale) state = malloc(sizeof(struct state) * number); if (!state) return 1; - if (this->state) - free(this->state); + free(this->state); this->state = state; this->width = 9; this->row = 0; diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 49195a8..b00c05a 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -219,10 +219,8 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) } xenaccess->xc_handle = NULL; - if ( xenaccess->platform_info ) - free(xenaccess->platform_info); - if ( xenaccess->domain_info ) - free(xenaccess->domain_info); + free(xenaccess->platform_info); + free(xenaccess->domain_info); free(xenaccess); return 0; diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c index 5381a2a..f1eb1f5 100644 --- a/tools/xenbackendd/xenbackendd.c +++ b/tools/xenbackendd/xenbackendd.c @@ -291,8 +291,7 @@ main(int argc, char * const argv[]) switch(type) { case DEVTYPE_VIF: - if (s) - free(s); + free(s); snprintf(buf, sizeof(buf), "%s/script", vec[XS_WATCH_PATH]); s = xs_read(xs, XBT_NULL, buf, 0); @@ -314,8 +313,7 @@ main(int argc, char * const argv[]) } next2: - if (s) - free(s); + free(s); free(sstate); next1: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgl-0000bZ-Pg; Fri, 01 Nov 2013 21:55:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgk-0000bM-K8 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:31 +0000 Received: from [193.109.254.147:45767] by server-5.bemta-14.messagelabs.com id 15/69-13525-15324725; Fri, 01 Nov 2013 21:55:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383342927!157689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1431 invoked from network); 1 Nov 2013 21:55:27 -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; 1 Nov 2013 21:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgg-0001UF-Os for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgg-0007KX-KW for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:26 +0000 Date: Fri, 01 Nov 2013 21:55:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove unnecessary null pointer checks before frees X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c07134ccca7d61534aa00294126dadd9fd6cb2a2 Author: Matthew Daley AuthorDate: Tue Oct 15 18:18:02 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 20:04:25 2013 +0000 tools: remove unnecessary null pointer checks before frees Patch generated by the following semantic patch (http://coccinelle.lip6.fr/): @@ expression *P; @@ - if(P) free(P); + free(P); ...and then by filtering through the following command: filterdiff -p1 -x 'stubdom/*' -x 'tools/firmware/*' -x 'tools/qemu-*' -x 'tools/blktap*' Signed-off-by: Matthew Daley Acked-by: Samuel Thibault Acked-by: Ian Campbell --- extras/mini-os/blkfront.c | 14 ++++++------ extras/mini-os/console/xenbus.c | 8 +++--- extras/mini-os/fbfront.c | 38 +++++++++++++++++----------------- extras/mini-os/kernel.c | 4 +- extras/mini-os/lib/sys.c | 3 +- extras/mini-os/netfront.c | 18 ++++++++-------- extras/mini-os/pcifront.c | 14 ++++++------ tools/flask/utils/loadpolicy.c | 3 +- tools/libxc/xc_compression.c | 15 ++++--------- tools/libxc/xc_core_x86.c | 6 +--- tools/libxc/xc_domain_save.c | 6 +--- tools/libxc/xc_gnttab.c | 3 +- tools/libxc/xc_offline_page.c | 9 ++----- tools/libxl/libxl_event.c | 3 +- tools/libxl/libxl_qmp.c | 6 +--- tools/libxl/libxl_utils.c | 2 +- tools/memshr/bidir-hash.c | 4 +- tools/misc/gtraceview.c | 3 +- tools/tests/xen-access/xen-access.c | 6 +--- tools/xenbackendd/xenbackendd.c | 6 +--- 20 files changed, 74 insertions(+), 97 deletions(-) diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index aead6bd..62a32c5 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -160,7 +160,7 @@ again: err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -271,7 +271,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_blkfront: error changing state to %d: %s\n", @@ -281,7 +281,7 @@ void shutdown_blkfront(struct blkfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -294,16 +294,16 @@ void shutdown_blkfront(struct blkfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_blkfront(dev); diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os/console/xenbus.c index b317114..1c9a590 100644 --- a/extras/mini-os/console/xenbus.c +++ b/extras/mini-os/console/xenbus.c @@ -32,7 +32,7 @@ void free_consfront(struct consfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("free_consfront: error changing state to %d: %s\n", @@ -41,9 +41,9 @@ void free_consfront(struct consfront_dev *dev) } close: - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err) free(err); + free(err); mask_evtchn(dev->evtchn); unbind_evtchn(dev->evtchn); @@ -134,7 +134,7 @@ again: err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index a276193..1e01513 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -131,7 +131,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -171,7 +171,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -256,7 +256,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_kbdfront: error changing state to %d: %s\n", @@ -266,7 +266,7 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -279,19 +279,19 @@ void shutdown_kbdfront(struct kbdfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_kbdfront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/request-abs-pointer", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_kbdfront(dev); @@ -498,7 +498,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -538,7 +538,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not available, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -654,7 +654,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_fbfront: error changing state to %d: %s\n", @@ -664,7 +664,7 @@ void shutdown_fbfront(struct fbfront_dev *dev) state = xenbus_read_integer(path); if (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -677,22 +677,22 @@ void shutdown_fbfront(struct fbfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_fbfront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/page-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/protocol", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/feature-update", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_fbfront(dev); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 24fa25c..ea409f4 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -85,9 +85,9 @@ static void shutdown_thread(void *p) xenbus_wait_for_watch(&events); } err = xenbus_unwatch_path_token(XBT_NIL, path, token); - if (err) free(err); + free(err); err = xenbus_write(XBT_NIL, path, ""); - if (err) free(err); + free(err); printk("Shutting down (%s)\n", shutdown); if (!strcmp(shutdown, "poweroff")) diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index cfbdc90..13e7e59 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -1156,8 +1156,7 @@ LWIP_STUB(int, getsockname, (int s, struct sockaddr *name, socklen_t *namelen), static char *syslog_ident; void openlog(const char *ident, int option, int facility) { - if (syslog_ident) - free(syslog_ident); + free(syslog_ident); syslog_ident = strdup(ident); } diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index 3a5be64..44c3995 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -412,7 +412,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -525,7 +525,7 @@ void shutdown_netfront(struct netfront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_netfront: error changing state to %d: %s\n", @@ -535,7 +535,7 @@ void shutdown_netfront(struct netfront_dev *dev) state = xenbus_read_integer(path); while (state < XenbusStateClosed) { err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); } if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateInitialising)) != NULL) { @@ -548,22 +548,22 @@ void shutdown_netfront(struct netfront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/tx-ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/rx-ring-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/request-rx-copy", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_netfront(dev); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index 7838021..16a4b49 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -212,7 +212,7 @@ again: } err = xenbus_transaction_end(xbt, 0, &retry); - if (err) free(err); + free(err); if (retry) { goto again; printk("completing transaction\n"); @@ -251,7 +251,7 @@ done: err = xenbus_wait_for_state_change(path, &state, &dev->events); if (state != XenbusStateConnected) { printk("backend not avalable, state=%d\n", state); - if (err) free(err); + free(err); err = xenbus_unwatch_path_token(XBT_NIL, path, path); goto error; } @@ -342,7 +342,7 @@ void shutdown_pcifront(struct pcifront_dev *dev) state = xenbus_read_integer(path); while (err == NULL && state < XenbusStateClosing) err = xenbus_wait_for_state_change(path, &state, &dev->events); - if (err) free(err); + free(err); if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosed)) != NULL) { printk("shutdown_pcifront: error changing state to %d: %s\n", @@ -365,16 +365,16 @@ void shutdown_pcifront(struct pcifront_dev *dev) err = xenbus_wait_for_state_change(path, &state, &dev->events); close_pcifront: - if (err) free(err); + free(err); err2 = xenbus_unwatch_path_token(XBT_NIL, path, path); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/info-ref", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); snprintf(nodename, sizeof(nodename), "%s/event-channel", dev->nodename); err2 = xenbus_rm(XBT_NIL, nodename); - if (err2) free(err2); + free(err2); if (!err) free_pcifront(dev); diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c index f347b97..2edcf97 100644 --- a/tools/flask/utils/loadpolicy.c +++ b/tools/flask/utils/loadpolicy.c @@ -108,8 +108,7 @@ int main (int argCnt, const char *args[]) } done: - if ( polMemCp ) - free(polMemCp); + free(polMemCp); if ( polMem ) { ret = munmap(polMem, info.st_size); diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index 89f1be7..8f0b89d 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -457,16 +457,11 @@ void xc_compression_free_context(xc_interface *xch, comp_ctx *ctx) { if (!ctx) return; - if (ctx->inputbuf) - free(ctx->inputbuf); - if (ctx->sendbuf_pfns) - free(ctx->sendbuf_pfns); - if (ctx->cache_base) - free(ctx->cache_base); - if (ctx->pfn2cache) - free(ctx->pfn2cache); - if (ctx->cache) - free(ctx->cache); + free(ctx->inputbuf); + free(ctx->sendbuf_pfns); + free(ctx->cache_base); + free(ctx->pfn2cache); + free(ctx->cache); free(ctx); } diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index a9681f7..e328dcf 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -180,11 +180,9 @@ out: if ( live_p2m_frame_list ) munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); - if ( p2m_frame_list_list ) - free(p2m_frame_list_list); + free(p2m_frame_list_list); - if ( p2m_frame_list ) - free(p2m_frame_list); + free(p2m_frame_list); errno = err; return ret; diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index fbc15e9..673d1e9 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -773,11 +773,9 @@ static xen_pfn_t *map_and_save_p2m_table(xc_interface *xch, if ( live_p2m_frame_list ) munmap(live_p2m_frame_list, P2M_FLL_ENTRIES * PAGE_SIZE); - if ( p2m_frame_list_list ) - free(p2m_frame_list_list); + free(p2m_frame_list_list); - if ( p2m_frame_list ) - free(p2m_frame_list); + free(p2m_frame_list); return success ? p2m : NULL; } diff --git a/tools/libxc/xc_gnttab.c b/tools/libxc/xc_gnttab.c index a8cc381..79dab40 100644 --- a/tools/libxc/xc_gnttab.c +++ b/tools/libxc/xc_gnttab.c @@ -124,8 +124,7 @@ static void *_gnttab_map_table(xc_interface *xch, int domid, int *gnt_num) err: if ( frame_list ) xc_hypercall_buffer_free(xch, frame_list); - if ( pfn_list ) - free(pfn_list); + free(pfn_list); return gnt; } diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 8195efb..0b4cdf9 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -626,14 +626,11 @@ failed: } } - if (mmu) - free(mmu); + free(mmu); - if (old_ptes.entries) - free(old_ptes.entries); + free(old_ptes.entries); - if (backup) - free(backup); + free(backup); if (gnttab_v1) munmap(gnttab_v1, gnt_num / (PAGE_SIZE/sizeof(grant_entry_v1_t))); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a5c52bc..c5e9426 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -578,8 +578,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, out_rc: if (use) LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); - if (path_copy) - free(path_copy); + free(path_copy); CTX_UNLOCK; return rc; } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index f681f3a..7e825ee 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -406,12 +406,10 @@ static void qmp_close(libxl__qmp_handler *qmp) close(qmp->qmp_fd); LIBXL_STAILQ_FOREACH(pp, &qmp->callback_list, next) { - if (tmp) - free(tmp); + free(tmp); tmp = pp; } - if (tmp) - free(tmp); + free(tmp); } static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 1bcac7e..682f874 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -355,7 +355,7 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, e = errno; assert(e != ENOENT); if (f) fclose(f); - if (data) free(data); + free(data); return e; } diff --git a/tools/memshr/bidir-hash.c b/tools/memshr/bidir-hash.c index bed8179..3d34637 100644 --- a/tools/memshr/bidir-hash.c +++ b/tools/memshr/bidir-hash.c @@ -208,8 +208,8 @@ static void free_buckets(struct __hash *h, struct bucket *buckets, struct bucket_lock *bucket_locks) { - if(buckets) free(buckets); - if(bucket_locks) free(bucket_locks); + free(buckets); + free(bucket_locks); } static int max_entries(struct __hash *h) diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c index d8b4589..cf9287c 100644 --- a/tools/misc/gtraceview.c +++ b/tools/misc/gtraceview.c @@ -959,8 +959,7 @@ int time_mode_rebuild(uint64_t start_time, uint64_t time_scale) state = malloc(sizeof(struct state) * number); if (!state) return 1; - if (this->state) - free(this->state); + free(this->state); this->state = state; this->width = 9; this->row = 0; diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 49195a8..b00c05a 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -219,10 +219,8 @@ int xenaccess_teardown(xc_interface *xch, xenaccess_t *xenaccess) } xenaccess->xc_handle = NULL; - if ( xenaccess->platform_info ) - free(xenaccess->platform_info); - if ( xenaccess->domain_info ) - free(xenaccess->domain_info); + free(xenaccess->platform_info); + free(xenaccess->domain_info); free(xenaccess); return 0; diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c index 5381a2a..f1eb1f5 100644 --- a/tools/xenbackendd/xenbackendd.c +++ b/tools/xenbackendd/xenbackendd.c @@ -291,8 +291,7 @@ main(int argc, char * const argv[]) switch(type) { case DEVTYPE_VIF: - if (s) - free(s); + free(s); snprintf(buf, sizeof(buf), "%s/script", vec[XS_WATCH_PATH]); s = xs_read(xs, XBT_NULL, buf, 0); @@ -314,8 +313,7 @@ main(int argc, char * const argv[]) } next2: - if (s) - free(s); + free(s); free(sstate); next1: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgu-0000cz-Ui; Fri, 01 Nov 2013 21:55:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgt-0000ck-QU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:39 +0000 Received: from [193.109.254.147:59269] by server-3.bemta-14.messagelabs.com id BD/65-03488-B5324725; Fri, 01 Nov 2013 21:55:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383342937!174183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29790 invoked from network); 1 Nov 2013 21:55:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:55:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgq-0001UQ-VT for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgq-0007LT-Tm for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:36 +0000 Date: Fri, 01 Nov 2013 21:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: HVM domain S3 bugfix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe2367b1ebe165c06cf10d4730e254e736396182 Author: Liu Jinsong AuthorDate: Fri Aug 23 23:30:23 2013 +0800 Commit: Ian Campbell CommitDate: Thu Oct 31 20:52:19 2013 +0000 libxl: HVM domain S3 bugfix Currently Xen hvm s3 has a bug coming from the difference between qemu-traditional and qemu-xen. For qemu-traditional, the way to resume from hvm s3 is via 'xl trigger' command. However, for qemu-xen, the way to resume from hvm s3 inherited from standard qemu, i.e. via QMP, and it doesn't work under Xen. The root cause is, for qemu-xen, 'xl trigger' command didn't reset devices, while QMP didn't unpause hvm domain though they did qemu system reset. We have two qemu patches one xl patch to fix the HVM S3 bug: This patch is the xl patch. It invokes QMP system_wakeup so that qemu logic for hvm s3 could be triggered. Signed-off-by: Liu Jinsong Acked-by: Ian Campbell --- tools/libxl/libxl.c | 31 +++++++++++++++++++++++++++++-- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_qmp.c | 5 +++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 29e66f2..0652010 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4654,10 +4654,37 @@ int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, return ret; } +static int libxl__domain_s3_resume(libxl__gc *gc, int domid) +{ + int rc = 0; + + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = xc_set_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__qmp_system_wakeup(gc, domid); + break; + default: + rc = ERROR_INVAL; + break; + } + break; + default: + rc = ERROR_INVAL; + break; + } + + return rc; +} + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid) { int rc; + GC_INIT(ctx); switch (trigger) { case LIBXL_TRIGGER_POWER: @@ -4681,8 +4708,7 @@ int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, XEN_DOMCTL_SENDTRIGGER_RESET, vcpuid); break; case LIBXL_TRIGGER_S3RESUME: - xc_set_hvm_param(ctx->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); - rc = 0; + rc = libxl__domain_s3_resume(gc, domid); break; default: rc = -1; @@ -4697,6 +4723,7 @@ int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, rc = ERROR_FAIL; } + GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 165dc00..4f92522 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1408,6 +1408,8 @@ _hidden int libxl__qmp_query_serial(libxl__qmp_handler *qmp); _hidden int libxl__qmp_pci_add(libxl__gc *gc, int d, libxl_device_pci *pcidev); _hidden int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev); +/* Resume hvm domain */ +_hidden int libxl__qmp_system_wakeup(libxl__gc *gc, int domid); /* Suspend QEMU. */ _hidden int libxl__qmp_stop(libxl__gc *gc, int domid); /* Resume QEMU. */ diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 7e825ee..395258e 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -876,6 +876,11 @@ int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev) return qmp_device_del(gc, domid, id); } +int libxl__qmp_system_wakeup(libxl__gc *gc, int domid) +{ + return qmp_run_command(gc, domid, "system_wakeup", NULL, NULL, NULL); +} + int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename) { libxl__json_object *args = 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 Nov 01 21:55:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgu-0000cz-Ui; Fri, 01 Nov 2013 21:55:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgt-0000ck-QU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:39 +0000 Received: from [193.109.254.147:59269] by server-3.bemta-14.messagelabs.com id BD/65-03488-B5324725; Fri, 01 Nov 2013 21:55:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383342937!174183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29790 invoked from network); 1 Nov 2013 21:55:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:55:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMgq-0001UQ-VT for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMgq-0007LT-Tm for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:36 +0000 Date: Fri, 01 Nov 2013 21:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: HVM domain S3 bugfix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe2367b1ebe165c06cf10d4730e254e736396182 Author: Liu Jinsong AuthorDate: Fri Aug 23 23:30:23 2013 +0800 Commit: Ian Campbell CommitDate: Thu Oct 31 20:52:19 2013 +0000 libxl: HVM domain S3 bugfix Currently Xen hvm s3 has a bug coming from the difference between qemu-traditional and qemu-xen. For qemu-traditional, the way to resume from hvm s3 is via 'xl trigger' command. However, for qemu-xen, the way to resume from hvm s3 inherited from standard qemu, i.e. via QMP, and it doesn't work under Xen. The root cause is, for qemu-xen, 'xl trigger' command didn't reset devices, while QMP didn't unpause hvm domain though they did qemu system reset. We have two qemu patches one xl patch to fix the HVM S3 bug: This patch is the xl patch. It invokes QMP system_wakeup so that qemu logic for hvm s3 could be triggered. Signed-off-by: Liu Jinsong Acked-by: Ian Campbell --- tools/libxl/libxl.c | 31 +++++++++++++++++++++++++++++-- tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_qmp.c | 5 +++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 29e66f2..0652010 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4654,10 +4654,37 @@ int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, return ret; } +static int libxl__domain_s3_resume(libxl__gc *gc, int domid) +{ + int rc = 0; + + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = xc_set_hvm_param(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__qmp_system_wakeup(gc, domid); + break; + default: + rc = ERROR_INVAL; + break; + } + break; + default: + rc = ERROR_INVAL; + break; + } + + return rc; +} + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid) { int rc; + GC_INIT(ctx); switch (trigger) { case LIBXL_TRIGGER_POWER: @@ -4681,8 +4708,7 @@ int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, XEN_DOMCTL_SENDTRIGGER_RESET, vcpuid); break; case LIBXL_TRIGGER_S3RESUME: - xc_set_hvm_param(ctx->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); - rc = 0; + rc = libxl__domain_s3_resume(gc, domid); break; default: rc = -1; @@ -4697,6 +4723,7 @@ int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, rc = ERROR_FAIL; } + GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 165dc00..4f92522 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1408,6 +1408,8 @@ _hidden int libxl__qmp_query_serial(libxl__qmp_handler *qmp); _hidden int libxl__qmp_pci_add(libxl__gc *gc, int d, libxl_device_pci *pcidev); _hidden int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev); +/* Resume hvm domain */ +_hidden int libxl__qmp_system_wakeup(libxl__gc *gc, int domid); /* Suspend QEMU. */ _hidden int libxl__qmp_stop(libxl__gc *gc, int domid); /* Resume QEMU. */ diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 7e825ee..395258e 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -876,6 +876,11 @@ int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev) return qmp_device_del(gc, domid, id); } +int libxl__qmp_system_wakeup(libxl__gc *gc, int domid) +{ + return qmp_run_command(gc, domid, "system_wakeup", NULL, NULL, NULL); +} + int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename) { libxl__json_object *args = 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 Nov 01 21:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMh5-0000ed-2r; Fri, 01 Nov 2013 21:55:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMh3-0000eM-Oh for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:49 +0000 Received: from [193.109.254.147:46319] by server-14.bemta-14.messagelabs.com id 3E/C9-25733-56324725; Fri, 01 Nov 2013 21:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383342947!172531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30019 invoked from network); 1 Nov 2013 21:55:48 -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; 1 Nov 2013 21:55:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMh1-0001UX-6H for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMh1-0007Lq-3v for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:47 +0000 Date: Fri, 01 Nov 2013 21:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xencommons: write domain 0's domid to xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0804697225966915175==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0804697225966915175== Content-Type: text/plain commit 02ebea7768fe723deaa56c2cfcb860874544b47d Author: Matthew Daley AuthorDate: Thu Oct 31 19:03:55 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 20:59:34 2013 +0000 xencommons: write domain 0's domid to xenstore libvchan's init_xs_srv (server-side xenstore-related initialization) expects to find the current domain's domid at this xenstore key. libxl (and xend) write this for domains they create. Do the same for domain 0, allowing the use of libvchan in dom0. Signed-off-by: Matthew Daley Acked-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xencommons | 3 ++- tools/hotplug/NetBSD/rc.d/xencommons | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index a2e633b..4ebd636 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -108,8 +108,9 @@ do_start () { exit 1 fi - echo Setting domain 0 name... + echo Setting domain 0 name and domid... ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 fi echo Starting xenconsoled... diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons index fe4c9ac..b1c3531 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons +++ b/tools/hotplug/NetBSD/rc.d/xencommons @@ -68,8 +68,9 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name.\n" + printf "Setting domain 0 name and domid.\n" ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 } xen_stop() -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0804697225966915175== 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 --===============0804697225966915175==-- From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMh5-0000ed-2r; Fri, 01 Nov 2013 21:55:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMh3-0000eM-Oh for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:49 +0000 Received: from [193.109.254.147:46319] by server-14.bemta-14.messagelabs.com id 3E/C9-25733-56324725; Fri, 01 Nov 2013 21:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383342947!172531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30019 invoked from network); 1 Nov 2013 21:55:48 -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; 1 Nov 2013 21:55:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMh1-0001UX-6H for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMh1-0007Lq-3v for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:47 +0000 Date: Fri, 01 Nov 2013 21:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xencommons: write domain 0's domid to xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0804697225966915175==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0804697225966915175== Content-Type: text/plain commit 02ebea7768fe723deaa56c2cfcb860874544b47d Author: Matthew Daley AuthorDate: Thu Oct 31 19:03:55 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 20:59:34 2013 +0000 xencommons: write domain 0's domid to xenstore libvchan's init_xs_srv (server-side xenstore-related initialization) expects to find the current domain's domid at this xenstore key. libxl (and xend) write this for domains they create. Do the same for domain 0, allowing the use of libvchan in dom0. Signed-off-by: Matthew Daley Acked-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xencommons | 3 ++- tools/hotplug/NetBSD/rc.d/xencommons | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index a2e633b..4ebd636 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -108,8 +108,9 @@ do_start () { exit 1 fi - echo Setting domain 0 name... + echo Setting domain 0 name and domid... ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 fi echo Starting xenconsoled... diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons index fe4c9ac..b1c3531 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons +++ b/tools/hotplug/NetBSD/rc.d/xencommons @@ -68,8 +68,9 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name.\n" + printf "Setting domain 0 name and domid.\n" ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 } xen_stop() -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0804697225966915175== 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 --===============0804697225966915175==-- From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhJ-0000gu-64; Fri, 01 Nov 2013 21:56:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhH-0000gb-KQ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:03 +0000 Received: from [85.158.139.211:12403] by server-4.bemta-5.messagelabs.com id B5/E1-10224-F6324725; Fri, 01 Nov 2013 21:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1383342957!1127983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15030 invoked from network); 1 Nov 2013 21:55:58 -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; 1 Nov 2013 21:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhB-0001Ui-Cq for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhB-0007MS-Ae for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:57 +0000 Date: Fri, 01 Nov 2013 21:55:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix retrieval of and remove pointless check on gzip size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9fa4c863623eb169cbf6f282921b00dac698ed5 Author: Matthew Daley AuthorDate: Thu Oct 31 15:58:53 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:13:47 2013 +0000 libxc: fix retrieval of and remove pointless check on gzip size Coverity-ID: 1055587 Coverity-ID: 1055963 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 0f367f6..3bf51ef 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -294,8 +294,8 @@ size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen) return 0; gzlen = blob + ziplen - 4; - unziplen = gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0]; - if ( (unziplen < 0) || (unziplen > XC_DOM_DECOMPRESS_MAX) ) + unziplen = (size_t)gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0]; + if ( unziplen > XC_DOM_DECOMPRESS_MAX ) { xc_dom_printf (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 Fri Nov 01 21:56:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhJ-0000gu-64; Fri, 01 Nov 2013 21:56:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhH-0000gb-KQ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:03 +0000 Received: from [85.158.139.211:12403] by server-4.bemta-5.messagelabs.com id B5/E1-10224-F6324725; Fri, 01 Nov 2013 21:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1383342957!1127983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15030 invoked from network); 1 Nov 2013 21:55:58 -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; 1 Nov 2013 21:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhB-0001Ui-Cq for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhB-0007MS-Ae for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:55:57 +0000 Date: Fri, 01 Nov 2013 21:55:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix retrieval of and remove pointless check on gzip size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9fa4c863623eb169cbf6f282921b00dac698ed5 Author: Matthew Daley AuthorDate: Thu Oct 31 15:58:53 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:13:47 2013 +0000 libxc: fix retrieval of and remove pointless check on gzip size Coverity-ID: 1055587 Coverity-ID: 1055963 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 0f367f6..3bf51ef 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -294,8 +294,8 @@ size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen) return 0; gzlen = blob + ziplen - 4; - unziplen = gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0]; - if ( (unziplen < 0) || (unziplen > XC_DOM_DECOMPRESS_MAX) ) + unziplen = (size_t)gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0]; + if ( unziplen > XC_DOM_DECOMPRESS_MAX ) { xc_dom_printf (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 Fri Nov 01 21:56:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMhQ-0000iA-8n; Fri, 01 Nov 2013 21:56:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhO-0000hk-9W for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:10 +0000 Received: from [85.158.139.211:12608] by server-11.bemta-5.messagelabs.com id 01/95-03454-97324725; Fri, 01 Nov 2013 21:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1383342967!1120588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24218 invoked from network); 1 Nov 2013 21:56:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhL-0001VE-LR for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhL-0007My-Gx for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:07 +0000 Date: Fri, 01 Nov 2013 21:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix memory leak in move_l3_below_4G 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 9fae04ff00231e9a1696952b4ef882b9f2309389 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:39 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:38 2013 +0000 libxc: fix memory leak in move_l3_below_4G error handling ...otherwise mmu gets leaked. Coverity-ID: 1055844 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 7cc2ff2..60fc544 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -220,7 +220,7 @@ static xen_pfn_t move_l3_below_4G(struct xc_dom_image *dom, { DOMPRINTF("%s: xc_dom_pfn_to_ptr(dom, l3pfn, 1) => NULL", __FUNCTION__); - return l3mfn; /* our one call site will call xc_dom_panic and fail */ + goto out; /* our one call site will call xc_dom_panic and fail */ } memset(l3tab, 0, XC_DOM_PAGE_SIZE(dom)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMhQ-0000iA-8n; Fri, 01 Nov 2013 21:56:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhO-0000hk-9W for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:10 +0000 Received: from [85.158.139.211:12608] by server-11.bemta-5.messagelabs.com id 01/95-03454-97324725; Fri, 01 Nov 2013 21:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1383342967!1120588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24218 invoked from network); 1 Nov 2013 21:56:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhL-0001VE-LR for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhL-0007My-Gx for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:07 +0000 Date: Fri, 01 Nov 2013 21:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix memory leak in move_l3_below_4G 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 9fae04ff00231e9a1696952b4ef882b9f2309389 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:39 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:38 2013 +0000 libxc: fix memory leak in move_l3_below_4G error handling ...otherwise mmu gets leaked. Coverity-ID: 1055844 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 7cc2ff2..60fc544 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -220,7 +220,7 @@ static xen_pfn_t move_l3_below_4G(struct xc_dom_image *dom, { DOMPRINTF("%s: xc_dom_pfn_to_ptr(dom, l3pfn, 1) => NULL", __FUNCTION__); - return l3mfn; /* our one call site will call xc_dom_panic and fail */ + goto out; /* our one call site will call xc_dom_panic and fail */ } memset(l3tab, 0, XC_DOM_PAGE_SIZE(dom)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMha-0000k8-Bu; Fri, 01 Nov 2013 21:56:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhY-0000jh-CU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:20 +0000 Received: from [85.158.143.35:25265] by server-3.bemta-4.messagelabs.com id CE/EF-19578-38324725; Fri, 01 Nov 2013 21:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383342978!421609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30652 invoked from network); 1 Nov 2013 21:56:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhV-0001W7-TI for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhV-0007NU-Ry for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:17 +0000 Date: Fri, 01 Nov 2013 21:56:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't ignore fd read failures when restoring a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f46fa80ec47cae30f91d51ec34450b3577d529b9 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:40 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:46 2013 +0000 libxc: don't ignore fd read failures when restoring a domain Coverity-ID: 1055042 Coverity-ID: 1055043 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index ecaf25d..80769a7 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -327,7 +327,11 @@ static xen_pfn_t *load_p2m_frame_list( else if ( !strncmp(chunk_sig, "xcnt", 4) ) { *vcpuextstate = 1; - RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)); + if ( RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)) ) + { + PERROR("read extended vcpu state size failed"); + return NULL; + } tot_bytes -= chunk_bytes; chunk_bytes = 0; } @@ -928,14 +932,22 @@ static int pagebuf_get_one(xc_interface *xch, struct restore_ctx *ctx, case XC_SAVE_ID_TOOLSTACK: { - RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)); + if ( RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)) ) + { + PERROR("error read toolstack id size"); + return -1; + } buf->tdata.data = (uint8_t*) realloc(buf->tdata.data, buf->tdata.len); if ( buf->tdata.data == NULL ) { PERROR("error memory allocation"); return -1; } - RDEXACT(fd, buf->tdata.data, buf->tdata.len); + if ( RDEXACT(fd, buf->tdata.data, buf->tdata.len) ) + { + PERROR("error read toolstack id"); + return -1; + } return pagebuf_get_one(xch, ctx, buf, fd, dom); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMha-0000k8-Bu; Fri, 01 Nov 2013 21:56:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhY-0000jh-CU for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:20 +0000 Received: from [85.158.143.35:25265] by server-3.bemta-4.messagelabs.com id CE/EF-19578-38324725; Fri, 01 Nov 2013 21:56:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383342978!421609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30652 invoked from network); 1 Nov 2013 21:56:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhV-0001W7-TI for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhV-0007NU-Ry for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:17 +0000 Date: Fri, 01 Nov 2013 21:56:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't ignore fd read failures when restoring a domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f46fa80ec47cae30f91d51ec34450b3577d529b9 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:40 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:46 2013 +0000 libxc: don't ignore fd read failures when restoring a domain Coverity-ID: 1055042 Coverity-ID: 1055043 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index ecaf25d..80769a7 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -327,7 +327,11 @@ static xen_pfn_t *load_p2m_frame_list( else if ( !strncmp(chunk_sig, "xcnt", 4) ) { *vcpuextstate = 1; - RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)); + if ( RDEXACT(io_fd, vcpuextstate_size, sizeof(*vcpuextstate_size)) ) + { + PERROR("read extended vcpu state size failed"); + return NULL; + } tot_bytes -= chunk_bytes; chunk_bytes = 0; } @@ -928,14 +932,22 @@ static int pagebuf_get_one(xc_interface *xch, struct restore_ctx *ctx, case XC_SAVE_ID_TOOLSTACK: { - RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)); + if ( RDEXACT(fd, &buf->tdata.len, sizeof(buf->tdata.len)) ) + { + PERROR("error read toolstack id size"); + return -1; + } buf->tdata.data = (uint8_t*) realloc(buf->tdata.data, buf->tdata.len); if ( buf->tdata.data == NULL ) { PERROR("error memory allocation"); return -1; } - RDEXACT(fd, buf->tdata.data, buf->tdata.len); + if ( RDEXACT(fd, buf->tdata.data, buf->tdata.len) ) + { + PERROR("error read toolstack id"); + return -1; + } return pagebuf_get_one(xch, ctx, buf, fd, dom); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMhj-0000lr-Gr; Fri, 01 Nov 2013 21:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhj-0000lh-28 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:31 +0000 Received: from [85.158.137.68:28607] by server-15.bemta-3.messagelabs.com id 61/B9-10403-E8324725; Fri, 01 Nov 2013 21:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1383342988!1131179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18472 invoked from network); 1 Nov 2013 21:56:29 -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; 1 Nov 2013 21:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhg-0001WK-4W for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhg-0007Nq-1D for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:28 +0000 Date: Fri, 01 Nov 2013 21:56:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: tidy up loop construct in write_compressed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcaacad1a472f3023a7fd9cea4132c3f6533c913 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:41 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:49 2013 +0000 libxc: tidy up loop construct in write_compressed ...otherwise the return 0 at the bottom is dead code. Coverity-ID: 1055189 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_save.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 673d1e9..42c4752 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -233,7 +233,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, int marker = XC_SAVE_ID_COMPRESSED_DATA; unsigned long compbuf_len = 0; - do + for(;;) { /* check for available space (atleast 8k) */ if ((ob->pos + header + XC_PAGE_SIZE * 2) > ob->size) @@ -250,7 +250,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, ob->size - ob->pos - header, &compbuf_len); if (!rc) - return 0; + break; if (outbuf_hardwrite(xch, ob, fd, &marker, sizeof(marker)) < 0) { @@ -270,7 +270,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, ERROR("Error when writing compressed chunk"); return -1; } - } while (rc != 0); + } 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 Nov 01 21:56:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMhj-0000lr-Gr; Fri, 01 Nov 2013 21:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhj-0000lh-28 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:31 +0000 Received: from [85.158.137.68:28607] by server-15.bemta-3.messagelabs.com id 61/B9-10403-E8324725; Fri, 01 Nov 2013 21:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1383342988!1131179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18472 invoked from network); 1 Nov 2013 21:56:29 -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; 1 Nov 2013 21:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhg-0001WK-4W for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhg-0007Nq-1D for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:28 +0000 Date: Fri, 01 Nov 2013 21:56:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: tidy up loop construct in write_compressed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fcaacad1a472f3023a7fd9cea4132c3f6533c913 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:41 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:23:49 2013 +0000 libxc: tidy up loop construct in write_compressed ...otherwise the return 0 at the bottom is dead code. Coverity-ID: 1055189 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_save.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 673d1e9..42c4752 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -233,7 +233,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, int marker = XC_SAVE_ID_COMPRESSED_DATA; unsigned long compbuf_len = 0; - do + for(;;) { /* check for available space (atleast 8k) */ if ((ob->pos + header + XC_PAGE_SIZE * 2) > ob->size) @@ -250,7 +250,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, ob->size - ob->pos - header, &compbuf_len); if (!rc) - return 0; + break; if (outbuf_hardwrite(xch, ob, fd, &marker, sizeof(marker)) < 0) { @@ -270,7 +270,7 @@ static int write_compressed(xc_interface *xch, comp_ctx *compress_ctx, ERROR("Error when writing compressed chunk"); return -1; } - } while (rc != 0); + } 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 Nov 01 21:56:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMht-0000nh-K5; Fri, 01 Nov 2013 21:56:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMht-0000nT-4Q for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:41 +0000 Received: from [85.158.137.68:28880] by server-6.bemta-3.messagelabs.com id 9F/EB-23777-89324725; Fri, 01 Nov 2013 21:56:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1383342998!1132538!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18997 invoked from network); 1 Nov 2013 21:56:39 -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; 1 Nov 2013 21:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhq-0001WV-BB for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhq-0007Oz-9P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:38 +0000 Date: Fri, 01 Nov 2013 21:56:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove pointless null pointer check in xc_interface_open_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b0283689aede7d216d75088015abde950bfdbc1 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:43 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:30:23 2013 +0000 libxc: remove pointless null pointer check in xc_interface_open_common xch is guaranteed non-null here. Coverity-ID: 1055944 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_private.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index a260257..524862e 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -189,7 +189,7 @@ static struct xc_interface_core *xc_interface_open_common(xentoollog_logger *log err_put_iface: xc_osdep_put(&xch->osdep); err: - if (xch) xtl_logger_destroy(xch->error_handler_tofree); + xtl_logger_destroy(xch->error_handler_tofree); if (xch != &xch_buf) free(xch); 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 Nov 01 21:56:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56: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 1VcMht-0000nh-K5; Fri, 01 Nov 2013 21:56:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMht-0000nT-4Q for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:41 +0000 Received: from [85.158.137.68:28880] by server-6.bemta-3.messagelabs.com id 9F/EB-23777-89324725; Fri, 01 Nov 2013 21:56:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1383342998!1132538!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18997 invoked from network); 1 Nov 2013 21:56:39 -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; 1 Nov 2013 21:56:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMhq-0001WV-BB for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMhq-0007Oz-9P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:38 +0000 Date: Fri, 01 Nov 2013 21:56:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove pointless null pointer check in xc_interface_open_common X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b0283689aede7d216d75088015abde950bfdbc1 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:43 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:30:23 2013 +0000 libxc: remove pointless null pointer check in xc_interface_open_common xch is guaranteed non-null here. Coverity-ID: 1055944 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_private.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index a260257..524862e 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -189,7 +189,7 @@ static struct xc_interface_core *xc_interface_open_common(xentoollog_logger *log err_put_iface: xc_osdep_put(&xch->osdep); err: - if (xch) xtl_logger_destroy(xch->error_handler_tofree); + xtl_logger_destroy(xch->error_handler_tofree); if (xch != &xch_buf) free(xch); 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 Nov 01 21:56:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi3-0000pc-N5; Fri, 01 Nov 2013 21:56:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi2-0000pM-UY for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:51 +0000 Received: from [85.158.143.35:28174] by server-3.bemta-4.messagelabs.com id 3F/00-19578-2A324725; Fri, 01 Nov 2013 21:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383343008!442762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20743 invoked from network); 1 Nov 2013 21:56:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi0-0001Wd-HO for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMi0-0007PL-FZ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:48 +0000 Date: Fri, 01 Nov 2013 21:56:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check for xc_domain_get_guest_width failure in xc_domain_resume_any X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1fde2accefe3e1e47f7769261ef4626db2ce9e4 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:44 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:30:28 2013 +0000 libxc: check for xc_domain_get_guest_width failure in xc_domain_resume_any Coverity-ID: 1090351 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_resume.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index cb61650..50724f2 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -134,7 +134,11 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) return rc; } - xc_domain_get_guest_width(xch, domid, &dinfo->guest_width); + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) + { + PERROR("Could not get domain width"); + return rc; + } if ( dinfo->guest_width != sizeof(long) ) { ERROR("Cannot resume uncooperative cross-address-size guests"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:56:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:56:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi3-0000pc-N5; Fri, 01 Nov 2013 21:56:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi2-0000pM-UY for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:51 +0000 Received: from [85.158.143.35:28174] by server-3.bemta-4.messagelabs.com id 3F/00-19578-2A324725; Fri, 01 Nov 2013 21:56:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383343008!442762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20743 invoked from network); 1 Nov 2013 21:56:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:56:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMi0-0001Wd-HO for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMi0-0007PL-FZ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:48 +0000 Date: Fri, 01 Nov 2013 21:56:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check for xc_domain_get_guest_width failure in xc_domain_resume_any X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1fde2accefe3e1e47f7769261ef4626db2ce9e4 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:44 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:30:28 2013 +0000 libxc: check for xc_domain_get_guest_width failure in xc_domain_resume_any Coverity-ID: 1090351 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_resume.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index cb61650..50724f2 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -134,7 +134,11 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) return rc; } - xc_domain_get_guest_width(xch, domid, &dinfo->guest_width); + if ( xc_domain_get_guest_width(xch, domid, &dinfo->guest_width) != 0 ) + { + PERROR("Could not get domain width"); + return rc; + } if ( dinfo->guest_width != sizeof(long) ) { ERROR("Cannot resume uncooperative cross-address-size guests"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMiE-0000s0-Rz; Fri, 01 Nov 2013 21:57:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiD-0000ri-M8 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:02 +0000 Received: from [85.158.139.211:55714] by server-16.bemta-5.messagelabs.com id 45/C8-17144-CA324725; Fri, 01 Nov 2013 21:57:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383343018!1127286!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27680 invoked from network); 1 Nov 2013 21:56: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; 1 Nov 2013 21:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiA-0001Wo-O3 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiA-0007Ps-Lw for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:58 +0000 Date: Fri, 01 Nov 2013 21:56:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: initalize stdio loggers' progress_last_percent values to 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 492da27a3edd9064937007d5d373ffc4f9bc6ff5 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:46 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxc: initalize stdio loggers' progress_last_percent values to 0 ...otherwise they are undefined in the first progress callback. Coverity-ID: 1056055 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xtl_logger_stdio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index 2e73c86..aa5501f 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -172,6 +172,7 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; return XTL_NEW_LOGGER(stdiostream, newlogger); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMiE-0000s0-Rz; Fri, 01 Nov 2013 21:57:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiD-0000ri-M8 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:02 +0000 Received: from [85.158.139.211:55714] by server-16.bemta-5.messagelabs.com id 45/C8-17144-CA324725; Fri, 01 Nov 2013 21:57:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383343018!1127286!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27680 invoked from network); 1 Nov 2013 21:56: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; 1 Nov 2013 21:56:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiA-0001Wo-O3 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiA-0007Ps-Lw for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:56:58 +0000 Date: Fri, 01 Nov 2013 21:56:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: initalize stdio loggers' progress_last_percent values to 0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 492da27a3edd9064937007d5d373ffc4f9bc6ff5 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:46 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxc: initalize stdio loggers' progress_last_percent values to 0 ...otherwise they are undefined in the first progress callback. Coverity-ID: 1056055 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xtl_logger_stdio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c index 2e73c86..aa5501f 100644 --- a/tools/libxc/xtl_logger_stdio.c +++ b/tools/libxc/xtl_logger_stdio.c @@ -172,6 +172,7 @@ xentoollog_logger_stdiostream *xtl_createlogger_stdiostream if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; return XTL_NEW_LOGGER(stdiostream, newlogger); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57: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 1VcMiR-0000tx-VG; Fri, 01 Nov 2013 21:57:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiQ-0000tm-Mp for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:14 +0000 Received: from [85.158.139.211:56030] by server-12.bemta-5.messagelabs.com id B2/F5-15833-6B324725; Fri, 01 Nov 2013 21:57:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383343029!1136196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3745 invoked from network); 1 Nov 2013 21:57:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiK-0001XN-Ta for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiK-0007QU-S1 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:08 +0000 Date: Fri, 01 Nov 2013 21:57:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove null pointer checks in xc_pm_get_{c, p}xstat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6dea2f6ab0f3724bd6c23d7004913aef2fd8cf2 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:47 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxc: remove null pointer checks in xc_pm_get_{c, p}xstat We don't check for null pointers in similar functions, and it's silly to do so for these arguments here anyway; they should fail noisily if null is passed. While at it, remove pointless brackets. Coverity-ID: 1055938 Coverity-ID: 1055939 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_pm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index ea1e251..0da2d89 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -51,7 +51,7 @@ int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt) int max_px, ret; - if ( !pxpt || !(pxpt->trans_pt) || !(pxpt->pt) ) + if ( !pxpt->trans_pt || !pxpt->pt ) return -EINVAL; if ( (ret = xc_pm_get_max_px(xch, cpuid, &max_px)) != 0) @@ -128,7 +128,7 @@ int xc_pm_get_cxstat(xc_interface *xch, int cpuid, struct xc_cx_stat *cxpt) DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); int max_cx, ret; - if( !cxpt || !(cxpt->triggers) || !(cxpt->residencies) ) + if( !cxpt->triggers || !cxpt->residencies ) return -EINVAL; if ( (ret = xc_pm_get_max_cx(xch, cpuid, &max_cx)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57: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 1VcMiR-0000tx-VG; Fri, 01 Nov 2013 21:57:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiQ-0000tm-Mp for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:14 +0000 Received: from [85.158.139.211:56030] by server-12.bemta-5.messagelabs.com id B2/F5-15833-6B324725; Fri, 01 Nov 2013 21:57:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383343029!1136196!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3745 invoked from network); 1 Nov 2013 21:57:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiK-0001XN-Ta for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiK-0007QU-S1 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:08 +0000 Date: Fri, 01 Nov 2013 21:57:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove null pointer checks in xc_pm_get_{c, p}xstat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6dea2f6ab0f3724bd6c23d7004913aef2fd8cf2 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:47 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxc: remove null pointer checks in xc_pm_get_{c, p}xstat We don't check for null pointers in similar functions, and it's silly to do so for these arguments here anyway; they should fail noisily if null is passed. While at it, remove pointless brackets. Coverity-ID: 1055938 Coverity-ID: 1055939 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_pm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c index ea1e251..0da2d89 100644 --- a/tools/libxc/xc_pm.c +++ b/tools/libxc/xc_pm.c @@ -51,7 +51,7 @@ int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt) int max_px, ret; - if ( !pxpt || !(pxpt->trans_pt) || !(pxpt->pt) ) + if ( !pxpt->trans_pt || !pxpt->pt ) return -EINVAL; if ( (ret = xc_pm_get_max_px(xch, cpuid, &max_px)) != 0) @@ -128,7 +128,7 @@ int xc_pm_get_cxstat(xc_interface *xch, int cpuid, struct xc_cx_stat *cxpt) DECLARE_NAMED_HYPERCALL_BOUNCE(residencies, cxpt->residencies, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); int max_cx, ret; - if( !cxpt || !(cxpt->triggers) || !(cxpt->residencies) ) + if( !cxpt->triggers || !cxpt->residencies ) return -EINVAL; if ( (ret = xc_pm_get_max_cx(xch, cpuid, &max_cx)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMiZ-0000vI-1i; Fri, 01 Nov 2013 21: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 1VcMiY-0000v5-0C for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:22 +0000 Received: from [85.158.139.211:14323] by server-10.bemta-5.messagelabs.com id 3C/4F-28640-1C324725; Fri, 01 Nov 2013 21:57:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1383343039!1126908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20973 invoked from network); 1 Nov 2013 21:57:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiV-0001XR-3g for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiV-0007Qs-1Q for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:19 +0000 Date: Fri, 01 Nov 2013 21:57:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for transaction abortion failure in libxl_set_memory_target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bc3a84608de002853048ea1f36c73fbb1304154 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:48 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxl: check for transaction abortion failure in libxl_set_memory_target While at it, correct the error handling of libxl__fill_dom0_memory_info; at that point there is no transaction to end in any manner. Coverity-ID: 1055046 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0652010..bede011 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3676,12 +3676,11 @@ retry_transaction: target = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!target && !domid) { - xs_transaction_end(ctx->xsh, t, 1); + if (!xs_transaction_end(ctx->xsh, t, 1)) + goto out_no_transaction; rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb); - if (rc < 0) { - abort_transaction = 1; - goto out; - } + if (rc < 0) + goto out_no_transaction; goto retry_transaction; } else if (!target) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3786,6 +3785,7 @@ out: if (errno == EAGAIN) goto retry_transaction; +out_no_transaction: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMiZ-0000vI-1i; Fri, 01 Nov 2013 21: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 1VcMiY-0000v5-0C for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:22 +0000 Received: from [85.158.139.211:14323] by server-10.bemta-5.messagelabs.com id 3C/4F-28640-1C324725; Fri, 01 Nov 2013 21:57:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1383343039!1126908!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20973 invoked from network); 1 Nov 2013 21:57:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiV-0001XR-3g for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiV-0007Qs-1Q for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:19 +0000 Date: Fri, 01 Nov 2013 21:57:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for transaction abortion failure in libxl_set_memory_target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bc3a84608de002853048ea1f36c73fbb1304154 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:48 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxl: check for transaction abortion failure in libxl_set_memory_target While at it, correct the error handling of libxl__fill_dom0_memory_info; at that point there is no transaction to end in any manner. Coverity-ID: 1055046 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0652010..bede011 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3676,12 +3676,11 @@ retry_transaction: target = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!target && !domid) { - xs_transaction_end(ctx->xsh, t, 1); + if (!xs_transaction_end(ctx->xsh, t, 1)) + goto out_no_transaction; rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb); - if (rc < 0) { - abort_transaction = 1; - goto out; - } + if (rc < 0) + goto out_no_transaction; goto retry_transaction; } else if (!target) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3786,6 +3785,7 @@ out: if (errno == EAGAIN) goto retry_transaction; +out_no_transaction: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57: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 1VcMij-0000wk-4k; Fri, 01 Nov 2013 21:57:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMih-0000wU-O9 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:31 +0000 Received: from [193.109.254.147:49355] by server-16.bemta-14.messagelabs.com id 82/2F-03396-BC324725; Fri, 01 Nov 2013 21:57:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1383343049!157091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31728 invoked from network); 1 Nov 2013 21:57:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMif-0001Xb-Aw for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMif-0007RE-7h for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:29 +0000 Date: Fri, 01 Nov 2013 21:57:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correct file open success check in libxl__device_pci_reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b62556b575ef9b10449136b32282eb77a4ef7ac Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:51 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxl: correct file open success check in libxl__device_pci_reset It could, even if only in theory, be fd 0. Coverity-ID: 1055895 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index b9960bb..26ba3e6 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -967,7 +967,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV); fd = open(reset, O_WRONLY); - if (fd > 0) { + if (fd >= 0) { char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func); rc = write(fd, buf, strlen(buf)); if (rc < 0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57: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 1VcMij-0000wk-4k; Fri, 01 Nov 2013 21:57:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMih-0000wU-O9 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:31 +0000 Received: from [193.109.254.147:49355] by server-16.bemta-14.messagelabs.com id 82/2F-03396-BC324725; Fri, 01 Nov 2013 21:57:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1383343049!157091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31728 invoked from network); 1 Nov 2013 21:57:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMif-0001Xb-Aw for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMif-0007RE-7h for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:29 +0000 Date: Fri, 01 Nov 2013 21:57:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correct file open success check in libxl__device_pci_reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b62556b575ef9b10449136b32282eb77a4ef7ac Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:51 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:51 2013 +0000 libxl: correct file open success check in libxl__device_pci_reset It could, even if only in theory, be fd 0. Coverity-ID: 1055895 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index b9960bb..26ba3e6 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -967,7 +967,7 @@ static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned reset = libxl__sprintf(gc, "%s/pciback/do_flr", SYSFS_PCI_DEV); fd = open(reset, O_WRONLY); - if (fd > 0) { + if (fd >= 0) { char *buf = libxl__sprintf(gc, PCI_BDF, domain, bus, dev, func); rc = write(fd, buf, strlen(buf)); if (rc < 0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMit-0000yR-7s; Fri, 01 Nov 2013 21:57:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMis-0000yD-4B for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:42 +0000 Received: from [193.109.254.147:6652] by server-3.bemta-14.messagelabs.com id AC/06-03488-5D324725; Fri, 01 Nov 2013 21:57:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1383343059!173099!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17129 invoked from network); 1 Nov 2013 21:57:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMip-0001Xh-GJ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMip-0007SA-Ez for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:39 +0000 Date: Fri, 01 Nov 2013 21:57:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index c5e9426..0fe4428 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1339,7 +1339,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21: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 1VcMit-0000yR-7s; Fri, 01 Nov 2013 21:57:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMis-0000yD-4B for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:42 +0000 Received: from [193.109.254.147:6652] by server-3.bemta-14.messagelabs.com id AC/06-03488-5D324725; Fri, 01 Nov 2013 21:57:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1383343059!173099!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17129 invoked from network); 1 Nov 2013 21:57:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:57:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMip-0001Xh-GJ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMip-0007SA-Ez for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:39 +0000 Date: Fri, 01 Nov 2013 21:57:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index c5e9426..0fe4428 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1339,7 +1339,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:57:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMj3-00010F-BC; Fri, 01 Nov 2013 21: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 1VcMj2-0000zy-6G for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:52 +0000 Received: from [85.158.139.211:58449] by server-11.bemta-5.messagelabs.com id 0C/56-03454-FD324725; Fri, 01 Nov 2013 21:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1383343069!1120727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28727 invoked from network); 1 Nov 2013 21: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; 1 Nov 2013 21:57:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiz-0001Xn-Ko for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiz-0007SW-Jb for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:49 +0000 Date: Fri, 01 Nov 2013 21:57:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: only close fds which successfully opened in libxl__spawn_local_dm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ffc14ea225096e2970a86c13bec6c7fc2df822b Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:54 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 libxl: only close fds which successfully opened in libxl__spawn_local_dm Coverity-ID: 1055565 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index ef29d0b..24eebda 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1259,8 +1259,8 @@ retry_transaction: rc = 0; out_close: - close(null); - close(logfile_w); + if (null != -1) close(null); + if (logfile_w != -1) close(logfile_w); out: if (rc) device_model_spawn_outcome(egc, dmss, 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 Nov 01 21:57:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:57:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMj3-00010F-BC; Fri, 01 Nov 2013 21: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 1VcMj2-0000zy-6G for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:52 +0000 Received: from [85.158.139.211:58449] by server-11.bemta-5.messagelabs.com id 0C/56-03454-FD324725; Fri, 01 Nov 2013 21:57:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1383343069!1120727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28727 invoked from network); 1 Nov 2013 21: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; 1 Nov 2013 21:57:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMiz-0001Xn-Ko for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMiz-0007SW-Jb for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:49 +0000 Date: Fri, 01 Nov 2013 21:57:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: only close fds which successfully opened in libxl__spawn_local_dm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ffc14ea225096e2970a86c13bec6c7fc2df822b Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:54 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 libxl: only close fds which successfully opened in libxl__spawn_local_dm Coverity-ID: 1055565 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index ef29d0b..24eebda 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1259,8 +1259,8 @@ retry_transaction: rc = 0; out_close: - close(null); - close(logfile_w); + if (null != -1) close(null); + if (logfile_w != -1) close(logfile_w); out: if (rc) device_model_spawn_outcome(egc, dmss, 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 Nov 01 21:58:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjG-00012I-E5; Fri, 01 Nov 2013 21:58:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjE-000126-T3 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:05 +0000 Received: from [85.158.137.68:30619] by server-13.bemta-3.messagelabs.com id 46/3F-02689-CE324725; Fri, 01 Nov 2013 21:58:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1383343080!1140081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22115 invoked from network); 1 Nov 2013 21:58:01 -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; 1 Nov 2013 21:58:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMj9-0001Xw-UN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMj9-0007Ss-PY for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:59 +0000 Date: Fri, 01 Nov 2013 21:57:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: libxl_list_vm returns a pointer, not a handle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 235f16a15dd2e3dc7f422e6505260e685fad7a3a Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:55 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: libxl_list_vm returns a pointer, not a handle Coverity-ID: 1054978 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index fddaa80..43d1519 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3247,7 +3247,7 @@ static void list_vm(void) info = libxl_list_vm(ctx, &nb_vm); - if (info < 0) { + if (!info) { fprintf(stderr, "libxl_domain_infolist failed.\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 Nov 01 21:58:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjG-00012I-E5; Fri, 01 Nov 2013 21:58:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjE-000126-T3 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:05 +0000 Received: from [85.158.137.68:30619] by server-13.bemta-3.messagelabs.com id 46/3F-02689-CE324725; Fri, 01 Nov 2013 21:58:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1383343080!1140081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22115 invoked from network); 1 Nov 2013 21:58:01 -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; 1 Nov 2013 21:58:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMj9-0001Xw-UN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMj9-0007Ss-PY for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:57:59 +0000 Date: Fri, 01 Nov 2013 21:57:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: libxl_list_vm returns a pointer, not a handle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 235f16a15dd2e3dc7f422e6505260e685fad7a3a Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:55 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: libxl_list_vm returns a pointer, not a handle Coverity-ID: 1054978 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index fddaa80..43d1519 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3247,7 +3247,7 @@ static void list_vm(void) info = libxl_list_vm(ctx, &nb_vm); - if (info < 0) { + if (!info) { fprintf(stderr, "libxl_domain_infolist failed.\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 Nov 01 21:58:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjO-00013V-Ga; Fri, 01 Nov 2013 21:58:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjM-00013C-MN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:12 +0000 Received: from [193.109.254.147:11633] by server-16.bemta-14.messagelabs.com id 38/6F-03396-4F324725; Fri, 01 Nov 2013 21:58:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1383343090!155895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4819 invoked from network); 1 Nov 2013 21:58:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:58:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjK-0001YV-7u for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjK-0007TQ-4c for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:10 +0000 Date: Fri, 01 Nov 2013 21:58:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: check for restore file open failure in create_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77d8f863729f3b2d0eded2be5a230174ed4baff9 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:56 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: check for restore file open failure in create_domain ...otherwise you get a less helpful error message. Coverity-ID: 1055569 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 43d1519..a935a18 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1919,6 +1919,10 @@ static uint32_t create_domain(struct domain_create *dom_info) } else { restore_source = restore_file; restore_fd = open(restore_file, O_RDONLY); + if (restore_fd == -1) { + fprintf(stderr, "Can't open restore file: %s\n", strerror(errno)); + return ERROR_INVAL; + } rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); if (rc) 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 Nov 01 21:58:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjO-00013V-Ga; Fri, 01 Nov 2013 21:58:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjM-00013C-MN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:12 +0000 Received: from [193.109.254.147:11633] by server-16.bemta-14.messagelabs.com id 38/6F-03396-4F324725; Fri, 01 Nov 2013 21:58:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1383343090!155895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4819 invoked from network); 1 Nov 2013 21:58:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:58:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjK-0001YV-7u for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjK-0007TQ-4c for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:10 +0000 Date: Fri, 01 Nov 2013 21:58:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: check for restore file open failure in create_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77d8f863729f3b2d0eded2be5a230174ed4baff9 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:56 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: check for restore file open failure in create_domain ...otherwise you get a less helpful error message. Coverity-ID: 1055569 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 43d1519..a935a18 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1919,6 +1919,10 @@ static uint32_t create_domain(struct domain_create *dom_info) } else { restore_source = restore_file; restore_fd = open(restore_file, O_RDONLY); + if (restore_fd == -1) { + fprintf(stderr, "Can't open restore file: %s\n", strerror(errno)); + return ERROR_INVAL; + } rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); if (rc) 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 Nov 01 21:58:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMjY-00016P-JD; Fri, 01 Nov 2013 21: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 1VcMjW-00015u-Su for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:22 +0000 Received: from [193.109.254.147:54823] by server-13.bemta-14.messagelabs.com id 28/49-17468-EF324725; Fri, 01 Nov 2013 21:58:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383343100!157939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9853 invoked from network); 1 Nov 2013 21:58:21 -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; 1 Nov 2013 21:58:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjU-0001Yd-EL for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjU-0007Tm-CN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:20 +0000 Date: Fri, 01 Nov 2013 21:58:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove needless infinite-loop construct in create_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50b9bdf83b35242f3c5170ac823791f3102bff1f Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:57 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: remove needless infinite-loop construct in create_domain Use a simple if condition instead. Coverity-ID: 1056150 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a935a18..d8f9aba 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2144,9 +2144,8 @@ start: child1 = xl_fork(child_waitdaemon); if (child1) { - for (;;) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child == child1) break; + got_child = xl_waitpid(child_waitdaemon, &status, 0); + if (got_child != child1) { assert(got_child == -1); perror("failed to wait for daemonizing child"); ret = ERROR_FAIL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMjY-00016P-JD; Fri, 01 Nov 2013 21: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 1VcMjW-00015u-Su for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:22 +0000 Received: from [193.109.254.147:54823] by server-13.bemta-14.messagelabs.com id 28/49-17468-EF324725; Fri, 01 Nov 2013 21:58:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383343100!157939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9853 invoked from network); 1 Nov 2013 21:58:21 -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; 1 Nov 2013 21:58:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjU-0001Yd-EL for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjU-0007Tm-CN for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:20 +0000 Date: Fri, 01 Nov 2013 21:58:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove needless infinite-loop construct in create_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50b9bdf83b35242f3c5170ac823791f3102bff1f Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:57 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: remove needless infinite-loop construct in create_domain Use a simple if condition instead. Coverity-ID: 1056150 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a935a18..d8f9aba 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2144,9 +2144,8 @@ start: child1 = xl_fork(child_waitdaemon); if (child1) { - for (;;) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child == child1) break; + got_child = xl_waitpid(child_waitdaemon, &status, 0); + if (got_child != child1) { assert(got_child == -1); perror("failed to wait for daemonizing child"); ret = ERROR_FAIL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjj-00018U-OQ; Fri, 01 Nov 2013 21:58:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjh-000187-Mb for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:33 +0000 Received: from [85.158.137.68:42465] by server-17.bemta-3.messagelabs.com id 49/A9-12030-80424725; Fri, 01 Nov 2013 21:58:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1383343110!1132258!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15623 invoked from network); 1 Nov 2013 21:58:32 -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; 1 Nov 2013 21:58:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMje-0001Yl-Ms for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMje-0007UB-JJ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:30 +0000 Date: Fri, 01 Nov 2013 21:58:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: correct references to long-removed function in error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d801e25c94be89e3ce7baa9573c860596c44db0 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:58 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: correct references to long-removed function in error messages Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d8f9aba..40feb7d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3251,7 +3251,7 @@ static void list_vm(void) info = libxl_list_vm(ctx, &nb_vm); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_vm failed.\n"); exit(1); } printf("UUID ID name\n"); @@ -4147,7 +4147,7 @@ int main_list(int argc, char **argv) if (optind >= argc) { info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } info_free = info; @@ -4856,7 +4856,7 @@ int main_sharing(int argc, char **argv) if (optind >= argc) { info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } info_free = info; @@ -5070,7 +5070,7 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } poolinfo = libxl_list_cpupool(ctx, &n_pools); @@ -6025,7 +6025,7 @@ int main_claims(int argc, char **argv) info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjj-00018U-OQ; Fri, 01 Nov 2013 21:58:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjh-000187-Mb for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:33 +0000 Received: from [85.158.137.68:42465] by server-17.bemta-3.messagelabs.com id 49/A9-12030-80424725; Fri, 01 Nov 2013 21:58:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1383343110!1132258!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15623 invoked from network); 1 Nov 2013 21:58:32 -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; 1 Nov 2013 21:58:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMje-0001Yl-Ms for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMje-0007UB-JJ for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:30 +0000 Date: Fri, 01 Nov 2013 21:58:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: correct references to long-removed function in error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d801e25c94be89e3ce7baa9573c860596c44db0 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:58 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:52 2013 +0000 xl: correct references to long-removed function in error messages Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d8f9aba..40feb7d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3251,7 +3251,7 @@ static void list_vm(void) info = libxl_list_vm(ctx, &nb_vm); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_vm failed.\n"); exit(1); } printf("UUID ID name\n"); @@ -4147,7 +4147,7 @@ int main_list(int argc, char **argv) if (optind >= argc) { info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } info_free = info; @@ -4856,7 +4856,7 @@ int main_sharing(int argc, char **argv) if (optind >= argc) { info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } info_free = info; @@ -5070,7 +5070,7 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } poolinfo = libxl_list_cpupool(ctx, &n_pools); @@ -6025,7 +6025,7 @@ int main_claims(int argc, char **argv) info = libxl_list_domain(ctx, &nb_domain); if (!info) { - fprintf(stderr, "libxl_domain_infolist failed.\n"); + fprintf(stderr, "libxl_list_domain failed.\n"); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMjs-0001AB-SB; Fri, 01 Nov 2013 21:58:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjr-00019r-JM for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:43 +0000 Received: from [85.158.143.35:31420] by server-2.bemta-4.messagelabs.com id B0/BA-06473-21424725; Fri, 01 Nov 2013 21:58:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1383343121!434380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13031 invoked from network); 1 Nov 2013 21:58:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:58:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjo-0001Yr-U2 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjo-0007VL-RG for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:40 +0000 Date: Fri, 01 Nov 2013 21:58:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: make `xl vm-list` example use verbatim formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93700cb6b403ca07e55468fbf258fad07c9e99ea Author: Matthew Daley AuthorDate: Thu Oct 31 16:02:37 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 docs: make `xl vm-list` example use verbatim formatting Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 5975d7b..e7b9de2 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -639,9 +639,9 @@ B An example format for the list is as follows: -UUID ID name -59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win -50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux + UUID ID name + 59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win + 50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux =item B [I] I -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMjs-0001AB-SB; Fri, 01 Nov 2013 21:58:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjr-00019r-JM for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:43 +0000 Received: from [85.158.143.35:31420] by server-2.bemta-4.messagelabs.com id B0/BA-06473-21424725; Fri, 01 Nov 2013 21:58:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1383343121!434380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13031 invoked from network); 1 Nov 2013 21:58:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:58:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjo-0001Yr-U2 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjo-0007VL-RG for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:40 +0000 Date: Fri, 01 Nov 2013 21:58:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: make `xl vm-list` example use verbatim formatting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93700cb6b403ca07e55468fbf258fad07c9e99ea Author: Matthew Daley AuthorDate: Thu Oct 31 16:02:37 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 docs: make `xl vm-list` example use verbatim formatting Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 5975d7b..e7b9de2 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -639,9 +639,9 @@ B An example format for the list is as follows: -UUID ID name -59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win -50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux + UUID ID name + 59e1cf6c-6ab9-4879-90e7-adc8d1c63bf5 2 win + 50bc8f75-81d0-4d53-b2e6-95cb44e2682e 3 linux =item B [I] I -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMk2-0001Bt-VS; Fri, 01 Nov 2013 21:58:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMk1-0001Bi-Kd for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:53 +0000 Received: from [193.109.254.147:12479] by server-9.bemta-14.messagelabs.com id 99/FB-08751-C1424725; Fri, 01 Nov 2013 21:58:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383343131!172758!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2898 invoked from network); 1 Nov 2013 21:58:52 -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; 1 Nov 2013 21:58:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjz-0001Yx-3x for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjz-0007Vh-1P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:51 +0000 Date: Fri, 01 Nov 2013 21:58:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: handle libxc evtchn failures properly in init 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 f2f06a2f1b42d27dccf08d8ff887c96608b8c6b7 Author: Matthew Daley AuthorDate: Thu Oct 31 16:41:32 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 libvchan: handle libxc evtchn failures properly in init functions The reasoning behind this patch is that ctrl->event_port is a uint32_t (ie. unsigned), so the current checks on it for negative error results, non-negative port presence etc. are incorrect. Fix by using evtchn_port_or_error_t in the init functions instead, adjusting the error handling, and removing the now-unnecessary check from the close function. Coverity-ID: 1055609 Coverity-ID: 1055610 Coverity-ID: 1055611 Signed-off-by: Matthew Daley Reviewed-by: Daniel De Graaf Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libvchan/init.c | 47 +++++++++++++++++++++++++++++++++++++++-------- tools/libvchan/io.c | 2 +- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index 0c7cff6..c080a1c 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -215,15 +215,30 @@ static int init_gnt_cli(struct libxenvchan *ctrl, int domain, uint32_t ring_ref) static int init_evt_srv(struct libxenvchan *ctrl, int domain, xentoollog_logger *logger) { + evtchn_port_or_error_t port; + ctrl->event = xc_evtchn_open(logger, 0); if (!ctrl->event) return -1; - ctrl->event_port = xc_evtchn_bind_unbound_port(ctrl->event, domain); - if (ctrl->event_port < 0) - return -1; + + port = xc_evtchn_bind_unbound_port(ctrl->event, domain); + if (port < 0) + goto fail; + ctrl->event_port = port; + if (xc_evtchn_unmask(ctrl->event, ctrl->event_port)) - return -1; + goto fail; + return 0; + +fail: + if (port >= 0) + xc_evtchn_unbind(ctrl->event, port); + + xc_evtchn_close(ctrl->event); + ctrl->event = NULL; + + return -1; } static int init_xs_srv(struct libxenvchan *ctrl, int domain, const char* xs_base, int ring_ref) @@ -330,15 +345,31 @@ out: static int init_evt_cli(struct libxenvchan *ctrl, int domain, xentoollog_logger *logger) { + evtchn_port_or_error_t port; + ctrl->event = xc_evtchn_open(logger, 0); if (!ctrl->event) return -1; - ctrl->event_port = xc_evtchn_bind_interdomain(ctrl->event, + + port = xc_evtchn_bind_interdomain(ctrl->event, domain, ctrl->event_port); - if (ctrl->event_port < 0) - return -1; - xc_evtchn_unmask(ctrl->event, ctrl->event_port); + if (port < 0) + goto fail; + ctrl->event_port = port; + + if (xc_evtchn_unmask(ctrl->event, ctrl->event_port)) + goto fail; + return 0; + +fail: + if (port >= 0) + xc_evtchn_unbind(ctrl->event, port); + + xc_evtchn_close(ctrl->event); + ctrl->event = NULL; + + return -1; } diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..2383364 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -337,7 +337,7 @@ void libxenvchan_close(struct libxenvchan *ctrl) } } if (ctrl->event) { - if (ctrl->event_port >= 0 && ctrl->ring) + if (ctrl->ring) xc_evtchn_notify(ctrl->event, ctrl->event_port); xc_evtchn_close(ctrl->event); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:58:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:58: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 1VcMk2-0001Bt-VS; Fri, 01 Nov 2013 21:58:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMk1-0001Bi-Kd for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:53 +0000 Received: from [193.109.254.147:12479] by server-9.bemta-14.messagelabs.com id 99/FB-08751-C1424725; Fri, 01 Nov 2013 21:58:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383343131!172758!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2898 invoked from network); 1 Nov 2013 21:58:52 -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; 1 Nov 2013 21:58:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMjz-0001Yx-3x for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMjz-0007Vh-1P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:58:51 +0000 Date: Fri, 01 Nov 2013 21:58:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: handle libxc evtchn failures properly in init 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 f2f06a2f1b42d27dccf08d8ff887c96608b8c6b7 Author: Matthew Daley AuthorDate: Thu Oct 31 16:41:32 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 libvchan: handle libxc evtchn failures properly in init functions The reasoning behind this patch is that ctrl->event_port is a uint32_t (ie. unsigned), so the current checks on it for negative error results, non-negative port presence etc. are incorrect. Fix by using evtchn_port_or_error_t in the init functions instead, adjusting the error handling, and removing the now-unnecessary check from the close function. Coverity-ID: 1055609 Coverity-ID: 1055610 Coverity-ID: 1055611 Signed-off-by: Matthew Daley Reviewed-by: Daniel De Graaf Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libvchan/init.c | 47 +++++++++++++++++++++++++++++++++++++++-------- tools/libvchan/io.c | 2 +- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index 0c7cff6..c080a1c 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -215,15 +215,30 @@ static int init_gnt_cli(struct libxenvchan *ctrl, int domain, uint32_t ring_ref) static int init_evt_srv(struct libxenvchan *ctrl, int domain, xentoollog_logger *logger) { + evtchn_port_or_error_t port; + ctrl->event = xc_evtchn_open(logger, 0); if (!ctrl->event) return -1; - ctrl->event_port = xc_evtchn_bind_unbound_port(ctrl->event, domain); - if (ctrl->event_port < 0) - return -1; + + port = xc_evtchn_bind_unbound_port(ctrl->event, domain); + if (port < 0) + goto fail; + ctrl->event_port = port; + if (xc_evtchn_unmask(ctrl->event, ctrl->event_port)) - return -1; + goto fail; + return 0; + +fail: + if (port >= 0) + xc_evtchn_unbind(ctrl->event, port); + + xc_evtchn_close(ctrl->event); + ctrl->event = NULL; + + return -1; } static int init_xs_srv(struct libxenvchan *ctrl, int domain, const char* xs_base, int ring_ref) @@ -330,15 +345,31 @@ out: static int init_evt_cli(struct libxenvchan *ctrl, int domain, xentoollog_logger *logger) { + evtchn_port_or_error_t port; + ctrl->event = xc_evtchn_open(logger, 0); if (!ctrl->event) return -1; - ctrl->event_port = xc_evtchn_bind_interdomain(ctrl->event, + + port = xc_evtchn_bind_interdomain(ctrl->event, domain, ctrl->event_port); - if (ctrl->event_port < 0) - return -1; - xc_evtchn_unmask(ctrl->event, ctrl->event_port); + if (port < 0) + goto fail; + ctrl->event_port = port; + + if (xc_evtchn_unmask(ctrl->event, ctrl->event_port)) + goto fail; + return 0; + +fail: + if (port >= 0) + xc_evtchn_unbind(ctrl->event, port); + + xc_evtchn_close(ctrl->event); + ctrl->event = NULL; + + return -1; } diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..2383364 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -337,7 +337,7 @@ void libxenvchan_close(struct libxenvchan *ctrl) } } if (ctrl->event) { - if (ctrl->event_port >= 0 && ctrl->ring) + if (ctrl->ring) xc_evtchn_notify(ctrl->event, ctrl->event_port); xc_evtchn_close(ctrl->event); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMkF-0001Dl-2B; Fri, 01 Nov 2013 21:59:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkC-0001DK-Bt for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:06 +0000 Received: from [85.158.139.211:20560] by server-10.bemta-5.messagelabs.com id 74/FF-28640-72424725; Fri, 01 Nov 2013 21:59:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1383343141!1120400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15613 invoked from network); 1 Nov 2013 21:59:02 -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; 1 Nov 2013 21:59:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMk9-0001Z6-Cr for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMk9-0007W5-A9 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:01 +0000 Date: Fri, 01 Nov 2013 21:59:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctx: only alloc symbol if we are inserting it into the symbol table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33d3716dc0fd3a2db96e0504f51181b6a58f2fbc Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:02 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xenctx: only alloc symbol if we are inserting it into the symbol table ...otherwise it's pointless, and will leak. Coverity-ID: 1055936 Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 4b774af..a86d512 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -167,6 +167,7 @@ static void read_symbol_table(const char *symtab) char *p; struct symbol *symbol; FILE *f; + guest_word_t address; f = fopen(symtab, "r"); if(f == NULL) { @@ -178,10 +179,8 @@ static void read_symbol_table(const char *symtab) if(fgets(line,256,f)==NULL) break; - symbol = malloc(sizeof(*symbol)); - /* need more checks for syntax here... */ - symbol->address = strtoull(line, &p, 16); + address = strtoull(line, &p, 16); if (!isspace((uint8_t)*p++)) continue; type = *p++; @@ -196,7 +195,6 @@ static void read_symbol_table(const char *symtab) */ if (p[strlen(p)-1] == '\n') p[strlen(p)-1] = '\0'; - symbol->name = strdup(p); switch (type) { case 'A': /* global absolute */ @@ -207,20 +205,31 @@ static void read_symbol_table(const char *symtab) case 'w': /* undefined weak function */ continue; default: + symbol = malloc(sizeof(*symbol)); + if (symbol == NULL) + return; + + symbol->address = address; + symbol->name = strdup(p); + if (symbol->name == NULL) { + free(symbol); + return; + } + insert_symbol(symbol); break; } - if (strcmp(symbol->name, "_stext") == 0) - kernel_stext = symbol->address; - else if (strcmp(symbol->name, "_etext") == 0) - kernel_etext = symbol->address; - else if (strcmp(symbol->name, "_sinittext") == 0) - kernel_sinittext = symbol->address; - else if (strcmp(symbol->name, "_einittext") == 0) - kernel_einittext = symbol->address; - else if (strcmp(symbol->name, "hypercall_page") == 0) - kernel_hypercallpage = symbol->address; + if (strcmp(p, "_stext") == 0) + kernel_stext = address; + else if (strcmp(p, "_etext") == 0) + kernel_etext = address; + else if (strcmp(p, "_sinittext") == 0) + kernel_sinittext = address; + else if (strcmp(p, "_einittext") == 0) + kernel_einittext = address; + else if (strcmp(p, "hypercall_page") == 0) + kernel_hypercallpage = address; } fclose(f); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMkF-0001Dl-2B; Fri, 01 Nov 2013 21:59:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkC-0001DK-Bt for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:06 +0000 Received: from [85.158.139.211:20560] by server-10.bemta-5.messagelabs.com id 74/FF-28640-72424725; Fri, 01 Nov 2013 21:59:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1383343141!1120400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15613 invoked from network); 1 Nov 2013 21:59:02 -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; 1 Nov 2013 21:59:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMk9-0001Z6-Cr for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMk9-0007W5-A9 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:01 +0000 Date: Fri, 01 Nov 2013 21:59:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctx: only alloc symbol if we are inserting it into the symbol table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33d3716dc0fd3a2db96e0504f51181b6a58f2fbc Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:02 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xenctx: only alloc symbol if we are inserting it into the symbol table ...otherwise it's pointless, and will leak. Coverity-ID: 1055936 Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 4b774af..a86d512 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -167,6 +167,7 @@ static void read_symbol_table(const char *symtab) char *p; struct symbol *symbol; FILE *f; + guest_word_t address; f = fopen(symtab, "r"); if(f == NULL) { @@ -178,10 +179,8 @@ static void read_symbol_table(const char *symtab) if(fgets(line,256,f)==NULL) break; - symbol = malloc(sizeof(*symbol)); - /* need more checks for syntax here... */ - symbol->address = strtoull(line, &p, 16); + address = strtoull(line, &p, 16); if (!isspace((uint8_t)*p++)) continue; type = *p++; @@ -196,7 +195,6 @@ static void read_symbol_table(const char *symtab) */ if (p[strlen(p)-1] == '\n') p[strlen(p)-1] = '\0'; - symbol->name = strdup(p); switch (type) { case 'A': /* global absolute */ @@ -207,20 +205,31 @@ static void read_symbol_table(const char *symtab) case 'w': /* undefined weak function */ continue; default: + symbol = malloc(sizeof(*symbol)); + if (symbol == NULL) + return; + + symbol->address = address; + symbol->name = strdup(p); + if (symbol->name == NULL) { + free(symbol); + return; + } + insert_symbol(symbol); break; } - if (strcmp(symbol->name, "_stext") == 0) - kernel_stext = symbol->address; - else if (strcmp(symbol->name, "_etext") == 0) - kernel_etext = symbol->address; - else if (strcmp(symbol->name, "_sinittext") == 0) - kernel_sinittext = symbol->address; - else if (strcmp(symbol->name, "_einittext") == 0) - kernel_einittext = symbol->address; - else if (strcmp(symbol->name, "hypercall_page") == 0) - kernel_hypercallpage = symbol->address; + if (strcmp(p, "_stext") == 0) + kernel_stext = address; + else if (strcmp(p, "_etext") == 0) + kernel_etext = address; + else if (strcmp(p, "_sinittext") == 0) + kernel_sinittext = address; + else if (strcmp(p, "_einittext") == 0) + kernel_einittext = address; + else if (strcmp(p, "hypercall_page") == 0) + kernel_hypercallpage = address; } fclose(f); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkQ-0001FV-5a; Fri, 01 Nov 2013 21:59:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkP-0001F4-Ds for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:17 +0000 Received: from [85.158.139.211:62950] by server-8.bemta-5.messagelabs.com id 92/08-32206-13424725; Fri, 01 Nov 2013 21:59:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1383343151!1124340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6026 invoked from network); 1 Nov 2013 21:59:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkJ-0001Zf-IT for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMkJ-0007Wj-HA for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:11 +0000 Date: Fri, 01 Nov 2013 21:59:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctx: correct error check when opening libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1924ed33aca6b162416a399902e7f687dec14038 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:03 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xenctx: correct error check when opening libxc Coverity-ID: 1054979 Coverity-ID: 1055238 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index a86d512..c4b7912 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -897,7 +897,7 @@ int main(int argc, char **argv) read_symbol_table(symbol_table); xenctx.xc_handle = xc_interface_open(0,0,0); /* for accessing control interface */ - if (xenctx.xc_handle < 0) { + if (xenctx.xc_handle == NULL) { perror("xc_interface_open"); 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 Nov 01 21:59:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkQ-0001FV-5a; Fri, 01 Nov 2013 21:59:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkP-0001F4-Ds for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:17 +0000 Received: from [85.158.139.211:62950] by server-8.bemta-5.messagelabs.com id 92/08-32206-13424725; Fri, 01 Nov 2013 21:59:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1383343151!1124340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6026 invoked from network); 1 Nov 2013 21:59:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkJ-0001Zf-IT for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMkJ-0007Wj-HA for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:11 +0000 Date: Fri, 01 Nov 2013 21:59:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenctx: correct error check when opening libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1924ed33aca6b162416a399902e7f687dec14038 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:03 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xenctx: correct error check when opening libxc Coverity-ID: 1054979 Coverity-ID: 1055238 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index a86d512..c4b7912 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -897,7 +897,7 @@ int main(int argc, char **argv) read_symbol_table(symbol_table); xenctx.xc_handle = xc_interface_open(0,0,0); /* for accessing control interface */ - if (xenctx.xc_handle < 0) { + if (xenctx.xc_handle == NULL) { perror("xc_interface_open"); 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 Nov 01 21:59:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMkZ-0001H9-8T; Fri, 01 Nov 2013 21:59:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkY-0001Gv-Kf for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:26 +0000 Received: from [85.158.137.68:35991] by server-4.bemta-3.messagelabs.com id 57/5F-08123-D3424725; Fri, 01 Nov 2013 21:59:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1383343164!1130165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21497 invoked from network); 1 Nov 2013 21:59:25 -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; 1 Nov 2013 21:59:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkT-0001Zo-OC for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMkT-0007X8-MC for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:21 +0000 Date: Fri, 01 Nov 2013 21:59:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: don't try to close null libxc handle in disable_tbufs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7343db9a771e0026c1f6acc78521025c589ee7d3 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:04 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xentrace: don't try to close null libxc handle in disable_tbufs While at it, simplify the function. Coverity-ID: 1055316 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xentrace.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 622bac8..504763d 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -425,22 +425,18 @@ fail: static void disable_tbufs(void) { xc_interface *xc_handle = xc_interface_open(0,0,0); - int ret; if ( !xc_handle ) { perror("Couldn't open xc handle to disable tbufs."); - goto out; + return; } - ret = xc_tbuf_disable(xc_handle); - - if ( ret != 0 ) + if ( xc_tbuf_disable(xc_handle) != 0 ) { perror("Couldn't disable trace buffers"); } -out: xc_interface_close(xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMkZ-0001H9-8T; Fri, 01 Nov 2013 21:59:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkY-0001Gv-Kf for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:26 +0000 Received: from [85.158.137.68:35991] by server-4.bemta-3.messagelabs.com id 57/5F-08123-D3424725; Fri, 01 Nov 2013 21:59:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1383343164!1130165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21497 invoked from network); 1 Nov 2013 21:59:25 -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; 1 Nov 2013 21:59:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkT-0001Zo-OC for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMkT-0007X8-MC for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:21 +0000 Date: Fri, 01 Nov 2013 21:59:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: don't try to close null libxc handle in disable_tbufs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7343db9a771e0026c1f6acc78521025c589ee7d3 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:04 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xentrace: don't try to close null libxc handle in disable_tbufs While at it, simplify the function. Coverity-ID: 1055316 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xentrace.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 622bac8..504763d 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -425,22 +425,18 @@ fail: static void disable_tbufs(void) { xc_interface *xc_handle = xc_interface_open(0,0,0); - int ret; if ( !xc_handle ) { perror("Couldn't open xc handle to disable tbufs."); - goto out; + return; } - ret = xc_tbuf_disable(xc_handle); - - if ( ret != 0 ) + if ( xc_tbuf_disable(xc_handle) != 0 ) { perror("Couldn't disable trace buffers"); } -out: xc_interface_close(xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkh-0001IX-BW; Fri, 01 Nov 2013 21:59:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkg-0001IN-GV for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:34 +0000 Received: from [85.158.143.35:34705] by server-1.bemta-4.messagelabs.com id C0/36-17304-54424725; Fri, 01 Nov 2013 21:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1383343172!432678!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10226 invoked from network); 1 Nov 2013 21:59:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMke-0001Zw-4w for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMke-0007Xb-0Z for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:32 +0000 Date: Fri, 01 Nov 2013 21:59:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: undeadify invalid option argument 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 96be5eab5d58e209f24c02dd1cdc54e56d7e0803 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:05 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xentrace: undeadify invalid option argument handling Apparently it's always been like this. Coverity-ID: 1056153 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xentrace.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 504763d..8a38e32 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -858,10 +858,11 @@ long sargtol(const char *restrict arg, int base) return val; + invalid: - return 0; fprintf(stderr, "Invalid option argument: %s\n\n", arg); usage(); + return 0; /* not actually reached */ } /* convert the argument string pointed to by arg to a long int representation */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkh-0001IX-BW; Fri, 01 Nov 2013 21:59:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkg-0001IN-GV for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:34 +0000 Received: from [85.158.143.35:34705] by server-1.bemta-4.messagelabs.com id C0/36-17304-54424725; Fri, 01 Nov 2013 21:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1383343172!432678!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10226 invoked from network); 1 Nov 2013 21:59:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMke-0001Zw-4w for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMke-0007Xb-0Z for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:32 +0000 Date: Fri, 01 Nov 2013 21:59:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: undeadify invalid option argument 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 96be5eab5d58e209f24c02dd1cdc54e56d7e0803 Author: Matthew Daley AuthorDate: Wed Oct 30 20:52:05 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 21:55:53 2013 +0000 xentrace: undeadify invalid option argument handling Apparently it's always been like this. Coverity-ID: 1056153 Signed-off-by: Matthew Daley Reviewed-by: George Dunlap Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/xentrace/xentrace.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 504763d..8a38e32 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -858,10 +858,11 @@ long sargtol(const char *restrict arg, int base) return val; + invalid: - return 0; fprintf(stderr, "Invalid option argument: %s\n\n", arg); usage(); + return 0; /* not actually reached */ } /* convert the argument string pointed to by arg to a long int representation */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 01 21:59:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMks-0001KL-EQ; Fri, 01 Nov 2013 21:59:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkr-0001K9-0P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:45 +0000 Received: from [85.158.137.68:36492] by server-2.bemta-3.messagelabs.com id AF/EB-29572-05424725; Fri, 01 Nov 2013 21:59:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1383343182!1144367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11555 invoked from network); 1 Nov 2013 21:59:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMko-0001a2-C0 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMko-0007YX-9b for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:42 +0000 Date: Fri, 01 Nov 2013 21:59:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't read uninitialized size value in xc_read_image X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf891bcd1841bc61d0726d11988b8c9bf8d6757 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:42 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 22:13:52 2013 +0000 libxc: don't read uninitialized size value in xc_read_image This error case can only be triggered by gzread returning 0 (and having not read anything), so move it there. Coverity-ID: 1056076 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xg_private.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c index 8fa068e..a914068 100644 --- a/tools/libxc/xg_private.c +++ b/tools/libxc/xg_private.c @@ -71,6 +71,12 @@ char *xc_read_image(xc_interface *xch, image = NULL; goto out; case 0: /* EOF */ + if ( *size == 0 ) + { + PERROR("Could not read kernel image"); + free(image); + image = NULL; + } goto out; default: *size += bytes; @@ -80,13 +86,7 @@ char *xc_read_image(xc_interface *xch, #undef CHUNK out: - if ( *size == 0 ) - { - PERROR("Could not read kernel image"); - free(image); - image = NULL; - } - else if ( image ) + if ( image ) { /* Shrink allocation to fit image. */ tmp = realloc(image, *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 Nov 01 21:59:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Nov 2013 21:59: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 1VcMks-0001KL-EQ; Fri, 01 Nov 2013 21:59:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMkr-0001K9-0P for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:45 +0000 Received: from [85.158.137.68:36492] by server-2.bemta-3.messagelabs.com id AF/EB-29572-05424725; Fri, 01 Nov 2013 21:59:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1383343182!1144367!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11555 invoked from network); 1 Nov 2013 21:59:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2013 21:59:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcMko-0001a2-C0 for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcMko-0007YX-9b for xen-changelog@lists.xensource.com; Fri, 01 Nov 2013 21:59:42 +0000 Date: Fri, 01 Nov 2013 21:59:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't read uninitialized size value in xc_read_image X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbf891bcd1841bc61d0726d11988b8c9bf8d6757 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:42 2013 +1300 Commit: Ian Campbell CommitDate: Thu Oct 31 22:13:52 2013 +0000 libxc: don't read uninitialized size value in xc_read_image This error case can only be triggered by gzread returning 0 (and having not read anything), so move it there. Coverity-ID: 1056076 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xg_private.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c index 8fa068e..a914068 100644 --- a/tools/libxc/xg_private.c +++ b/tools/libxc/xg_private.c @@ -71,6 +71,12 @@ char *xc_read_image(xc_interface *xch, image = NULL; goto out; case 0: /* EOF */ + if ( *size == 0 ) + { + PERROR("Could not read kernel image"); + free(image); + image = NULL; + } goto out; default: *size += bytes; @@ -80,13 +86,7 @@ char *xc_read_image(xc_interface *xch, #undef CHUNK out: - if ( *size == 0 ) - { - PERROR("Could not read kernel image"); - free(image); - image = NULL; - } - else if ( image ) + if ( image ) { /* Shrink allocation to fit image. */ tmp = realloc(image, *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 Nov 02 04:00:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04: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 1VcSNf-0002e9-IL; Sat, 02 Nov 2013 04:00:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNd-0002e4-Sj for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:10 +0000 Received: from [85.158.143.35:31357] by server-3.bemta-4.messagelabs.com id 11/84-19578-8C874725; Sat, 02 Nov 2013 04:00:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1383364807!460164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26609 invoked from network); 2 Nov 2013 04:00:08 -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; 2 Nov 2013 04:00:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNa-0006LH-Vx for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNa-0000uZ-Di for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:06 +0000 Date: Sat, 02 Nov 2013 04:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: UART addresses are not always aligned to a 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 3a2c282b0e5f1f59abec88f0001b71cba3af3378 Author: Jon Fraser AuthorDate: Thu Oct 31 15:37:38 2013 -0400 Commit: Ian Campbell CommitDate: Fri Nov 1 13:09:14 2013 +0000 xen/arm: UART addresses are not always aligned to a page. When calculating the virtual address of the UART, add the page offset of the UART to the mapped address. Create define EARLY_UART_VIRTUAL_ADDRESS and use instead of FIXMAP_ADDR(FIXMAP_CONSOLE) Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/arm32/debug.S | 5 +++-- xen/arch/arm/arm32/head.S | 3 ++- xen/arch/arm/arm64/debug.S | 5 +++-- xen/arch/arm/arm64/head.S | 3 ++- xen/include/asm-arm/early_printk.h | 12 ++++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S index ec774cd..a95d9da 100644 --- a/xen/arch/arm/arm32/debug.S +++ b/xen/arch/arm/arm32/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* Print a character on the UART - this function is called by C * r0: character to print */ GLOBAL(early_putch) - ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ + ldr r1, =EARLY_UART_VIRTUAL_ADDRESS /* r1 := VA UART base address */ early_uart_ready r1, r2 early_uart_transmit r1, r0 mov pc, lr /* Flush the UART - this function is called by C */ GLOBAL(early_flush) - ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ + ldr r1, =EARLY_UART_VIRTUAL_ADDRESS /* r1 := VA UART base address */ early_uart_ready r1, r2 mov pc, lr diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ce1d21a..96230ac 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -22,6 +22,7 @@ #include #include #include +#include #define ZIMAGE_MAGIC_NUMBER 0x016f2818 @@ -356,7 +357,7 @@ paging: strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ - ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr r11, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ teq r12, #0 /* Only on boot CPU */ diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 472c157..a855358 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* Print a character on the UART - this function is called by C * x0: character to print */ GLOBAL(early_putch) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret /* Flush the UART - this function is called by C */ GLOBAL(early_flush) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* x15 := VA UART base address */ + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b8b5902..31afdd0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -23,6 +23,7 @@ #include #include #include +#include #define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ #define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ @@ -368,7 +369,7 @@ paging: 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) + ldr x23, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 5f7c529..707bbf7 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -14,6 +14,16 @@ #ifdef EARLY_PRINTK +/* need to add the uart address offset in page to the fixmap address */ +#define EARLY_UART_VIRTUAL_ADDRESS \ + (FIXMAP_ADDR(FIXMAP_CONSOLE) +(EARLY_UART_BASE_ADDRESS & ~PAGE_MASK)) + +#endif + +#ifndef __ASSEMBLY__ + +#ifdef EARLY_PRINTK + void early_printk(const char *fmt, ...) __attribute__((format (printf, 1, 2))); void early_panic(const char *fmt, ...) __attribute__((noreturn)) @@ -31,4 +41,6 @@ __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) #endif +#endif /* __ASSEMBLY__ */ + #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04: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 1VcSNf-0002e9-IL; Sat, 02 Nov 2013 04:00:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNd-0002e4-Sj for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:10 +0000 Received: from [85.158.143.35:31357] by server-3.bemta-4.messagelabs.com id 11/84-19578-8C874725; Sat, 02 Nov 2013 04:00:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1383364807!460164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26609 invoked from network); 2 Nov 2013 04:00:08 -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; 2 Nov 2013 04:00:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNa-0006LH-Vx for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNa-0000uZ-Di for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:06 +0000 Date: Sat, 02 Nov 2013 04:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: UART addresses are not always aligned to a 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 3a2c282b0e5f1f59abec88f0001b71cba3af3378 Author: Jon Fraser AuthorDate: Thu Oct 31 15:37:38 2013 -0400 Commit: Ian Campbell CommitDate: Fri Nov 1 13:09:14 2013 +0000 xen/arm: UART addresses are not always aligned to a page. When calculating the virtual address of the UART, add the page offset of the UART to the mapped address. Create define EARLY_UART_VIRTUAL_ADDRESS and use instead of FIXMAP_ADDR(FIXMAP_CONSOLE) Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/arm32/debug.S | 5 +++-- xen/arch/arm/arm32/head.S | 3 ++- xen/arch/arm/arm64/debug.S | 5 +++-- xen/arch/arm/arm64/head.S | 3 ++- xen/include/asm-arm/early_printk.h | 12 ++++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S index ec774cd..a95d9da 100644 --- a/xen/arch/arm/arm32/debug.S +++ b/xen/arch/arm/arm32/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* Print a character on the UART - this function is called by C * r0: character to print */ GLOBAL(early_putch) - ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ + ldr r1, =EARLY_UART_VIRTUAL_ADDRESS /* r1 := VA UART base address */ early_uart_ready r1, r2 early_uart_transmit r1, r0 mov pc, lr /* Flush the UART - this function is called by C */ GLOBAL(early_flush) - ldr r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* r1 := VA UART base address */ + ldr r1, =EARLY_UART_VIRTUAL_ADDRESS /* r1 := VA UART base address */ early_uart_ready r1, r2 mov pc, lr diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ce1d21a..96230ac 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -22,6 +22,7 @@ #include #include #include +#include #define ZIMAGE_MAGIC_NUMBER 0x016f2818 @@ -356,7 +357,7 @@ paging: strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ - ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr r11, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ teq r12, #0 /* Only on boot CPU */ diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 472c157..a855358 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* Print a character on the UART - this function is called by C * x0: character to print */ GLOBAL(early_putch) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret /* Flush the UART - this function is called by C */ GLOBAL(early_flush) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* x15 := VA UART base address */ + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b8b5902..31afdd0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -23,6 +23,7 @@ #include #include #include +#include #define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ #define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ @@ -368,7 +369,7 @@ paging: 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) + ldr x23, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 5f7c529..707bbf7 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -14,6 +14,16 @@ #ifdef EARLY_PRINTK +/* need to add the uart address offset in page to the fixmap address */ +#define EARLY_UART_VIRTUAL_ADDRESS \ + (FIXMAP_ADDR(FIXMAP_CONSOLE) +(EARLY_UART_BASE_ADDRESS & ~PAGE_MASK)) + +#endif + +#ifndef __ASSEMBLY__ + +#ifdef EARLY_PRINTK + void early_printk(const char *fmt, ...) __attribute__((format (printf, 1, 2))); void early_panic(const char *fmt, ...) __attribute__((noreturn)) @@ -31,4 +41,6 @@ __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) #endif +#endif /* __ASSEMBLY__ */ + #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNp-0002eT-LZ; Sat, 02 Nov 2013 04:00:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNo-0002eL-9s for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:20 +0000 Received: from [193.109.254.147:14776] by server-11.bemta-14.messagelabs.com id E7/31-08419-3D874725; Sat, 02 Nov 2013 04:00:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1383364817!182152!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21125 invoked from network); 2 Nov 2013 04:00:18 -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; 2 Nov 2013 04:00:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNl-0006LK-Gh for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNl-0000ux-4i for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:17 +0000 Date: Sat, 02 Nov 2013 04:00:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add EARLY_PRINT support for Broadcom brcm platform. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 799ed220ec34612c255ba222c5ccb263608f602f Author: Jon Fraser AuthorDate: Mon Oct 28 21:50:31 2013 -0400 Commit: Ian Campbell CommitDate: Fri Nov 1 13:09:50 2013 +0000 xen/arm: Add EARLY_PRINT support for Broadcom brcm platform. Enable early print support for the Broadcom A15 platform, brcm. Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index bd79b26..c27c2eb 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -77,6 +77,11 @@ EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x01c28000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), brcm) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0xF0406B00 +EARLY_UART_REG_SHIFT := 2 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNp-0002eT-LZ; Sat, 02 Nov 2013 04:00:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNo-0002eL-9s for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:20 +0000 Received: from [193.109.254.147:14776] by server-11.bemta-14.messagelabs.com id E7/31-08419-3D874725; Sat, 02 Nov 2013 04:00:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1383364817!182152!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21125 invoked from network); 2 Nov 2013 04:00:18 -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; 2 Nov 2013 04:00:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNl-0006LK-Gh for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNl-0000ux-4i for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:17 +0000 Date: Sat, 02 Nov 2013 04:00:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add EARLY_PRINT support for Broadcom brcm platform. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 799ed220ec34612c255ba222c5ccb263608f602f Author: Jon Fraser AuthorDate: Mon Oct 28 21:50:31 2013 -0400 Commit: Ian Campbell CommitDate: Fri Nov 1 13:09:50 2013 +0000 xen/arm: Add EARLY_PRINT support for Broadcom brcm platform. Enable early print support for the Broadcom A15 platform, brcm. Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index bd79b26..c27c2eb 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -77,6 +77,11 @@ EARLY_PRINTK_INC := 8250 EARLY_UART_BASE_ADDRESS := 0x01c28000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), brcm) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0xF0406B00 +EARLY_UART_REG_SHIFT := 2 +endif ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04: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 1VcSO0-0002fY-PP; Sat, 02 Nov 2013 04:00:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNz-0002fP-OI for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:31 +0000 Received: from [85.158.143.35:21013] by server-3.bemta-4.messagelabs.com id 04/A4-19578-FD874725; Sat, 02 Nov 2013 04:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1383364829!460202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28289 invoked from network); 2 Nov 2013 04:00:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2013 04:00:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNx-0006LS-5O for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNx-0000vJ-1a for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:29 +0000 Date: Sat, 02 Nov 2013 04:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check for xc_vcpu_setcontext failure in xc_domain_resume_any X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 577ec96e7d488a76765b18a767727391a0122af1 Author: Matthew Daley AuthorDate: Fri Nov 1 13:27:32 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:12:50 2013 +0000 libxc: check for xc_vcpu_setcontext failure in xc_domain_resume_any Coverity-ID: 1090352 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_resume.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index 50724f2..18b4818 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -211,15 +211,19 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) /* Reset all secondary CPU states. */ for ( i = 1; i <= info.max_vcpu_id; i++ ) - xc_vcpu_setcontext(xch, domid, i, NULL); + if ( xc_vcpu_setcontext(xch, domid, i, NULL) != 0 ) + { + ERROR("Couldn't reset vcpu state"); + goto out; + } /* Ready to resume domain execution now. */ domctl.cmd = XEN_DOMCTL_resumedomain; domctl.domain = domid; rc = do_domctl(xch, &domctl); +out: #if defined(__i386__) || defined(__x86_64__) - out: if (p2m) munmap(p2m, P2M_FL_ENTRIES*PAGE_SIZE); if (p2m_frame_list) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04: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 1VcSO0-0002fY-PP; Sat, 02 Nov 2013 04:00:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNz-0002fP-OI for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:31 +0000 Received: from [85.158.143.35:21013] by server-3.bemta-4.messagelabs.com id 04/A4-19578-FD874725; Sat, 02 Nov 2013 04:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1383364829!460202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28289 invoked from network); 2 Nov 2013 04:00:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2013 04:00:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSNx-0006LS-5O for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSNx-0000vJ-1a for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:29 +0000 Date: Sat, 02 Nov 2013 04:00:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check for xc_vcpu_setcontext failure in xc_domain_resume_any X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 577ec96e7d488a76765b18a767727391a0122af1 Author: Matthew Daley AuthorDate: Fri Nov 1 13:27:32 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:12:50 2013 +0000 libxc: check for xc_vcpu_setcontext failure in xc_domain_resume_any Coverity-ID: 1090352 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_resume.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c index 50724f2..18b4818 100644 --- a/tools/libxc/xc_resume.c +++ b/tools/libxc/xc_resume.c @@ -211,15 +211,19 @@ static int xc_domain_resume_any(xc_interface *xch, uint32_t domid) /* Reset all secondary CPU states. */ for ( i = 1; i <= info.max_vcpu_id; i++ ) - xc_vcpu_setcontext(xch, domid, i, NULL); + if ( xc_vcpu_setcontext(xch, domid, i, NULL) != 0 ) + { + ERROR("Couldn't reset vcpu state"); + goto out; + } /* Ready to resume domain execution now. */ domctl.cmd = XEN_DOMCTL_resumedomain; domctl.domain = domid; rc = do_domctl(xch, &domctl); +out: #if defined(__i386__) || defined(__x86_64__) - out: if (p2m) munmap(p2m, P2M_FL_ENTRIES*PAGE_SIZE); if (p2m_frame_list) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOB-0002gY-SQ; Sat, 02 Nov 2013 04:00:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOA-0002gK-Ln for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:42 +0000 Received: from [85.158.139.211:8754] by server-17.bemta-5.messagelabs.com id 9F/EE-17059-9E874725; Sat, 02 Nov 2013 04:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383364839!1159645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24746 invoked from network); 2 Nov 2013 04:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2013 04:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSO7-0006LY-Jj for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSO7-0000vj-BP for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:39 +0000 Date: Sat, 02 Nov 2013 04:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for xc_domain_max_vcpus failure in libxl__build_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 2bb02b31fc1e5e23bd9e4ad5e1f800a704f3d6ae Author: Matthew Daley AuthorDate: Fri Nov 1 13:29:21 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:13:40 2013 +0000 libxl: check for xc_domain_max_vcpus failure in libxl__build_pre Coverity-ID: 1055047 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1873459..c164469 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -209,7 +209,10 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, char *xs_domid, *con_domid; int rc; - xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); + if (xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus) != 0) { + LOG(ERROR, "Couldn't set max vcpu count"); + return ERROR_FAIL; + } /* * Check if the domain has any CPU affinity. If not, try to build -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOB-0002gY-SQ; Sat, 02 Nov 2013 04:00:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOA-0002gK-Ln for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:42 +0000 Received: from [85.158.139.211:8754] by server-17.bemta-5.messagelabs.com id 9F/EE-17059-9E874725; Sat, 02 Nov 2013 04:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383364839!1159645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24746 invoked from network); 2 Nov 2013 04:00:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2013 04:00:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSO7-0006LY-Jj for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSO7-0000vj-BP for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:39 +0000 Date: Sat, 02 Nov 2013 04:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for xc_domain_max_vcpus failure in libxl__build_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 2bb02b31fc1e5e23bd9e4ad5e1f800a704f3d6ae Author: Matthew Daley AuthorDate: Fri Nov 1 13:29:21 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:13:40 2013 +0000 libxl: check for xc_domain_max_vcpus failure in libxl__build_pre Coverity-ID: 1055047 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1873459..c164469 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -209,7 +209,10 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, char *xs_domid, *con_domid; int rc; - xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus); + if (xc_domain_max_vcpus(ctx->xch, domid, info->max_vcpus) != 0) { + LOG(ERROR, "Couldn't set max vcpu count"); + return ERROR_FAIL; + } /* * Check if the domain has any CPU affinity. If not, try to build -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOL-0002hl-VJ; Sat, 02 Nov 2013 04:00:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOK-0002hQ-8O for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:52 +0000 Received: from [85.158.143.35:21644] by server-2.bemta-4.messagelabs.com id A6/4B-06473-3F874725; Sat, 02 Nov 2013 04:00:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1383364849!456368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21267 invoked from network); 2 Nov 2013 04:00:50 -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; 2 Nov 2013 04:00:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOH-0006Lf-Ps for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSOH-0000wL-Nq for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:49 +0000 Date: Sat, 02 Nov 2013 04:00:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for xc_domain_shutdown failure in libxl__domain_suspend_common_callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b714ae02a8ea1ba4e870a78ccfe1c9bc940718d9 Author: Matthew Daley AuthorDate: Fri Nov 1 13:30:44 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:14:19 2013 +0000 libxl: check for xc_domain_shutdown failure in libxl__domain_suspend_common_callback Coverity-ID: 1055048 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c164469..1812bdc 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1041,7 +1041,11 @@ int libxl__domain_suspend_common_callback(void *user) if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { LOG(DEBUG, "Calling xc_domain_shutdown on HVM domain"); - xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); + ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); + if (ret < 0) { + LOGE(ERROR, "xc_domain_shutdown failed"); + return 0; + } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 02 04:00:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Nov 2013 04:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOL-0002hl-VJ; Sat, 02 Nov 2013 04:00:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOK-0002hQ-8O for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:52 +0000 Received: from [85.158.143.35:21644] by server-2.bemta-4.messagelabs.com id A6/4B-06473-3F874725; Sat, 02 Nov 2013 04:00:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1383364849!456368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21267 invoked from network); 2 Nov 2013 04:00:50 -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; 2 Nov 2013 04:00:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VcSOH-0006Lf-Ps for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VcSOH-0000wL-Nq for xen-changelog@lists.xensource.com; Sat, 02 Nov 2013 04:00:49 +0000 Date: Sat, 02 Nov 2013 04:00:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: check for xc_domain_shutdown failure in libxl__domain_suspend_common_callback X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b714ae02a8ea1ba4e870a78ccfe1c9bc940718d9 Author: Matthew Daley AuthorDate: Fri Nov 1 13:30:44 2013 +1300 Commit: Ian Campbell CommitDate: Fri Nov 1 13:14:19 2013 +0000 libxl: check for xc_domain_shutdown failure in libxl__domain_suspend_common_callback Coverity-ID: 1055048 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c164469..1812bdc 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1041,7 +1041,11 @@ int libxl__domain_suspend_common_callback(void *user) if (dss->hvm && (!hvm_pvdrv || hvm_s_state)) { LOG(DEBUG, "Calling xc_domain_shutdown on HVM domain"); - xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); + ret = xc_domain_shutdown(CTX->xch, domid, SHUTDOWN_suspend); + if (ret < 0) { + LOGE(ERROR, "xc_domain_shutdown failed"); + return 0; + } /* The guest does not (need to) respond to this sort of request. */ dss->guest_responded = 1; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 02:22:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 02: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 1VdWHP-0008DL-De; Tue, 05 Nov 2013 02: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 1VdWHN-0008D9-T9 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:06 +0000 Received: from [85.158.143.35:38731] by server-2.bemta-4.messagelabs.com id 58/74-06473-D4658725; Tue, 05 Nov 2013 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1383618123!958279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31231 invoked from network); 5 Nov 2013 02:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdWHK-0002Fl-W7 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdWHK-0005z4-Oj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:02 +0000 Date: Tue, 05 Nov 2013 02:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 169c7b438ceda2870d9e2edb3cc5a4d80f336f64 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:53:28 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:53:28 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 0e349cc..07d80c1 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1499,6 +1499,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1607,16 +1609,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1628,6 +1632,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(e->tot_pages++ == 0) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !--e->tot_pages; + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- 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 Nov 05 02:22:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 02: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 1VdWHP-0008DL-De; Tue, 05 Nov 2013 02: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 1VdWHN-0008D9-T9 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:06 +0000 Received: from [85.158.143.35:38731] by server-2.bemta-4.messagelabs.com id 58/74-06473-D4658725; Tue, 05 Nov 2013 02:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1383618123!958279!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31231 invoked from network); 5 Nov 2013 02:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 02:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdWHK-0002Fl-W7 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdWHK-0005z4-Oj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 02:22:02 +0000 Date: Tue, 05 Nov 2013 02:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 169c7b438ceda2870d9e2edb3cc5a4d80f336f64 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:53:28 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:53:28 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 0e349cc..07d80c1 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1499,6 +1499,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1607,16 +1609,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1628,6 +1632,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(e->tot_pages++ == 0) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !--e->tot_pages; + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- 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 Nov 05 04:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 04:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdYUp-0001Ur-4J; Tue, 05 Nov 2013 04:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdYUn-0001Um-HP for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:05 +0000 Received: from [193.109.254.147:33566] by server-14.bemta-14.messagelabs.com id 1E/AE-25733-49778725; Tue, 05 Nov 2013 04:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1383626643!653219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26163 invoked from network); 5 Nov 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 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 1VdYUk-0003mE-U9 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdYUk-0001iY-An for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:02 +0000 Date: Tue, 05 Nov 2013 04:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa957039018e1470737e785d849e5eee12ae3786 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:55:12 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:55:12 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 51 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e0f91ab..156ef9a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1459,6 +1459,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1555,16 +1557,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); page->count_info &= ~(PGC_count_mask|PGC_allocated); free_domheap_page(page); @@ -1575,6 +1579,37 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(e->tot_pages++ == 0) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !--e->tot_pages; + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- 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 Nov 05 04:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 04:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdYUp-0001Ur-4J; Tue, 05 Nov 2013 04:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdYUn-0001Um-HP for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:05 +0000 Received: from [193.109.254.147:33566] by server-14.bemta-14.messagelabs.com id 1E/AE-25733-49778725; Tue, 05 Nov 2013 04:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1383626643!653219!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26163 invoked from network); 5 Nov 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 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 1VdYUk-0003mE-U9 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdYUk-0001iY-An for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 04:44:02 +0000 Date: Tue, 05 Nov 2013 04:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa957039018e1470737e785d849e5eee12ae3786 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:55:12 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:55:12 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 51 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e0f91ab..156ef9a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1459,6 +1459,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1555,16 +1557,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); page->count_info &= ~(PGC_count_mask|PGC_allocated); free_domheap_page(page); @@ -1575,6 +1579,37 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(e->tot_pages++ == 0) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !--e->tot_pages; + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- 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 Nov 05 10:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1Vddwb-0007RC-1n; Tue, 05 Nov 2013 10:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddwZ-0007R3-0m for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:07 +0000 Received: from [85.158.139.211:39491] by server-16.bemta-5.messagelabs.com id 3D/41-17144-269C8725; Tue, 05 Nov 2013 10:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1383647584!64444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19765 invoked from network); 5 Nov 2013 10:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddwW-0008CW-2C for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddwV-0003da-OY for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:03 +0000 Date: Tue, 05 Nov 2013 10:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a321abc6d8122f8cb3928066cc74363c4fdddcfd Author: Andrew Cooper AuthorDate: Mon Nov 4 10:06:36 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:06:36 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f42bc7a..21c6a14 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1517,6 +1517,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1625,16 +1627,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1646,6 +1650,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !domain_adjust_tot_pages(e, -1); + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, 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 Tue Nov 05 10:33:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1Vddwb-0007RC-1n; Tue, 05 Nov 2013 10:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddwZ-0007R3-0m for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:07 +0000 Received: from [85.158.139.211:39491] by server-16.bemta-5.messagelabs.com id 3D/41-17144-269C8725; Tue, 05 Nov 2013 10:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1383647584!64444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19765 invoked from network); 5 Nov 2013 10:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddwW-0008CW-2C for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddwV-0003da-OY for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:03 +0000 Date: Tue, 05 Nov 2013 10:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a321abc6d8122f8cb3928066cc74363c4fdddcfd Author: Andrew Cooper AuthorDate: Mon Nov 4 10:06:36 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:06:36 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f42bc7a..21c6a14 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1517,6 +1517,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1625,16 +1627,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1646,6 +1650,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !domain_adjust_tot_pages(e, -1); + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, 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 Tue Nov 05 10:33:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddwy-0007SO-5m; Tue, 05 Nov 2013 10:33:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwx-0007SH-Oj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:31 +0000 Received: from [85.158.143.35:16192] by server-3.bemta-4.messagelabs.com id 8B/3A-19578-B79C8725; Tue, 05 Nov 2013 10:33:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1383647608!1030708!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15566 invoked from network); 5 Nov 2013 10:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwg-0008CZ-Bk for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddwg-0003dz-6U for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:14 +0000 Date: Tue, 05 Nov 2013 10:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c24cdcce3269f3286790c63821951a1de93c66a Author: Jan Beulich AuthorDate: Mon Nov 4 10:10:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:10:04 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0e1d570..df26423 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -97,7 +97,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:33:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddwy-0007SO-5m; Tue, 05 Nov 2013 10:33:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwx-0007SH-Oj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:31 +0000 Received: from [85.158.143.35:16192] by server-3.bemta-4.messagelabs.com id 8B/3A-19578-B79C8725; Tue, 05 Nov 2013 10:33:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1383647608!1030708!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15566 invoked from network); 5 Nov 2013 10:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwg-0008CZ-Bk for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddwg-0003dz-6U for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:14 +0000 Date: Tue, 05 Nov 2013 10:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c24cdcce3269f3286790c63821951a1de93c66a Author: Jan Beulich AuthorDate: Mon Nov 4 10:10:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:10:04 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0e1d570..df26423 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -97,7 +97,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:33:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddx7-0007Te-8b; Tue, 05 Nov 2013 10:33:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx6-0007TO-5D for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:40 +0000 Received: from [85.158.139.211:59620] by server-6.bemta-5.messagelabs.com id AD/27-04949-389C8725; Tue, 05 Nov 2013 10:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383647617!61205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 567 invoked from network); 5 Nov 2013 10:33:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx3-0008Cn-H3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddx1-0003fV-JS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:36 +0000 Date: Tue, 05 Nov 2013 10:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ats: Fix parsing of 'ats' command line 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 7b5af1df122092243a3697409d5a5ad3b9944da4 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:45:17 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:45:17 2013 +0100 x86/ats: Fix parsing of 'ats' command line option This is really a boolean_param() hidden inside a hand-coded attempt to replicate boolean_param(), which misses the 'no-' prefix semantics expected with Xen boolean parameters. Signed-off-by: Andrew Cooper --- xen/drivers/passthrough/x86/ats.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/xen/drivers/passthrough/x86/ats.c b/xen/drivers/passthrough/x86/ats.c index 674b54a..bb7ee9a 100644 --- a/xen/drivers/passthrough/x86/ats.c +++ b/xen/drivers/passthrough/x86/ats.c @@ -20,33 +20,8 @@ LIST_HEAD(ats_devices); -static void parse_ats_param(char *s); -custom_param("ats", parse_ats_param); - bool_t __read_mostly ats_enabled = 1; - -static void __init parse_ats_param(char *s) -{ - char *ss; - - do { - ss = strchr(s, ','); - if ( ss ) - *ss = '\0'; - - switch ( parse_bool(s) ) - { - case 0: - ats_enabled = 0; - break; - case 1: - ats_enabled = 1; - break; - } - - s = ss + 1; - } while ( ss ); -} +boolean_param("ats", ats_enabled); int enable_ats_device(int seg, int bus, int devfn) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:33:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddx7-0007Te-8b; Tue, 05 Nov 2013 10:33:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx6-0007TO-5D for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:40 +0000 Received: from [85.158.139.211:59620] by server-6.bemta-5.messagelabs.com id AD/27-04949-389C8725; Tue, 05 Nov 2013 10:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383647617!61205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 567 invoked from network); 5 Nov 2013 10:33:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx3-0008Cn-H3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddx1-0003fV-JS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:36 +0000 Date: Tue, 05 Nov 2013 10:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ats: Fix parsing of 'ats' command line 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 7b5af1df122092243a3697409d5a5ad3b9944da4 Author: Andrew Cooper AuthorDate: Mon Nov 4 14:45:17 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:45:17 2013 +0100 x86/ats: Fix parsing of 'ats' command line option This is really a boolean_param() hidden inside a hand-coded attempt to replicate boolean_param(), which misses the 'no-' prefix semantics expected with Xen boolean parameters. Signed-off-by: Andrew Cooper --- xen/drivers/passthrough/x86/ats.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/xen/drivers/passthrough/x86/ats.c b/xen/drivers/passthrough/x86/ats.c index 674b54a..bb7ee9a 100644 --- a/xen/drivers/passthrough/x86/ats.c +++ b/xen/drivers/passthrough/x86/ats.c @@ -20,33 +20,8 @@ LIST_HEAD(ats_devices); -static void parse_ats_param(char *s); -custom_param("ats", parse_ats_param); - bool_t __read_mostly ats_enabled = 1; - -static void __init parse_ats_param(char *s) -{ - char *ss; - - do { - ss = strchr(s, ','); - if ( ss ) - *ss = '\0'; - - switch ( parse_bool(s) ) - { - case 0: - ats_enabled = 0; - break; - case 1: - ats_enabled = 1; - break; - } - - s = ss + 1; - } while ( ss ); -} +boolean_param("ats", ats_enabled); int enable_ats_device(int seg, int bus, int devfn) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:33:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddx8-0007Ty-B8; Tue, 05 Nov 2013 10:33:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx7-0007Td-Pm for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:41 +0000 Received: from [85.158.137.68:27952] by server-8.bemta-3.messagelabs.com id 22/DB-06638-489C8725; Tue, 05 Nov 2013 10:33:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1383647619!1644473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17171 invoked from network); 5 Nov 2013 10:33:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwq-0008Cd-Uu for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddwq-0003f4-Fn for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:24 +0000 Date: Tue, 05 Nov 2013 10:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make sure memory block is RAM before passing to the allocator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 227258983401b7e6091967ffaf22ad83f4ebaf6f Author: Jan Beulich AuthorDate: Mon Nov 4 14:29:24 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:29:24 2013 +0100 x86: make sure memory block is RAM before passing to the allocator Memory blocks outside of the always visible 1:1 mapping range get passed to the allocator separately (once enough other setup was done). Skipping non-RAM regions, however, was forgotten in adc5afbf ("x86: support up to 16Tb"). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 30a4fd6..5bf4ee0 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1155,6 +1155,8 @@ void __init __start_xen(unsigned long mbi_p) { uint64_t s, e; + if ( boot_e820.map[i].type != E820_RAM ) + continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; if ( PFN_DOWN(e) <= limit ) -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:33:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1Vddx8-0007Ty-B8; Tue, 05 Nov 2013 10:33:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddx7-0007Td-Pm for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:41 +0000 Received: from [85.158.137.68:27952] by server-8.bemta-3.messagelabs.com id 22/DB-06638-489C8725; Tue, 05 Nov 2013 10:33:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1383647619!1644473!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17171 invoked from network); 5 Nov 2013 10:33:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:33:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddwq-0008Cd-Uu for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddwq-0003f4-Fn for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:24 +0000 Date: Tue, 05 Nov 2013 10:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make sure memory block is RAM before passing to the allocator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 227258983401b7e6091967ffaf22ad83f4ebaf6f Author: Jan Beulich AuthorDate: Mon Nov 4 14:29:24 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 14:29:24 2013 +0100 x86: make sure memory block is RAM before passing to the allocator Memory blocks outside of the always visible 1:1 mapping range get passed to the allocator separately (once enough other setup was done). Skipping non-RAM regions, however, was forgotten in adc5afbf ("x86: support up to 16Tb"). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 30a4fd6..5bf4ee0 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1155,6 +1155,8 @@ void __init __start_xen(unsigned long mbi_p) { uint64_t s, e; + if ( boot_e820.map[i].type != E820_RAM ) + continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; if ( PFN_DOWN(e) <= limit ) -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:33:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1VddxK-0007W4-ED; Tue, 05 Nov 2013 10:33:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxJ-0007Vr-K0 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:53 +0000 Received: from [193.109.254.147:41134] by server-5.bemta-14.messagelabs.com id 0C/6A-13525-099C8725; Tue, 05 Nov 2013 10:33:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383647631!736320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.2 required=7.0 tests=BIZ_TLD,BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11689 invoked from network); 5 Nov 2013 10:33:52 -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; 5 Nov 2013 10:33:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxG-0008Cz-TX for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddxG-0003fu-8I for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:50 +0000 Date: Tue, 05 Nov 2013 10:33:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Allow 4 MB of video RAM for Cirrus graphics on traditional 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 13d13a45d0591fc195666ea20ddf8781a0367e88 Author: Rob Hoes AuthorDate: Thu Oct 24 16:12:07 2013 +0100 Commit: Ian Campbell CommitDate: Mon Nov 4 16:58:19 2013 +0000 libxl: Allow 4 MB of video RAM for Cirrus graphics on traditional QEMU VMs using Cirrus graphics have always had 4 MB of video RAM on XenServer, while libxl currently does not allow values less than 8 MB. Signed-off-by: Rob Hoes Tested-by: Fabio Fantoni Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 18 ++++++++------ tools/libxl/libxl_create.c | 53 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 278dba1..d2d8921 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1028,14 +1028,16 @@ in the B for configuring virtual frame buffer devices Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be available. -The default amount of video ram for stdvga is 8MB which is sufficient -for e.g. 1600x1200 at 32bpp and videoram option is currently working -only when using the qemu-xen-traditional device-model. - -When using the emulated Cirrus graphics card (B) -the amount of video ram is fixed at 4MB which is sufficient -for 1024x768 at 32 bpp and videoram option is currently working -only when using the upstream qemu-xen device-model. + +When using the qemu-xen-traditional device-model, the default as well as +minimum amount of video RAM for stdvga is 8 MB, which is sufficient for e.g. +1600x1200 at 32bpp. For the upstream qemu-xen device-model, the default and +minimum is 16 MB. + +When using the emulated Cirrus graphics card (B) and the +qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB, +which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen +device-model, the default and minimum is 8 MB. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1b320d3..9d793ba 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -216,20 +216,51 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && - b_info->device_model_version == - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (!b_info->u.hvm.vga.kind) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + if (b_info->video_memkb < 8 * 1024) { + LOG(ERROR, "videoram must be at least 8 MB for STDVGA on QEMU_XEN_TRADITIONAL"); + return ERROR_INVAL; + } + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + default: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 4 * 1024; + if (b_info->video_memkb != 4 * 1024) + LOG(WARN, "ignoring videoram other than 4 MB for CIRRUS on QEMU_XEN_TRADITIONAL"); + break; + } + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + default: + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 16 * 1024; - else if (b_info->video_memkb < (16 * 1024) ){ - LOG(ERROR, "videoram must be at least 16 mb with stdvga"); + if (b_info->video_memkb < 16 * 1024) { + LOG(ERROR, "videoram must be at least 16 MB for STDVGA on QEMU_XEN"); + return ERROR_INVAL; + } + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + default: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + if (b_info->video_memkb < 8 * 1024) { + LOG(ERROR, "videoram must be at least 8 MB for CIRRUS on QEMU_XEN"); return ERROR_INVAL; } - } else if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; - else if (b_info->video_memkb < (8 * 1024) ){ - LOG(ERROR,"videoram must be at least 8 mb"); - return ERROR_INVAL; + break; + } + break; } if (b_info->u.hvm.timer_mode == LIBXL_TIMER_MODE_DEFAULT) @@ -254,8 +285,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (!b_info->u.hvm.boot) return ERROR_NOMEM; } - if (!b_info->u.hvm.vga.kind) - b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; libxl_defbool_setdefault(&b_info->u.hvm.vnc.enable, true); if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) { libxl_defbool_setdefault(&b_info->u.hvm.vnc.findunused, true); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:33:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:33: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 1VddxK-0007W4-ED; Tue, 05 Nov 2013 10:33:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxJ-0007Vr-K0 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:53 +0000 Received: from [193.109.254.147:41134] by server-5.bemta-14.messagelabs.com id 0C/6A-13525-099C8725; Tue, 05 Nov 2013 10:33:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383647631!736320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.2 required=7.0 tests=BIZ_TLD,BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11689 invoked from network); 5 Nov 2013 10:33:52 -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; 5 Nov 2013 10:33:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxG-0008Cz-TX for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddxG-0003fu-8I for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:33:50 +0000 Date: Tue, 05 Nov 2013 10:33:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Allow 4 MB of video RAM for Cirrus graphics on traditional 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 13d13a45d0591fc195666ea20ddf8781a0367e88 Author: Rob Hoes AuthorDate: Thu Oct 24 16:12:07 2013 +0100 Commit: Ian Campbell CommitDate: Mon Nov 4 16:58:19 2013 +0000 libxl: Allow 4 MB of video RAM for Cirrus graphics on traditional QEMU VMs using Cirrus graphics have always had 4 MB of video RAM on XenServer, while libxl currently does not allow values less than 8 MB. Signed-off-by: Rob Hoes Tested-by: Fabio Fantoni Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 18 ++++++++------ tools/libxl/libxl_create.c | 53 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 278dba1..d2d8921 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1028,14 +1028,16 @@ in the B for configuring virtual frame buffer devices Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be available. -The default amount of video ram for stdvga is 8MB which is sufficient -for e.g. 1600x1200 at 32bpp and videoram option is currently working -only when using the qemu-xen-traditional device-model. - -When using the emulated Cirrus graphics card (B) -the amount of video ram is fixed at 4MB which is sufficient -for 1024x768 at 32 bpp and videoram option is currently working -only when using the upstream qemu-xen device-model. + +When using the qemu-xen-traditional device-model, the default as well as +minimum amount of video RAM for stdvga is 8 MB, which is sufficient for e.g. +1600x1200 at 32bpp. For the upstream qemu-xen device-model, the default and +minimum is 16 MB. + +When using the emulated Cirrus graphics card (B) and the +qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB, +which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen +device-model, the default and minimum is 8 MB. =item B diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1b320d3..9d793ba 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -216,20 +216,51 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && - b_info->device_model_version == - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (!b_info->u.hvm.vga.kind) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; + + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + if (b_info->video_memkb < 8 * 1024) { + LOG(ERROR, "videoram must be at least 8 MB for STDVGA on QEMU_XEN_TRADITIONAL"); + return ERROR_INVAL; + } + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + default: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 4 * 1024; + if (b_info->video_memkb != 4 * 1024) + LOG(WARN, "ignoring videoram other than 4 MB for CIRRUS on QEMU_XEN_TRADITIONAL"); + break; + } + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + default: + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) b_info->video_memkb = 16 * 1024; - else if (b_info->video_memkb < (16 * 1024) ){ - LOG(ERROR, "videoram must be at least 16 mb with stdvga"); + if (b_info->video_memkb < 16 * 1024) { + LOG(ERROR, "videoram must be at least 16 MB for STDVGA on QEMU_XEN"); + return ERROR_INVAL; + } + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + default: + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 8 * 1024; + if (b_info->video_memkb < 8 * 1024) { + LOG(ERROR, "videoram must be at least 8 MB for CIRRUS on QEMU_XEN"); return ERROR_INVAL; } - } else if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; - else if (b_info->video_memkb < (8 * 1024) ){ - LOG(ERROR,"videoram must be at least 8 mb"); - return ERROR_INVAL; + break; + } + break; } if (b_info->u.hvm.timer_mode == LIBXL_TIMER_MODE_DEFAULT) @@ -254,8 +285,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (!b_info->u.hvm.boot) return ERROR_NOMEM; } - if (!b_info->u.hvm.vga.kind) - b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; libxl_defbool_setdefault(&b_info->u.hvm.vnc.enable, true); if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) { libxl_defbool_setdefault(&b_info->u.hvm.vnc.findunused, true); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:34:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1VddxW-0007ZU-U3; Tue, 05 Nov 2013 10:34:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxV-0007Z5-QC for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:05 +0000 Received: from [85.158.143.35:22577] by server-3.bemta-4.messagelabs.com id FD/4B-19578-D99C8725; Tue, 05 Nov 2013 10:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383647643!1040175!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20190 invoked from network); 5 Nov 2013 10:34:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxT-0008Dc-IS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddxR-0003gP-SD for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:02 +0000 Date: Tue, 05 Nov 2013 10:34:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: new parameters for upstream qemu's vga interfaces X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74914a4b9daa7ce8bb65744f2715ed92b6f34e28 Author: Fabio Fantoni AuthorDate: Mon Sep 30 12:12:37 2013 +0200 Commit: Ian Campbell CommitDate: Mon Nov 4 17:03:14 2013 +0000 libxl: new parameters for upstream qemu's vga interfaces Change the qemu parameters for upstream qemu vgas to the new ones (-device), introduced some years ago. Signed-off-by: Fabio Fantoni --- tools/libxl/libxl_dm.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 24eebda..85a08af 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -490,15 +490,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, switch (b_info->u.hvm.vga.kind) { case LIBXL_VGA_INTERFACE_TYPE_STD: - flexarray_vappend(dm_args, "-vga", "std", NULL); + flexarray_append_pair(dm_args, "-device", "VGA"); break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - flexarray_vappend(dm_args, "-vga", "cirrus", NULL); - if (b_info->video_memkb) { - flexarray_vappend(dm_args, "-global", - GCSPRINTF("vga.vram_size_mb=%d", - libxl__sizekb_to_mb(b_info->video_memkb)), NULL); - } + flexarray_append_pair(dm_args, "-device", "cirrus-vga"); + flexarray_append_pair(dm_args, "-global", + GCSPRINTF("vga.vram_size_mb=%d", + libxl__sizekb_to_mb(b_info->video_memkb))); 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 Tue Nov 05 10:34:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1VddxW-0007ZU-U3; Tue, 05 Nov 2013 10:34:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxV-0007Z5-QC for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:05 +0000 Received: from [85.158.143.35:22577] by server-3.bemta-4.messagelabs.com id FD/4B-19578-D99C8725; Tue, 05 Nov 2013 10:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383647643!1040175!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20190 invoked from network); 5 Nov 2013 10:34:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddxT-0008Dc-IS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddxR-0003gP-SD for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:02 +0000 Date: Tue, 05 Nov 2013 10:34:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: new parameters for upstream qemu's vga interfaces X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74914a4b9daa7ce8bb65744f2715ed92b6f34e28 Author: Fabio Fantoni AuthorDate: Mon Sep 30 12:12:37 2013 +0200 Commit: Ian Campbell CommitDate: Mon Nov 4 17:03:14 2013 +0000 libxl: new parameters for upstream qemu's vga interfaces Change the qemu parameters for upstream qemu vgas to the new ones (-device), introduced some years ago. Signed-off-by: Fabio Fantoni --- tools/libxl/libxl_dm.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 24eebda..85a08af 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -490,15 +490,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, switch (b_info->u.hvm.vga.kind) { case LIBXL_VGA_INTERFACE_TYPE_STD: - flexarray_vappend(dm_args, "-vga", "std", NULL); + flexarray_append_pair(dm_args, "-device", "VGA"); break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - flexarray_vappend(dm_args, "-vga", "cirrus", NULL); - if (b_info->video_memkb) { - flexarray_vappend(dm_args, "-global", - GCSPRINTF("vga.vram_size_mb=%d", - libxl__sizekb_to_mb(b_info->video_memkb)), NULL); - } + flexarray_append_pair(dm_args, "-device", "cirrus-vga"); + flexarray_append_pair(dm_args, "-global", + GCSPRINTF("vga.vram_size_mb=%d", + libxl__sizekb_to_mb(b_info->video_memkb))); 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 Tue Nov 05 10:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1Vddxj-0007cT-1T; Tue, 05 Nov 2013 10:34:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxh-0007bv-Cq for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:17 +0000 Received: from [85.158.137.68:37886] by server-17.bemta-3.messagelabs.com id F0/44-12030-8A9C8725; Tue, 05 Nov 2013 10:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1383647654!1659644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5550 invoked from network); 5 Nov 2013 10:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxe-0008Do-EF for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddxe-0003gz-3v for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:14 +0000 Date: Tue, 05 Nov 2013 10:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Register PV driver product numbers 4 and 5. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 940b40eb412e00b666a142d5758fa9a3da3f4168 Author: Paul Durrant AuthorDate: Wed Oct 16 17:15:09 2013 +0100 Commit: Ian Campbell CommitDate: Mon Nov 4 17:04:07 2013 +0000 Register PV driver product numbers 4 and 5. Signed-off-by: Paul Durrant Acked-by: Ian Campbell --- docs/misc/hvm-emulated-unplug.markdown | 6 +++++- xen/include/public/hvm/pvdrivers.h | 12 +++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/misc/hvm-emulated-unplug.markdown b/docs/misc/hvm-emulated-unplug.markdown index ec9ce83..c6d1f9b 100644 --- a/docs/misc/hvm-emulated-unplug.markdown +++ b/docs/misc/hvm-emulated-unplug.markdown @@ -65,4 +65,8 @@ decimal number. `{product_name}` is a string corresponding to the product number in step 3. The master registry of product names and numbers is in -xen/include/public/hvm/pvdrivers.h +xen/include/public/hvm/pvdrivers.h. + +NOTE: The IO ports implementing the unplug protocol are implemented +as part of the Xen Platform PCI Device, so if that device is not +present in the system then this protocol will not work. diff --git a/xen/include/public/hvm/pvdrivers.h b/xen/include/public/hvm/pvdrivers.h index 4c6b705..77994d2 100644 --- a/xen/include/public/hvm/pvdrivers.h +++ b/xen/include/public/hvm/pvdrivers.h @@ -38,10 +38,12 @@ * indicate a driver which is yet to be released. */ -#define PVDRIVERS_PRODUCT_LIST(EACH) \ - EACH("xensource-windows", 0x0001) /* Citrix */ \ - EACH("gplpv-windows", 0x0002) /* James Harper */ \ - EACH("linux", 0x0003) \ - EACH("experimental", 0xffff) +#define PVDRIVERS_PRODUCT_LIST(EACH) \ + EACH("xensource-windows", 0x0001) /* Citrix */ \ + EACH("gplpv-windows", 0x0002) /* James Harper */ \ + EACH("linux", 0x0003) \ + EACH("xenserver-windows-v7.0+", 0x0004) /* Citrix */ \ + EACH("xenserver-windows-v7.2+", 0x0005) /* Citrix */ \ + EACH("experimental", 0xffff) #endif /* _XEN_PUBLIC_PVDRIVERS_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 Nov 05 10:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10: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 1Vddxj-0007cT-1T; Tue, 05 Nov 2013 10:34:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxh-0007bv-Cq for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:17 +0000 Received: from [85.158.137.68:37886] by server-17.bemta-3.messagelabs.com id F0/44-12030-8A9C8725; Tue, 05 Nov 2013 10:34:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1383647654!1659644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5550 invoked from network); 5 Nov 2013 10:34:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxe-0008Do-EF for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddxe-0003gz-3v for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:14 +0000 Date: Tue, 05 Nov 2013 10:34:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Register PV driver product numbers 4 and 5. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 940b40eb412e00b666a142d5758fa9a3da3f4168 Author: Paul Durrant AuthorDate: Wed Oct 16 17:15:09 2013 +0100 Commit: Ian Campbell CommitDate: Mon Nov 4 17:04:07 2013 +0000 Register PV driver product numbers 4 and 5. Signed-off-by: Paul Durrant Acked-by: Ian Campbell --- docs/misc/hvm-emulated-unplug.markdown | 6 +++++- xen/include/public/hvm/pvdrivers.h | 12 +++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/misc/hvm-emulated-unplug.markdown b/docs/misc/hvm-emulated-unplug.markdown index ec9ce83..c6d1f9b 100644 --- a/docs/misc/hvm-emulated-unplug.markdown +++ b/docs/misc/hvm-emulated-unplug.markdown @@ -65,4 +65,8 @@ decimal number. `{product_name}` is a string corresponding to the product number in step 3. The master registry of product names and numbers is in -xen/include/public/hvm/pvdrivers.h +xen/include/public/hvm/pvdrivers.h. + +NOTE: The IO ports implementing the unplug protocol are implemented +as part of the Xen Platform PCI Device, so if that device is not +present in the system then this protocol will not work. diff --git a/xen/include/public/hvm/pvdrivers.h b/xen/include/public/hvm/pvdrivers.h index 4c6b705..77994d2 100644 --- a/xen/include/public/hvm/pvdrivers.h +++ b/xen/include/public/hvm/pvdrivers.h @@ -38,10 +38,12 @@ * indicate a driver which is yet to be released. */ -#define PVDRIVERS_PRODUCT_LIST(EACH) \ - EACH("xensource-windows", 0x0001) /* Citrix */ \ - EACH("gplpv-windows", 0x0002) /* James Harper */ \ - EACH("linux", 0x0003) \ - EACH("experimental", 0xffff) +#define PVDRIVERS_PRODUCT_LIST(EACH) \ + EACH("xensource-windows", 0x0001) /* Citrix */ \ + EACH("gplpv-windows", 0x0002) /* James Harper */ \ + EACH("linux", 0x0003) \ + EACH("xenserver-windows-v7.0+", 0x0004) /* Citrix */ \ + EACH("xenserver-windows-v7.2+", 0x0005) /* Citrix */ \ + EACH("experimental", 0xffff) #endif /* _XEN_PUBLIC_PVDRIVERS_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 Nov 05 10:34:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1Vddxu-0007fC-4i; Tue, 05 Nov 2013 10:34:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxs-0007em-Gq for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:28 +0000 Received: from [85.158.143.35:25472] by server-2.bemta-4.messagelabs.com id D0/32-06473-3B9C8725; Tue, 05 Nov 2013 10:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1383647666!1041331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11266 invoked from network); 5 Nov 2013 10:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxq-0008Du-0R for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddxp-0003hv-Lz for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:25 +0000 Date: Tue, 05 Nov 2013 10:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: tidy up usages of fcntl in select-type sample application X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098ef0c4d4e0b867e86ddbb9ebc813bb8c2ad617 Author: Matthew Daley AuthorDate: Fri Nov 1 13:33:23 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 4 17:13:38 2013 +0000 libvchan: tidy up usages of fcntl in select-type sample application Namely, don't overwrite all the other flags when twiddling O_NONBLOCK, and add basic error handling. Coverity-ID: 1055041 Signed-off-by: Matthew Daley Acked-by: Ian Campbell Reviewed-by: Daniel De Graaf --- tools/libvchan/node-select.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tools/libvchan/node-select.c b/tools/libvchan/node-select.c index 6c6c19e..13c5822 100644 --- a/tools/libvchan/node-select.c +++ b/tools/libvchan/node-select.c @@ -80,6 +80,22 @@ void stdout_wr() { } } +static int set_nonblocking(int fd, int nonblocking) { + int flags = fcntl(fd, F_GETFL); + if (flags == -1) + return -1; + + if (nonblocking) + flags |= O_NONBLOCK; + else + flags &= ~O_NONBLOCK; + + if (fcntl(fd, F_SETFL, flags) == -1) + return -1; + + return 0; +} + /** Simple libxenvchan application, both client and server. Both sides may write and read, both from the libxenvchan and from @@ -105,8 +121,10 @@ int main(int argc, char **argv) exit(1); } - fcntl(0, F_SETFL, O_NONBLOCK); - fcntl(1, F_SETFL, O_NONBLOCK); + if (set_nonblocking(0, 1) || set_nonblocking(1, 1)) { + perror("set_nonblocking"); + exit(1); + } libxenvchan_fd = libxenvchan_fd_for_select(ctrl); for (;;) { @@ -153,7 +171,10 @@ int main(int argc, char **argv) stdout_wr(); } if (!libxenvchan_is_open(ctrl)) { - fcntl(1, F_SETFL, 0); + if (set_nonblocking(1, 0)) { + perror("set_nonblocking"); + exit(1); + } while (outsiz) stdout_wr(); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:34:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1Vddxu-0007fC-4i; Tue, 05 Nov 2013 10:34:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxs-0007em-Gq for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:28 +0000 Received: from [85.158.143.35:25472] by server-2.bemta-4.messagelabs.com id D0/32-06473-3B9C8725; Tue, 05 Nov 2013 10:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1383647666!1041331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11266 invoked from network); 5 Nov 2013 10:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddxq-0008Du-0R for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddxp-0003hv-Lz for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:25 +0000 Date: Tue, 05 Nov 2013 10:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: tidy up usages of fcntl in select-type sample application X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 098ef0c4d4e0b867e86ddbb9ebc813bb8c2ad617 Author: Matthew Daley AuthorDate: Fri Nov 1 13:33:23 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 4 17:13:38 2013 +0000 libvchan: tidy up usages of fcntl in select-type sample application Namely, don't overwrite all the other flags when twiddling O_NONBLOCK, and add basic error handling. Coverity-ID: 1055041 Signed-off-by: Matthew Daley Acked-by: Ian Campbell Reviewed-by: Daniel De Graaf --- tools/libvchan/node-select.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tools/libvchan/node-select.c b/tools/libvchan/node-select.c index 6c6c19e..13c5822 100644 --- a/tools/libvchan/node-select.c +++ b/tools/libvchan/node-select.c @@ -80,6 +80,22 @@ void stdout_wr() { } } +static int set_nonblocking(int fd, int nonblocking) { + int flags = fcntl(fd, F_GETFL); + if (flags == -1) + return -1; + + if (nonblocking) + flags |= O_NONBLOCK; + else + flags &= ~O_NONBLOCK; + + if (fcntl(fd, F_SETFL, flags) == -1) + return -1; + + return 0; +} + /** Simple libxenvchan application, both client and server. Both sides may write and read, both from the libxenvchan and from @@ -105,8 +121,10 @@ int main(int argc, char **argv) exit(1); } - fcntl(0, F_SETFL, O_NONBLOCK); - fcntl(1, F_SETFL, O_NONBLOCK); + if (set_nonblocking(0, 1) || set_nonblocking(1, 1)) { + perror("set_nonblocking"); + exit(1); + } libxenvchan_fd = libxenvchan_fd_for_select(ctrl); for (;;) { @@ -153,7 +171,10 @@ int main(int argc, char **argv) stdout_wr(); } if (!libxenvchan_is_open(ctrl)) { - fcntl(1, F_SETFL, 0); + if (set_nonblocking(1, 0)) { + perror("set_nonblocking"); + exit(1); + } while (outsiz) stdout_wr(); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:34:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1Vddy4-0007hn-7d; Tue, 05 Nov 2013 10:34:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddy2-0007hN-U3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:39 +0000 Received: from [85.158.143.35:28783] by server-3.bemta-4.messagelabs.com id A4/5C-19578-EB9C8725; Tue, 05 Nov 2013 10:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1383647676!1036716!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7054 invoked from network); 5 Nov 2013 10:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddy0-0008E2-Gj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddy0-0003iM-5b for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:36 +0000 Date: Tue, 05 Nov 2013 10:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: enable 32bit kernel stack trace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 785e2c1f5d45225a43ea0d46702fc09d508e04bd Author: Bamvor Jian Zhang AuthorDate: Mon Nov 4 16:01:25 2013 +0800 Commit: Ian Campbell CommitDate: Mon Nov 4 17:34:49 2013 +0000 xen: arm: enable 32bit kernel stack trace Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c0fc32..287dd7b 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -629,12 +629,20 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; case PSR_MODE_FIQ: + sp = regs->sp_fiq; + break; case PSR_MODE_IRQ: + sp = regs->sp_irq; + break; case PSR_MODE_SVC: + sp = regs->sp_svc; + break; case PSR_MODE_ABT: + sp = regs->sp_abt; + break; case PSR_MODE_UND: - printk("No stack trace for 32-bit guest kernel-mode\n"); - return; + sp = regs->sp_und; + break; #ifdef CONFIG_ARM_64 case PSR_MODE_EL1t: -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:34:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1Vddy4-0007hn-7d; Tue, 05 Nov 2013 10:34:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddy2-0007hN-U3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:39 +0000 Received: from [85.158.143.35:28783] by server-3.bemta-4.messagelabs.com id A4/5C-19578-EB9C8725; Tue, 05 Nov 2013 10:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1383647676!1036716!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7054 invoked from network); 5 Nov 2013 10:34:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddy0-0008E2-Gj for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddy0-0003iM-5b for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:36 +0000 Date: Tue, 05 Nov 2013 10:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: enable 32bit kernel stack trace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 785e2c1f5d45225a43ea0d46702fc09d508e04bd Author: Bamvor Jian Zhang AuthorDate: Mon Nov 4 16:01:25 2013 +0800 Commit: Ian Campbell CommitDate: Mon Nov 4 17:34:49 2013 +0000 xen: arm: enable 32bit kernel stack trace Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c0fc32..287dd7b 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -629,12 +629,20 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; case PSR_MODE_FIQ: + sp = regs->sp_fiq; + break; case PSR_MODE_IRQ: + sp = regs->sp_irq; + break; case PSR_MODE_SVC: + sp = regs->sp_svc; + break; case PSR_MODE_ABT: + sp = regs->sp_abt; + break; case PSR_MODE_UND: - printk("No stack trace for 32-bit guest kernel-mode\n"); - return; + sp = regs->sp_und; + break; #ifdef CONFIG_ARM_64 case PSR_MODE_EL1t: -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:34:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1VddyF-0007kV-Au; Tue, 05 Nov 2013 10:34:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyD-0007k9-R3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:49 +0000 Received: from [85.158.139.211:63514] by server-2.bemta-5.messagelabs.com id 84/87-14533-8C9C8725; Tue, 05 Nov 2013 10:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383647687!66518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6122 invoked from network); 5 Nov 2013 10:34:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyA-0008E8-SO for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyA-0003ii-Ms for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:46 +0000 Date: Tue, 05 Nov 2013 10:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add default kernel_start in xenctx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d641f428533e0d1232c1d1646263a8f5f430ca50 Author: Bamvor Jian Zhang AuthorDate: Mon Nov 4 16:01:26 2013 +0800 Commit: Ian Campbell CommitDate: Mon Nov 4 17:35:05 2013 +0000 xen: arm: add default kernel_start in xenctx Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index c4b7912..57e3277 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -69,10 +69,12 @@ struct symbol { guest_word_t kernel_stext, kernel_etext, kernel_sinittext, kernel_einittext, kernel_hypercallpage; -#if defined (__i386__) +#if defined (__i386__) || defined (__arm__) unsigned long long kernel_start = 0xc0000000; -#else +#elif defined (__x86_64__) unsigned long long kernel_start = 0xffffffff80000000UL; +#elif defined (__aarch64__) +unsigned long long kernel_start = 0xffffff8000000000UL; #endif static int is_kernel_text(guest_word_t addr) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:34:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:34: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 1VddyF-0007kV-Au; Tue, 05 Nov 2013 10:34:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyD-0007k9-R3 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:49 +0000 Received: from [85.158.139.211:63514] by server-2.bemta-5.messagelabs.com id 84/87-14533-8C9C8725; Tue, 05 Nov 2013 10:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383647687!66518!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6122 invoked from network); 5 Nov 2013 10:34:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyA-0008E8-SO for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyA-0003ii-Ms for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:46 +0000 Date: Tue, 05 Nov 2013 10:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add default kernel_start in xenctx X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d641f428533e0d1232c1d1646263a8f5f430ca50 Author: Bamvor Jian Zhang AuthorDate: Mon Nov 4 16:01:26 2013 +0800 Commit: Ian Campbell CommitDate: Mon Nov 4 17:35:05 2013 +0000 xen: arm: add default kernel_start in xenctx Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index c4b7912..57e3277 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -69,10 +69,12 @@ struct symbol { guest_word_t kernel_stext, kernel_etext, kernel_sinittext, kernel_einittext, kernel_hypercallpage; -#if defined (__i386__) +#if defined (__i386__) || defined (__arm__) unsigned long long kernel_start = 0xc0000000; -#else +#elif defined (__x86_64__) unsigned long long kernel_start = 0xffffffff80000000UL; +#elif defined (__aarch64__) +unsigned long long kernel_start = 0xffffff8000000000UL; #endif static int is_kernel_text(guest_word_t addr) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:35:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35: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 1VddyR-0007mi-1V; Tue, 05 Nov 2013 10:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyP-0007mR-1O for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:01 +0000 Received: from [85.158.139.211:64698] by server-1.bemta-5.messagelabs.com id E0/29-14490-4D9C8725; Tue, 05 Nov 2013 10:35:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1383647698!59050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23101 invoked from network); 5 Nov 2013 10:34:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyM-0008EH-2X for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyL-0003jR-Vm for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:58 +0000 Date: Tue, 05 Nov 2013 10:34:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARINC653: fix sched_priv corruption in alloc_vdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8b037eaf34233791124bf4da1f7a22c98e42523 Author: Nathan Studer AuthorDate: Mon Nov 4 16:20:33 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 16:20:33 2013 +0100 ARINC653: fix sched_priv corruption in alloc_vdata The ARINC653 scheduler was directly assigning and manipulating the sched_priv field of a vcpu in its alloc_vdata function. When creating a cpu pool, this resulted in the corruption of the sched_priv field of the vcpu, which was then passed to the initial scheduler's free_vdata function with disastrous results. Signed-off-by: Nathan Studer Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/sched_arinc653.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 2502192..e5a423f 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -380,11 +380,14 @@ a653sched_deinit(const struct scheduler *ops) static void * a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) { - /* + arinc653_vcpu_t *svc; + + /* * Allocate memory for the ARINC 653-specific scheduler data information - * associated with the given VCPU (vc). - */ - if ( (vc->sched_priv = xmalloc(arinc653_vcpu_t)) == NULL ) + * associated with the given VCPU (vc). + */ + svc = xmalloc(arinc653_vcpu_t); + if ( svc == NULL ) return NULL; /* @@ -393,13 +396,13 @@ a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) * will call the vcpu_wake scheduler callback function and our scheduler * will mark the VCPU awake. */ - AVCPU(vc)->vc = vc; - AVCPU(vc)->awake = 0; + svc->vc = vc; + svc->awake = 0; if ( !is_idle_vcpu(vc) ) - list_add(&AVCPU(vc)->list, &SCHED_PRIV(ops)->vcpu_list); + list_add(&svc->list, &SCHED_PRIV(ops)->vcpu_list); update_schedule_vcpus(ops); - return AVCPU(vc); + return svc; } /** -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:35:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35: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 1VddyR-0007mi-1V; Tue, 05 Nov 2013 10:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyP-0007mR-1O for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:01 +0000 Received: from [85.158.139.211:64698] by server-1.bemta-5.messagelabs.com id E0/29-14490-4D9C8725; Tue, 05 Nov 2013 10:35:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1383647698!59050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23101 invoked from network); 5 Nov 2013 10:34:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:34:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyM-0008EH-2X for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyL-0003jR-Vm for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:34:58 +0000 Date: Tue, 05 Nov 2013 10:34:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARINC653: fix sched_priv corruption in alloc_vdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8b037eaf34233791124bf4da1f7a22c98e42523 Author: Nathan Studer AuthorDate: Mon Nov 4 16:20:33 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 16:20:33 2013 +0100 ARINC653: fix sched_priv corruption in alloc_vdata The ARINC653 scheduler was directly assigning and manipulating the sched_priv field of a vcpu in its alloc_vdata function. When creating a cpu pool, this resulted in the corruption of the sched_priv field of the vcpu, which was then passed to the initial scheduler's free_vdata function with disastrous results. Signed-off-by: Nathan Studer Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/sched_arinc653.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 2502192..e5a423f 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -380,11 +380,14 @@ a653sched_deinit(const struct scheduler *ops) static void * a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) { - /* + arinc653_vcpu_t *svc; + + /* * Allocate memory for the ARINC 653-specific scheduler data information - * associated with the given VCPU (vc). - */ - if ( (vc->sched_priv = xmalloc(arinc653_vcpu_t)) == NULL ) + * associated with the given VCPU (vc). + */ + svc = xmalloc(arinc653_vcpu_t); + if ( svc == NULL ) return NULL; /* @@ -393,13 +396,13 @@ a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) * will call the vcpu_wake scheduler callback function and our scheduler * will mark the VCPU awake. */ - AVCPU(vc)->vc = vc; - AVCPU(vc)->awake = 0; + svc->vc = vc; + svc->awake = 0; if ( !is_idle_vcpu(vc) ) - list_add(&AVCPU(vc)->list, &SCHED_PRIV(ops)->vcpu_list); + list_add(&svc->list, &SCHED_PRIV(ops)->vcpu_list); update_schedule_vcpus(ops); - return AVCPU(vc); + return svc; } /** -- generated by git-patchbot for /home/xen/git/xen.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 Nov 05 10:35:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35: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 1Vddyb-0007oh-5J; Tue, 05 Nov 2013 10:35:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyZ-0007oJ-5A for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:11 +0000 Received: from [85.158.139.211:8478] by server-8.bemta-5.messagelabs.com id 77/1B-32206-ED9C8725; Tue, 05 Nov 2013 10:35:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1383647708!63341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30151 invoked from network); 5 Nov 2013 10:35:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:35:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyW-0008En-AS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyW-0003k0-6j for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:08 +0000 Date: Tue, 05 Nov 2013 10:35:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARINC653: fix NULL pointer dereference in free_vdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77b590e41517c7409ab841238683e861acc528dd Author: Nathan Studer AuthorDate: Mon Nov 4 16:21:11 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 16:21:11 2013 +0100 ARINC653: fix NULL pointer dereference in free_vdata The ARINC653 scheduler alloc_vdata function does not add the idle cpu to its internal vcpu_list, but when the free_vdata function is called, the scheduler attempted to remove the vcpu from its internal vcpu_list, regardless of whether or not the vcpu was the idle vcpu. Since the idle vcpu's list field was never initialized, a NULL pointer was passed to list_del. When using cpupools, this resulted in a crash when moving a cpu from an arinc653 scheduler pool. Signed-off-by: Nathan Studer Acked-by: George Dunlap Reviewed-by: Andrew Cooper --- xen/common/sched_arinc653.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index e5a423f..7b7b387 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -418,7 +418,9 @@ a653sched_free_vdata(const struct scheduler *ops, void *priv) if (av == NULL) return; - list_del(&av->list); + if ( !is_idle_vcpu(av->vc) ) + list_del(&av->list); + xfree(av); update_schedule_vcpus(ops); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:35:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35: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 1Vddyb-0007oh-5J; Tue, 05 Nov 2013 10:35:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyZ-0007oJ-5A for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:11 +0000 Received: from [85.158.139.211:8478] by server-8.bemta-5.messagelabs.com id 77/1B-32206-ED9C8725; Tue, 05 Nov 2013 10:35:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1383647708!63341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30151 invoked from network); 5 Nov 2013 10:35:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:35:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VddyW-0008En-AS for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VddyW-0003k0-6j for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:08 +0000 Date: Tue, 05 Nov 2013 10:35:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ARINC653: fix NULL pointer dereference in free_vdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77b590e41517c7409ab841238683e861acc528dd Author: Nathan Studer AuthorDate: Mon Nov 4 16:21:11 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 16:21:11 2013 +0100 ARINC653: fix NULL pointer dereference in free_vdata The ARINC653 scheduler alloc_vdata function does not add the idle cpu to its internal vcpu_list, but when the free_vdata function is called, the scheduler attempted to remove the vcpu from its internal vcpu_list, regardless of whether or not the vcpu was the idle vcpu. Since the idle vcpu's list field was never initialized, a NULL pointer was passed to list_del. When using cpupools, this resulted in a crash when moving a cpu from an arinc653 scheduler pool. Signed-off-by: Nathan Studer Acked-by: George Dunlap Reviewed-by: Andrew Cooper --- xen/common/sched_arinc653.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index e5a423f..7b7b387 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -418,7 +418,9 @@ a653sched_free_vdata(const struct scheduler *ops, void *priv) if (av == NULL) return; - list_del(&av->list); + if ( !is_idle_vcpu(av->vc) ) + list_del(&av->list); + xfree(av); update_schedule_vcpus(ops); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:35:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyl-0007r6-8S; Tue, 05 Nov 2013 10:35:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyj-0007qd-Gi for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:21 +0000 Received: from [193.109.254.147:14016] by server-4.bemta-14.messagelabs.com id 7C/38-22292-8E9C8725; Tue, 05 Nov 2013 10:35:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1383647719!703305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6507 invoked from network); 5 Nov 2013 10:35:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:35:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyh-0008Ew-0m for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddyg-0003lB-Ka for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:18 +0000 Date: Tue, 05 Nov 2013 10:35:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68bd172e6fa565899c846eb72755c8ffd8562c8a Merge: d641f428533e0d1232c1d1646263a8f5f430ca50 77b590e41517c7409ab841238683e861acc528dd Author: Ian Campbell AuthorDate: Mon Nov 4 17:50:20 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 4 17:50:20 2013 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/common/sched_arinc653.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 10:35:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 10:35:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyl-0007r6-8S; Tue, 05 Nov 2013 10:35:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyj-0007qd-Gi for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:21 +0000 Received: from [193.109.254.147:14016] by server-4.bemta-14.messagelabs.com id 7C/38-22292-8E9C8725; Tue, 05 Nov 2013 10:35:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1383647719!703305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6507 invoked from network); 5 Nov 2013 10:35:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 10:35:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vddyh-0008Ew-0m for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vddyg-0003lB-Ka for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 10:35:18 +0000 Date: Tue, 05 Nov 2013 10:35:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68bd172e6fa565899c846eb72755c8ffd8562c8a Merge: d641f428533e0d1232c1d1646263a8f5f430ca50 77b590e41517c7409ab841238683e861acc528dd Author: Ian Campbell AuthorDate: Mon Nov 4 17:50:20 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 4 17:50:20 2013 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/common/sched_arinc653.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 15:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 15:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHb-0001Kz-Gp; Tue, 05 Nov 2013 15: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 1VdiHZ-0001Kh-Nk for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:05 +0000 Received: from [193.109.254.147:30956] by server-16.bemta-14.messagelabs.com id 6C/47-03396-88A09725; Tue, 05 Nov 2013 15:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383664263!821357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18362 invoked from network); 5 Nov 2013 15:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHX-0003Pg-9i for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdiHX-0003Ry-57 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:03 +0000 Date: Tue, 05 Nov 2013 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d84c32b7349cf1bb26f0cda7c9ac2cba3d077ac7 Author: Jan Beulich AuthorDate: Mon Nov 4 10:13:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:13:04 2013 +0100 update Xen version to 4.3.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index c5ba629..8a11b41 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 15:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 15:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHb-0001Kz-Gp; Tue, 05 Nov 2013 15: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 1VdiHZ-0001Kh-Nk for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:05 +0000 Received: from [193.109.254.147:30956] by server-16.bemta-14.messagelabs.com id 6C/47-03396-88A09725; Tue, 05 Nov 2013 15:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1383664263!821357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18362 invoked from network); 5 Nov 2013 15:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 15:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHX-0003Pg-9i for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdiHX-0003Ry-57 for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:03 +0000 Date: Tue, 05 Nov 2013 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d84c32b7349cf1bb26f0cda7c9ac2cba3d077ac7 Author: Jan Beulich AuthorDate: Mon Nov 4 10:13:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:13:04 2013 +0100 update Xen version to 4.3.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index c5ba629..8a11b41 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 05 15:11:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 15:11: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 1VdiHl-0001Mj-0v; Tue, 05 Nov 2013 15:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHk-0001MU-Cn for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:16 +0000 Received: from [85.158.137.68:2201] by server-14.bemta-3.messagelabs.com id B9/C0-20312-39A09725; Tue, 05 Nov 2013 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1383664273!1745560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9701 invoked from network); 5 Nov 2013 15:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHh-0003Pm-HD for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdiHh-0003SM-DK for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:13 +0000 Date: Tue, 05 Nov 2013 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96b59ae2dcaa639a4f58c68f122f8ba8738009dc Author: Andrew Cooper AuthorDate: Mon Nov 4 10:13:59 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:13:59 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3f97328..9182a44 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1518,6 +1518,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1626,16 +1628,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1647,6 +1651,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !domain_adjust_tot_pages(e, -1); + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- 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 Nov 05 15:11:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Nov 2013 15:11: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 1VdiHl-0001Mj-0v; Tue, 05 Nov 2013 15:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHk-0001MU-Cn for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:16 +0000 Received: from [85.158.137.68:2201] by server-14.bemta-3.messagelabs.com id B9/C0-20312-39A09725; Tue, 05 Nov 2013 15:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1383664273!1745560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9701 invoked from network); 5 Nov 2013 15:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Nov 2013 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdiHh-0003Pm-HD for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VdiHh-0003SM-DK for xen-changelog@lists.xensource.com; Tue, 05 Nov 2013 15:11:13 +0000 Date: Tue, 05 Nov 2013 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] gnttab: correct locking order reversal X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96b59ae2dcaa639a4f58c68f122f8ba8738009dc Author: Andrew Cooper AuthorDate: Mon Nov 4 10:13:59 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 4 10:13:59 2013 +0100 gnttab: correct locking order reversal Coverity ID 1087189 Correct a lock order reversal between a domains page allocation and grant table locks. This is CVE-2013-4494 / XSA-73. Signed-off-by: Andrew Cooper Consolidate error handling. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser Tested-by: Matthew Daley master commit: a321abc6d8122f8cb3928066cc74363c4fdddcfd master date: 2013-11-04 10:06:36 +0100 --- xen/common/grant_table.c | 52 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 3f97328..9182a44 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1518,6 +1518,8 @@ gnttab_transfer( for ( i = 0; i < count; i++ ) { + bool_t okay; + if (i && hypercall_preempt_check()) return i; @@ -1626,16 +1628,18 @@ gnttab_transfer( * pages when it is dying. */ if ( unlikely(e->is_dying) || - unlikely(e->tot_pages >= e->max_pages) || - unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) ) + unlikely(e->tot_pages >= e->max_pages) ) { - if ( !e->is_dying ) - gdprintk(XENLOG_INFO, "gnttab_transfer: " - "Transferee has no reservation " - "headroom (%d,%d) or provided a bad grant ref (%08x) " - "or is dying (%d)\n", - e->tot_pages, e->max_pages, gop.ref, e->is_dying); spin_unlock(&e->page_alloc_lock); + + if ( e->is_dying ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is dying\n", e->domain_id); + else + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) has no headroom (tot %u, max %u)\n", + e->domain_id, e->tot_pages, e->max_pages); + rcu_unlock_domain(e); put_gfn(d, gop.mfn); page->count_info &= ~(PGC_count_mask|PGC_allocated); @@ -1647,6 +1651,38 @@ gnttab_transfer( /* Okay, add the page to 'e'. */ if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) ) get_knownalive_domain(e); + + /* + * We must drop the lock to avoid a possible deadlock in + * gnttab_prepare_for_transfer. We have reserved a page in e so can + * safely drop the lock and re-aquire it later to add page to the + * pagelist. + */ + spin_unlock(&e->page_alloc_lock); + okay = gnttab_prepare_for_transfer(e, d, gop.ref); + spin_lock(&e->page_alloc_lock); + + if ( unlikely(!okay) || unlikely(e->is_dying) ) + { + bool_t drop_dom_ref = !domain_adjust_tot_pages(e, -1); + + spin_unlock(&e->page_alloc_lock); + + if ( okay /* i.e. e->is_dying due to the surrounding if() */ ) + gdprintk(XENLOG_INFO, "gnttab_transfer: " + "Transferee (d%d) is now dying\n", e->domain_id); + + if ( drop_dom_ref ) + put_domain(e); + rcu_unlock_domain(e); + + put_gfn(d, gop.mfn); + page->count_info &= ~(PGC_count_mask|PGC_allocated); + free_domheap_page(page); + gop.status = GNTST_general_error; + goto copyback; + } + page_list_add_tail(page, &e->page_list); page_set_owner(page, e); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1B-0006C9-UE; Wed, 06 Nov 2013 06:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx19-0006By-UF for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:08 +0000 Received: from [85.158.143.35:4181] by server-1.bemta-4.messagelabs.com id 22/6E-17304-BC7E9725; Wed, 06 Nov 2013 06:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1383720905!1271874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 848 invoked from network); 6 Nov 2013 06:55:06 -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; 6 Nov 2013 06:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx17-0005F8-7C for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx16-0005DQ-Uz for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:04 +0000 Date: Wed, 06 Nov 2013 06:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Basic support for sunxi/sun7i platform. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 537cea2aceb02dae5a5a4508fb8236d3ef0ca868 Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:10 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:40 2013 +0000 xen/arm: Basic support for sunxi/sun7i platform. Specifically cubieboard2 Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/sunxi.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 7535801..f0dd72c 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -2,3 +2,4 @@ obj-y += vexpress.o obj-$(CONFIG_ARM_32) += exynos5.o obj-$(CONFIG_ARM_32) += midway.o obj-$(CONFIG_ARM_32) += omap5.o +obj-$(CONFIG_ARM_32) += sunxi.o diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c new file mode 100644 index 0000000..ab3b4a6 --- /dev/null +++ b/xen/arch/arm/platforms/sunxi.c @@ -0,0 +1,38 @@ +/* + * xen/arch/arm/platforms/sunxi.c + * + * SUNXI (AllWinner A20/A31) specific settings + * + * Copyright (c) 2013 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 + +static const char * const sunxi_dt_compat[] __initconst = +{ + "allwinner,sun7i-a20", + NULL +}; + +PLATFORM_START(sunxi, "Allwinner A20") + .compatible = sunxi_dt_compat, +PLATFORM_END + +/* + * 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 Wed Nov 06 06:55:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1B-0006C9-UE; Wed, 06 Nov 2013 06:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx19-0006By-UF for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:08 +0000 Received: from [85.158.143.35:4181] by server-1.bemta-4.messagelabs.com id 22/6E-17304-BC7E9725; Wed, 06 Nov 2013 06:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1383720905!1271874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 848 invoked from network); 6 Nov 2013 06:55:06 -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; 6 Nov 2013 06:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx17-0005F8-7C for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx16-0005DQ-Uz for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:04 +0000 Date: Wed, 06 Nov 2013 06:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Basic support for sunxi/sun7i platform. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 537cea2aceb02dae5a5a4508fb8236d3ef0ca868 Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:10 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:40 2013 +0000 xen/arm: Basic support for sunxi/sun7i platform. Specifically cubieboard2 Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/sunxi.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 7535801..f0dd72c 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -2,3 +2,4 @@ obj-y += vexpress.o obj-$(CONFIG_ARM_32) += exynos5.o obj-$(CONFIG_ARM_32) += midway.o obj-$(CONFIG_ARM_32) += omap5.o +obj-$(CONFIG_ARM_32) += sunxi.o diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c new file mode 100644 index 0000000..ab3b4a6 --- /dev/null +++ b/xen/arch/arm/platforms/sunxi.c @@ -0,0 +1,38 @@ +/* + * xen/arch/arm/platforms/sunxi.c + * + * SUNXI (AllWinner A20/A31) specific settings + * + * Copyright (c) 2013 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 + +static const char * const sunxi_dt_compat[] __initconst = +{ + "allwinner,sun7i-a20", + NULL +}; + +PLATFORM_START(sunxi, "Allwinner A20") + .compatible = sunxi_dt_compat, +PLATFORM_END + +/* + * 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 Wed Nov 06 06:55:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55: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 1Vdx1M-0006Cf-0o; Wed, 06 Nov 2013 06:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1K-0006CS-Nb for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:18 +0000 Received: from [85.158.137.68:42021] by server-8.bemta-3.messagelabs.com id 2E/C4-06638-5D7E9725; Wed, 06 Nov 2013 06:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1383720915!1834316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3142 invoked from network); 6 Nov 2013 06:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1H-0005FB-Cl for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1H-0005Do-AG for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:15 +0000 Date: Wed, 06 Nov 2013 06:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Blacklist sun7i UARTs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 601ac1e216def3167fc208db1c80ddca6928e2c5 Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:11 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:47 2013 +0000 xen/arm: Blacklist sun7i UARTs These are in the same page as the UART which is used as the Xen console. We are not currently smart enough to avoid passing them through to the guest, accidentally giving the guest access to the Xen console UART. we blacklist them all, if necessary in the future we can split the list into two halves and make a per platform decision about which half should be blacklisted on a given platform depending on which UART is wired up as the console. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/sunxi.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c index ab3b4a6..b466518 100644 --- a/xen/arch/arm/platforms/sunxi.c +++ b/xen/arch/arm/platforms/sunxi.c @@ -24,8 +24,19 @@ static const char * const sunxi_dt_compat[] __initconst = NULL }; +static const struct dt_device_match sunxi_blacklist_dev[] __initconst = +{ + /* + * The UARTs share a page which runs the risk of mapping the Xen console + * UART to dom0, so don't map any of them. + */ + DT_MATCH_COMPATIBLE("snps,dw-apb-uart"), + { /* sentinel */ }, +}; + PLATFORM_START(sunxi, "Allwinner A20") .compatible = sunxi_dt_compat, + .blacklist_dev = sunxi_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 Wed Nov 06 06:55:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55: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 1Vdx1M-0006Cf-0o; Wed, 06 Nov 2013 06:55:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1K-0006CS-Nb for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:18 +0000 Received: from [85.158.137.68:42021] by server-8.bemta-3.messagelabs.com id 2E/C4-06638-5D7E9725; Wed, 06 Nov 2013 06:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1383720915!1834316!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3142 invoked from network); 6 Nov 2013 06:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1H-0005FB-Cl for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1H-0005Do-AG for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:15 +0000 Date: Wed, 06 Nov 2013 06:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Blacklist sun7i UARTs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 601ac1e216def3167fc208db1c80ddca6928e2c5 Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:11 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:47 2013 +0000 xen/arm: Blacklist sun7i UARTs These are in the same page as the UART which is used as the Xen console. We are not currently smart enough to avoid passing them through to the guest, accidentally giving the guest access to the Xen console UART. we blacklist them all, if necessary in the future we can split the list into two halves and make a per platform decision about which half should be blacklisted on a given platform depending on which UART is wired up as the console. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/sunxi.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c index ab3b4a6..b466518 100644 --- a/xen/arch/arm/platforms/sunxi.c +++ b/xen/arch/arm/platforms/sunxi.c @@ -24,8 +24,19 @@ static const char * const sunxi_dt_compat[] __initconst = NULL }; +static const struct dt_device_match sunxi_blacklist_dev[] __initconst = +{ + /* + * The UARTs share a page which runs the risk of mapping the Xen console + * UART to dom0, so don't map any of them. + */ + DT_MATCH_COMPATIBLE("snps,dw-apb-uart"), + { /* sentinel */ }, +}; + PLATFORM_START(sunxi, "Allwinner A20") .compatible = sunxi_dt_compat, + .blacklist_dev = sunxi_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 Wed Nov 06 06:55:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1W-0006E3-48; Wed, 06 Nov 2013 06:55:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1U-0006Do-JK for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:28 +0000 Received: from [85.158.137.68:56070] by server-8.bemta-3.messagelabs.com id FC/E4-06638-FD7E9725; Wed, 06 Nov 2013 06:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1383720925!1850546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5847 invoked from network); 6 Nov 2013 06:55:27 -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; 6 Nov 2013 06:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1R-0005FH-Kw for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1R-0005EA-Fb for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:25 +0000 Date: Wed, 06 Nov 2013 06:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: consitfy platform compatibility lists and use __initconst X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d954661113dd8a8640d77b295b3598d59dacf4a Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:12 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:50 2013 +0000 xen: arm: consitfy platform compatibility lists and use __initconst Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 2 +- xen/arch/arm/platforms/midway.c | 2 +- xen/arch/arm/platforms/omap5.c | 2 +- xen/arch/arm/platforms/vexpress.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index a2bf916..0e76cac 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -116,7 +116,7 @@ static uint32_t exynos5_quirks(void) return PLATFORM_QUIRK_DOM0_MAPPING_11; } -static const char * const exynos5_dt_compat[] __initdata = +static const char * const exynos5_dt_compat[] __initconst = { "samsung,exynos5250", NULL diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c index a48fc84..b221279 100644 --- a/xen/arch/arm/platforms/midway.c +++ b/xen/arch/arm/platforms/midway.c @@ -42,7 +42,7 @@ static void midway_reset(void) iounmap(pmu); } -static const char * const midway_dt_compat[] __initdata = +static const char * const midway_dt_compat[] __initconst = { "calxeda,ecx-2000", NULL diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index bd9db74..54fa5ff 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -158,7 +158,7 @@ static uint32_t omap5_quirks(void) return PLATFORM_QUIRK_DOM0_MAPPING_11; } -static const char const *omap5_dt_compat[] __initdata = +static const char const *omap5_dt_compat[] __initconst = { "ti,omap5", NULL diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index b9d85af..9056366 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -154,7 +154,7 @@ static int __init vexpress_cpu_up(int cpu) } #endif -static const char * const vexpress_dt_compat[] __initdata = +static const char * const vexpress_dt_compat[] __initconst = { "arm,vexpress", NULL -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1W-0006E3-48; Wed, 06 Nov 2013 06:55:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1U-0006Do-JK for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:28 +0000 Received: from [85.158.137.68:56070] by server-8.bemta-3.messagelabs.com id FC/E4-06638-FD7E9725; Wed, 06 Nov 2013 06:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1383720925!1850546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5847 invoked from network); 6 Nov 2013 06:55:27 -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; 6 Nov 2013 06:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1R-0005FH-Kw for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1R-0005EA-Fb for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:25 +0000 Date: Wed, 06 Nov 2013 06:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: consitfy platform compatibility lists and use __initconst X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d954661113dd8a8640d77b295b3598d59dacf4a Author: Ian Campbell AuthorDate: Fri Nov 1 14:03:12 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 5 11:33:50 2013 +0000 xen: arm: consitfy platform compatibility lists and use __initconst Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 2 +- xen/arch/arm/platforms/midway.c | 2 +- xen/arch/arm/platforms/omap5.c | 2 +- xen/arch/arm/platforms/vexpress.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index a2bf916..0e76cac 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -116,7 +116,7 @@ static uint32_t exynos5_quirks(void) return PLATFORM_QUIRK_DOM0_MAPPING_11; } -static const char * const exynos5_dt_compat[] __initdata = +static const char * const exynos5_dt_compat[] __initconst = { "samsung,exynos5250", NULL diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c index a48fc84..b221279 100644 --- a/xen/arch/arm/platforms/midway.c +++ b/xen/arch/arm/platforms/midway.c @@ -42,7 +42,7 @@ static void midway_reset(void) iounmap(pmu); } -static const char * const midway_dt_compat[] __initdata = +static const char * const midway_dt_compat[] __initconst = { "calxeda,ecx-2000", NULL diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index bd9db74..54fa5ff 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -158,7 +158,7 @@ static uint32_t omap5_quirks(void) return PLATFORM_QUIRK_DOM0_MAPPING_11; } -static const char const *omap5_dt_compat[] __initdata = +static const char const *omap5_dt_compat[] __initconst = { "ti,omap5", NULL diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index b9d85af..9056366 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -154,7 +154,7 @@ static int __init vexpress_cpu_up(int cpu) } #endif -static const char * const vexpress_dt_compat[] __initdata = +static const char * const vexpress_dt_compat[] __initconst = { "arm,vexpress", NULL -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55: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 1Vdx1g-0006FN-73; Wed, 06 Nov 2013 06:55:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1e-0006F2-7X for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:38 +0000 Received: from [85.158.143.35:42794] by server-2.bemta-4.messagelabs.com id A1/2F-06473-9E7E9725; Wed, 06 Nov 2013 06:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1383720936!1257765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10316 invoked from network); 6 Nov 2013 06:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1b-0005FS-QV for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1b-0005Ed-OT for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:35 +0000 Date: Wed, 06 Nov 2013 06:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/hotplug: add support for getting 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="===============2508009445502817814==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2508009445502817814== Content-Type: text/plain commit d6bc83a531e4cfdd29da95afa992b95be8316080 Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:23 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:37:05 2013 +0000 libxl/hotplug: add support for getting domid This patch writes Dom0 domid on xenstore (like it's done for other guests), and adds a libxl helper function to fetch that domid from xenstore. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- dropped xencommons hunk, same change was made independently in 02ebea7768fe ] --- tools/libxl/libxl.c | 17 +++++++++++++++++ tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bede011..0f0f56c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1692,6 +1692,23 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) return ERROR_FAIL; } +int libxl__get_domid(libxl__gc *gc, uint32_t *domid) +{ + int rc; + const char *xs_domid; + + rc = libxl__xs_read_checked(gc, XBT_NULL, DOMID_XS_PATH, &xs_domid); + if (rc || !xs_domid) { + rc = rc ? rc : ERROR_FAIL; + goto out; + } + + *domid = atoi(xs_domid); + +out: + return rc; +} + /******************************************************************************/ /* generic callback for devices that only need to set ao_complete */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4f92522..4729566 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -101,6 +101,7 @@ #define STUBDOM_SPECIAL_CONSOLES 3 #define TAP_DEVICE_SUFFIX "-emu" #define DISABLE_UDEV_PATH "libxl/disable_udev" +#define DOMID_XS_PATH "domid" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -978,6 +979,8 @@ _hidden const char *libxl__device_nic_devname(libxl__gc *gc, uint32_t devid, libxl_nic_type type); +_hidden int libxl__get_domid(libxl__gc *gc, uint32_t *domid); + /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2508009445502817814== 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 --===============2508009445502817814==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:55: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 1Vdx1g-0006FN-73; Wed, 06 Nov 2013 06:55:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1e-0006F2-7X for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:38 +0000 Received: from [85.158.143.35:42794] by server-2.bemta-4.messagelabs.com id A1/2F-06473-9E7E9725; Wed, 06 Nov 2013 06:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1383720936!1257765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10316 invoked from network); 6 Nov 2013 06:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1b-0005FS-QV for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1b-0005Ed-OT for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:35 +0000 Date: Wed, 06 Nov 2013 06:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/hotplug: add support for getting 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="===============2508009445502817814==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2508009445502817814== Content-Type: text/plain commit d6bc83a531e4cfdd29da95afa992b95be8316080 Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:23 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:37:05 2013 +0000 libxl/hotplug: add support for getting domid This patch writes Dom0 domid on xenstore (like it's done for other guests), and adds a libxl helper function to fetch that domid from xenstore. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson [ ijc -- dropped xencommons hunk, same change was made independently in 02ebea7768fe ] --- tools/libxl/libxl.c | 17 +++++++++++++++++ tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bede011..0f0f56c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1692,6 +1692,23 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) return ERROR_FAIL; } +int libxl__get_domid(libxl__gc *gc, uint32_t *domid) +{ + int rc; + const char *xs_domid; + + rc = libxl__xs_read_checked(gc, XBT_NULL, DOMID_XS_PATH, &xs_domid); + if (rc || !xs_domid) { + rc = rc ? rc : ERROR_FAIL; + goto out; + } + + *domid = atoi(xs_domid); + +out: + return rc; +} + /******************************************************************************/ /* generic callback for devices that only need to set ao_complete */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4f92522..4729566 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -101,6 +101,7 @@ #define STUBDOM_SPECIAL_CONSOLES 3 #define TAP_DEVICE_SUFFIX "-emu" #define DISABLE_UDEV_PATH "libxl/disable_udev" +#define DOMID_XS_PATH "domid" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -978,6 +979,8 @@ _hidden const char *libxl__device_nic_devname(libxl__gc *gc, uint32_t devid, libxl_nic_type type); +_hidden int libxl__get_domid(libxl__gc *gc, uint32_t *domid); + /* * libxl__ev_devstate - waits a given time for a device to * reach a given state. Follows the libxl_ev_* conventions. -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2508009445502817814== 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 --===============2508009445502817814==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx1q-0006Gp-AL; Wed, 06 Nov 2013 06:55:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1p-0006GQ-2L for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:49 +0000 Received: from [85.158.137.68:56930] by server-15.bemta-3.messagelabs.com id C2/44-10403-4F7E9725; Wed, 06 Nov 2013 06:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1383720946!1847753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4987 invoked from network); 6 Nov 2013 06:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1l-0005FY-Vq for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1l-0005Ez-T5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:45 +0000 Date: Wed, 06 Nov 2013 06:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove unneeded libxl_domain_info in wait_device_connection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4654931796387146630==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4654931796387146630== Content-Type: text/plain commit 26609dab56fd64b07ccc0cfd7080dc37665fbdc1 Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:24 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:39:27 2013 +0000 libxl: remove unneeded libxl_domain_info in wait_device_connection The info fetched by libxl_domain_info is not used anywere in the function. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 16a92a4..2971dd3 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -715,16 +715,8 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); - libxl_dominfo info; - uint32_t domid = aodev->dev->domid; int rc = 0; - libxl_dominfo_init(&info); - rc = libxl_domain_info(CTX, &info, domid); - if (rc) { - LOG(ERROR, "unable to get info for domain %d", domid); - goto out; - } if (QEMU_BACKEND(aodev->dev)) { /* * If Qemu is not running, there's no point in waiting for @@ -746,12 +738,10 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) goto out; } - libxl_dominfo_dispose(&info); return; out: aodev->rc = rc; - libxl_dominfo_dispose(&info); device_hotplug_done(egc, aodev); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4654931796387146630== 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 --===============4654931796387146630==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:55:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx1q-0006Gp-AL; Wed, 06 Nov 2013 06:55:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1p-0006GQ-2L for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:49 +0000 Received: from [85.158.137.68:56930] by server-15.bemta-3.messagelabs.com id C2/44-10403-4F7E9725; Wed, 06 Nov 2013 06:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1383720946!1847753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4987 invoked from network); 6 Nov 2013 06:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1l-0005FY-Vq for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1l-0005Ez-T5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:45 +0000 Date: Wed, 06 Nov 2013 06:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove unneeded libxl_domain_info in wait_device_connection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============4654931796387146630==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4654931796387146630== Content-Type: text/plain commit 26609dab56fd64b07ccc0cfd7080dc37665fbdc1 Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:24 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:39:27 2013 +0000 libxl: remove unneeded libxl_domain_info in wait_device_connection The info fetched by libxl_domain_info is not used anywere in the function. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 16a92a4..2971dd3 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -715,16 +715,8 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); - libxl_dominfo info; - uint32_t domid = aodev->dev->domid; int rc = 0; - libxl_dominfo_init(&info); - rc = libxl_domain_info(CTX, &info, domid); - if (rc) { - LOG(ERROR, "unable to get info for domain %d", domid); - goto out; - } if (QEMU_BACKEND(aodev->dev)) { /* * If Qemu is not running, there's no point in waiting for @@ -746,12 +738,10 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) goto out; } - libxl_dominfo_dispose(&info); return; out: aodev->rc = rc; - libxl_dominfo_dispose(&info); device_hotplug_done(egc, aodev); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4654931796387146630== 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 --===============4654931796387146630==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:56:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx22-0006JF-1y; Wed, 06 Nov 2013 06:56:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1z-0006Iu-RL for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:00 +0000 Received: from [85.158.139.211:64886] by server-1.bemta-5.messagelabs.com id 17/29-14490-FF7E9725; Wed, 06 Nov 2013 06:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1383720957!251830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29257 invoked from network); 6 Nov 2013 06:55:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1x-0005Fr-4a for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1w-0005Fu-2b for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:57 +0000 Date: Wed, 06 Nov 2013 06:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make hotplug execution conditional on backend_domid == 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="===============2787331323974889301==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2787331323974889301== Content-Type: text/plain commit 19045bcf3b738f98718fc46e50b35e315c78cf3c Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:25 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:40:49 2013 +0000 libxl: make hotplug execution conditional on backend_domid == domid libxl currently refuses to execute hotplug scripts if the backend domid of a device is different than LIBXL_TOOLSTACK_DOMID. This will prevent libxl from executing hotplug scripts when running on a domain different than LIBXL_TOOLSTACK_DOMID, we should instead check if backend_domid is different than current domid. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 2971dd3..48acc92 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -908,12 +908,15 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) int rc = 0; int hotplug; pid_t pid; + uint32_t domid; /* * If device is attached from a driver domain don't try to execute * hotplug scripts */ - if (aodev->dev->backend_domid != LIBXL_TOOLSTACK_DOMID) + rc = libxl__get_domid(gc, &domid); + if (rc) goto out; + if (aodev->dev->backend_domid != domid) goto out; /* Check if we have to execute hotplug scripts for this device -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2787331323974889301== 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 --===============2787331323974889301==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:56:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx22-0006JF-1y; Wed, 06 Nov 2013 06:56:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1z-0006Iu-RL for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:00 +0000 Received: from [85.158.139.211:64886] by server-1.bemta-5.messagelabs.com id 17/29-14490-FF7E9725; Wed, 06 Nov 2013 06:55:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1383720957!251830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29257 invoked from network); 6 Nov 2013 06:55:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:55:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx1x-0005Fr-4a for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx1w-0005Fu-2b for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:55:57 +0000 Date: Wed, 06 Nov 2013 06:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make hotplug execution conditional on backend_domid == 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="===============2787331323974889301==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2787331323974889301== Content-Type: text/plain commit 19045bcf3b738f98718fc46e50b35e315c78cf3c Author: Roger Pau Monne AuthorDate: Wed Oct 2 11:24:25 2013 +0200 Commit: Ian Campbell CommitDate: Tue Nov 5 11:40:49 2013 +0000 libxl: make hotplug execution conditional on backend_domid == domid libxl currently refuses to execute hotplug scripts if the backend domid of a device is different than LIBXL_TOOLSTACK_DOMID. This will prevent libxl from executing hotplug scripts when running on a domain different than LIBXL_TOOLSTACK_DOMID, we should instead check if backend_domid is different than current domid. Signed-off-by: Roger Pau Monné Acked-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 2971dd3..48acc92 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -908,12 +908,15 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) int rc = 0; int hotplug; pid_t pid; + uint32_t domid; /* * If device is attached from a driver domain don't try to execute * hotplug scripts */ - if (aodev->dev->backend_domid != LIBXL_TOOLSTACK_DOMID) + rc = libxl__get_domid(gc, &domid); + if (rc) goto out; + if (aodev->dev->backend_domid != domid) goto out; /* Check if we have to execute hotplug scripts for this device -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2787331323974889301== 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 --===============2787331323974889301==-- From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:56:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:56: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 1Vdx2C-0006LJ-5g; Wed, 06 Nov 2013 06:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2A-0006Ks-Bj for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:10 +0000 Received: from [193.109.254.147:19301] by server-16.bemta-14.messagelabs.com id 97/CA-03396-908E9725; Wed, 06 Nov 2013 06:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383720967!926873!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14696 invoked from network); 6 Nov 2013 06:56:08 -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; 6 Nov 2013 06:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx27-0005GQ-PR for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx27-0005GU-7P for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:07 +0000 Date: Wed, 06 Nov 2013 06:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .config: Allow all URL(s) to be specified in .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 d2ad65dda332b934bc3cbb0233c9037f05ae34a1 Author: Don Slutz AuthorDate: Mon Nov 4 20:56:23 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 5 11:45:35 2013 +0000 .config: Allow all URL(s) to be specified in .config This allow building of XEN from source on a system without internet access using either the environment or .config Do the same with XEN_EXTFILES_URL, QEMU_REMOTE, IPXE_GIT_URL, and IPXE_TARBALL_URL as QEMU_UPSTREAM_URL, SEABIOS_UPSTREAM_URL, etc. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- Config.mk | 6 +++--- tools/firmware/etherboot/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Config.mk b/Config.mk index 7f3d8c7..9b39d6c 100644 --- a/Config.mk +++ b/Config.mk @@ -213,15 +213,15 @@ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) -XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles +XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git else -QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git endif ifeq ($(GIT_HTTP),y) diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 15561fc..a0578d2 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -5,14 +5,14 @@ include $(XEN_ROOT)/tools/Rules.mk include Config ifeq ($(GIT_HTTP),y) -IPXE_GIT_URL := http://git.ipxe.org/ipxe.git +IPXE_GIT_URL ?= http://git.ipxe.org/ipxe.git else -IPXE_GIT_URL := git://git.ipxe.org/ipxe.git +IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git endif IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e -IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz +IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz D=ipxe T=ipxe.tar.gz -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 06:56:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06:56: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 1Vdx2C-0006LJ-5g; Wed, 06 Nov 2013 06:56:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2A-0006Ks-Bj for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:10 +0000 Received: from [193.109.254.147:19301] by server-16.bemta-14.messagelabs.com id 97/CA-03396-908E9725; Wed, 06 Nov 2013 06:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1383720967!926873!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14696 invoked from network); 6 Nov 2013 06:56:08 -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; 6 Nov 2013 06:56:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx27-0005GQ-PR for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx27-0005GU-7P for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:07 +0000 Date: Wed, 06 Nov 2013 06:56:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .config: Allow all URL(s) to be specified in .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 d2ad65dda332b934bc3cbb0233c9037f05ae34a1 Author: Don Slutz AuthorDate: Mon Nov 4 20:56:23 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 5 11:45:35 2013 +0000 .config: Allow all URL(s) to be specified in .config This allow building of XEN from source on a system without internet access using either the environment or .config Do the same with XEN_EXTFILES_URL, QEMU_REMOTE, IPXE_GIT_URL, and IPXE_TARBALL_URL as QEMU_UPSTREAM_URL, SEABIOS_UPSTREAM_URL, etc. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- Config.mk | 6 +++--- tools/firmware/etherboot/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Config.mk b/Config.mk index 7f3d8c7..9b39d6c 100644 --- a/Config.mk +++ b/Config.mk @@ -213,15 +213,15 @@ EMBEDDED_EXTRA_CFLAGS += -fno-exceptions XSM_ENABLE ?= n FLASK_ENABLE ?= $(XSM_ENABLE) -XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles +XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on # the internet. The original download URL is preserved as a comment # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git else -QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git endif ifeq ($(GIT_HTTP),y) diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 15561fc..a0578d2 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -5,14 +5,14 @@ include $(XEN_ROOT)/tools/Rules.mk include Config ifeq ($(GIT_HTTP),y) -IPXE_GIT_URL := http://git.ipxe.org/ipxe.git +IPXE_GIT_URL ?= http://git.ipxe.org/ipxe.git else -IPXE_GIT_URL := git://git.ipxe.org/ipxe.git +IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git endif IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e -IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz +IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz D=ipxe T=ipxe.tar.gz -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 06:56:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx2M-0006Mq-8r; Wed, 06 Nov 2013 06:56:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2K-0006Ma-TK for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:21 +0000 Received: from [193.109.254.147:28840] by server-7.bemta-14.messagelabs.com id CC/8B-14870-418E9725; Wed, 06 Nov 2013 06:56:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383720978!915770!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11606 invoked from network); 6 Nov 2013 06:56:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:56:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2I-0005GT-4h for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx2I-0005Gs-2K for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:18 +0000 Date: Wed, 06 Nov 2013 06:56:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: 32-bit IN result must be zero-extended to 64 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 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c Author: Jan Beulich AuthorDate: Tue Nov 5 14:51:53 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 5 14:51:53 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/io.c | 11 +++++++++-- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 6e344e4..feb0406 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else + memcpy(&guest_cpu_user_regs()->rax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:56:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx2M-0006Mq-8r; Wed, 06 Nov 2013 06:56:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2K-0006Ma-TK for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:21 +0000 Received: from [193.109.254.147:28840] by server-7.bemta-14.messagelabs.com id CC/8B-14870-418E9725; Wed, 06 Nov 2013 06:56:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383720978!915770!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11606 invoked from network); 6 Nov 2013 06:56:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:56:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2I-0005GT-4h for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx2I-0005Gs-2K for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:18 +0000 Date: Wed, 06 Nov 2013 06:56:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: 32-bit IN result must be zero-extended to 64 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 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c Author: Jan Beulich AuthorDate: Tue Nov 5 14:51:53 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 5 14:51:53 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/io.c | 11 +++++++++-- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 6e344e4..feb0406 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else + memcpy(&guest_cpu_user_regs()->rax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 06:56:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx2W-0006OV-Bc; Wed, 06 Nov 2013 06: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 1Vdx2U-0006O8-Mf for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:30 +0000 Received: from [193.109.254.147:29331] by server-12.bemta-14.messagelabs.com id 30/B6-25062-E18E9725; Wed, 06 Nov 2013 06:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383720988!935675!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27701 invoked from network); 6 Nov 2013 06:56:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2S-0005Ge-BU for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx2S-0005HJ-83 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:28 +0000 Date: Wed, 06 Nov 2013 06:56:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: command line parameter to disable ARAT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f366e276264f61b752d9eea63c42021b8fffec6 Author: Andrew Cooper AuthorDate: Tue Nov 5 16:21:51 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 5 16:21:51 2013 +0100 x86: command line parameter to disable ARAT Signed-off-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 9 +++++++++ xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 3 +++ xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/intel.c | 5 +++-- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index dc72473..15aa404 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -155,6 +155,15 @@ to boot on systems with the following errata: Increase the verbosity of the APIC code from the default value. +### arat +> `= ` + +> Default: `true` + +Permit Xen to use "Always Running APIC Timer" support on compatible hardware +in combination with cpuidle. This option is only expected to be useful for +developers wishing Xen to fall back to older timing methods on newer hardware. + ### ats > `= ` diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 27b7f71..472df68 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -502,7 +502,7 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) * Family 0x12 and above processors have APIC timer * running in deep C states. */ - if (c->x86 > 0x11) + if ( opt_arat && c->x86 > 0x11 ) set_bit(X86_FEATURE_ARAT, c->x86_capability); /* diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e1220e6..32ca458 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -18,6 +18,9 @@ static bool_t __cpuinitdata use_xsave = 1; boolean_param("xsave", use_xsave); +bool_t __devinitdata opt_arat = 1; +boolean_param("arat", opt_arat); + unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 72c41ca..a7b7421 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -11,6 +11,7 @@ struct cpu_dev { extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; +extern bool_t opt_arat; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; extern unsigned int opt_cpuid_mask_xsave_eax; extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 31b69c9..e855211 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -226,8 +226,9 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_NONSTOP_TSC, c->x86_capability); set_bit(X86_FEATURE_TSC_RELIABLE, c->x86_capability); } - if ((c->cpuid_level >= 0x00000006) && - (cpuid_eax(0x00000006) & (1u<<2))) + if ( opt_arat && + ( c->cpuid_level >= 0x00000006 ) && + ( cpuid_eax(0x00000006) & (1u<<2) ) ) set_bit(X86_FEATURE_ARAT, 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 Wed Nov 06 06:56:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 06: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 1Vdx2W-0006OV-Bc; Wed, 06 Nov 2013 06: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 1Vdx2U-0006O8-Mf for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:30 +0000 Received: from [193.109.254.147:29331] by server-12.bemta-14.messagelabs.com id 30/B6-25062-E18E9725; Wed, 06 Nov 2013 06:56:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1383720988!935675!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27701 invoked from network); 6 Nov 2013 06:56:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 06:56:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vdx2S-0005Ge-BU for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vdx2S-0005HJ-83 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 06:56:28 +0000 Date: Wed, 06 Nov 2013 06:56:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: command line parameter to disable ARAT X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f366e276264f61b752d9eea63c42021b8fffec6 Author: Andrew Cooper AuthorDate: Tue Nov 5 16:21:51 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 5 16:21:51 2013 +0100 x86: command line parameter to disable ARAT Signed-off-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 9 +++++++++ xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 3 +++ xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/intel.c | 5 +++-- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index dc72473..15aa404 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -155,6 +155,15 @@ to boot on systems with the following errata: Increase the verbosity of the APIC code from the default value. +### arat +> `= ` + +> Default: `true` + +Permit Xen to use "Always Running APIC Timer" support on compatible hardware +in combination with cpuidle. This option is only expected to be useful for +developers wishing Xen to fall back to older timing methods on newer hardware. + ### ats > `= ` diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 27b7f71..472df68 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -502,7 +502,7 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) * Family 0x12 and above processors have APIC timer * running in deep C states. */ - if (c->x86 > 0x11) + if ( opt_arat && c->x86 > 0x11 ) set_bit(X86_FEATURE_ARAT, c->x86_capability); /* diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e1220e6..32ca458 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -18,6 +18,9 @@ static bool_t __cpuinitdata use_xsave = 1; boolean_param("xsave", use_xsave); +bool_t __devinitdata opt_arat = 1; +boolean_param("arat", opt_arat); + unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 72c41ca..a7b7421 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -11,6 +11,7 @@ struct cpu_dev { extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; +extern bool_t opt_arat; extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; extern unsigned int opt_cpuid_mask_xsave_eax; extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 31b69c9..e855211 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -226,8 +226,9 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_NONSTOP_TSC, c->x86_capability); set_bit(X86_FEATURE_TSC_RELIABLE, c->x86_capability); } - if ((c->cpuid_level >= 0x00000006) && - (cpuid_eax(0x00000006) & (1u<<2))) + if ( opt_arat && + ( c->cpuid_level >= 0x00000006 ) && + ( cpuid_eax(0x00000006) & (1u<<2) ) ) set_bit(X86_FEATURE_ARAT, 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 Wed Nov 06 22:52:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:52: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 1VeBqR-0006py-V6; Wed, 06 Nov 2013 22:45:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq6-0006pV-9y for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:42 +0000 Received: from [85.158.139.211:62522] by server-13.bemta-5.messagelabs.com id D7/31-31104-456CA725; Wed, 06 Nov 2013 22:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383777874!427105!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17872 invoked from network); 6 Nov 2013 22:44:35 -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; 6 Nov 2013 22:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpy-0008Va-BO for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpy-0006kW-96 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:34 +0000 Date: Wed, 06 Nov 2013 22:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: remove the problematic set_uc_mode logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c84d046735102e02d2df454ab07f14ac51f235d Author: Liu Jinsong AuthorDate: Wed Nov 6 10:12:00 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:12:00 2013 +0100 VMX: remove the problematic set_uc_mode logic XSA-60 security hole comes from the problematic vmx_set_uc_mode. This patch remove vmx_set_uc_mode logic, which will be replaced by PAT approach at later patch. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/hvm.c | 2 - xen/arch/x86/hvm/mtrr.c | 3 - xen/arch/x86/hvm/vmx/vmx.c | 9 --- xen/arch/x86/mm/p2m-ept.c | 120 ----------------------------------------- xen/include/asm-x86/hvm/hvm.h | 1 - 5 files changed, 0 insertions(+), 135 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5f3a94a..090dfad 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1619,8 +1619,6 @@ static void hvm_set_uc_mode(struct vcpu *v, bool_t is_in_uc_mode) { v->domain->arch.hvm_domain.is_in_uc_mode = is_in_uc_mode; shadow_blow_tables_per_domain(v->domain); - if ( hvm_funcs.set_uc_mode ) - return hvm_funcs.set_uc_mode(v); } int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index ef51a8d..4ff1e55 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -696,9 +696,6 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) return MTRR_TYPE_WRBACK; - if ( (v == current) && v->domain->arch.hvm_domain.is_in_uc_mode ) - return MTRR_TYPE_UNCACHABLE; - if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index e6743b8..2a5b3ac 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1392,14 +1392,6 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_uc_mode(struct vcpu *v) -{ - if ( paging_mode_hap(v->domain) ) - ept_change_entry_emt_with_range( - v->domain, 0, p2m_get_hostp2m(v->domain)->max_mapped_pfn); - hvm_asid_flush_vcpu(v); -} - static void vmx_set_info_guest(struct vcpu *v) { unsigned long intr_shadow; @@ -1558,7 +1550,6 @@ static struct hvm_function_table __initdata vmx_function_table = { .msr_read_intercept = vmx_msr_read_intercept, .msr_write_intercept = vmx_msr_write_intercept, .invlpg_intercept = vmx_invlpg_intercept, - .set_uc_mode = vmx_set_uc_mode, .set_info_guest = vmx_set_info_guest, .set_rdtsc_exiting = vmx_set_rdtsc_exiting, .nhvm_vcpu_initialise = nvmx_vcpu_initialise, diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 595c6e7..92d9e2d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -587,44 +587,6 @@ out: return mfn; } -/* WARNING: Only caller doesn't care about PoD pages. So this function will - * always return 0 for PoD pages, not populate them. If that becomes necessary, - * pass a p2m_query_t type along to distinguish. */ -static ept_entry_t ept_get_entry_content(struct p2m_domain *p2m, - unsigned long gfn, int *level) -{ - ept_entry_t *table = map_domain_page(pagetable_get_pfn(p2m_get_pagetable(p2m))); - unsigned long gfn_remainder = gfn; - ept_entry_t *ept_entry; - ept_entry_t content = { .epte = 0 }; - u32 index; - int i; - int ret=0; - struct ept_data *ept = &p2m->ept; - - /* This pfn is higher than the highest the p2m map currently holds */ - if ( gfn > p2m->max_mapped_pfn ) - goto out; - - for ( i = ept_get_wl(ept); i > 0; i-- ) - { - ret = ept_next_level(p2m, 1, &table, &gfn_remainder, i); - if ( !ret || ret == GUEST_TABLE_POD_PAGE ) - goto out; - else if ( ret == GUEST_TABLE_SUPER_PAGE ) - break; - } - - index = gfn_remainder >> (i * EPT_TABLE_ORDER); - ept_entry = table + index; - content = *ept_entry; - *level = i; - - out: - unmap_domain_page(table); - return content; -} - void ept_walk_table(struct domain *d, unsigned long gfn) { struct p2m_domain *p2m = p2m_get_hostp2m(d); @@ -677,88 +639,6 @@ out: } /* - * To test if the new emt type is the same with old, - * return 1 to not to reset ept entry. - */ -static int need_modify_ept_entry(struct p2m_domain *p2m, unsigned long gfn, - mfn_t mfn, uint8_t o_ipat, uint8_t o_emt, - p2m_type_t p2mt) -{ - uint8_t ipat; - uint8_t emt; - bool_t direct_mmio = (p2mt == p2m_mmio_direct); - - emt = epte_get_entry_emt(p2m->domain, gfn, mfn, &ipat, direct_mmio); - - if ( (emt == o_emt) && (ipat == o_ipat) ) - return 0; - - return 1; -} - -void ept_change_entry_emt_with_range(struct domain *d, - unsigned long start_gfn, - unsigned long end_gfn) -{ - unsigned long gfn; - ept_entry_t e; - mfn_t mfn; - int order = 0; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int rc; - - p2m_lock(p2m); - for ( gfn = start_gfn; gfn <= end_gfn; gfn++ ) - { - int level = 0; - uint64_t trunk = 0; - - e = ept_get_entry_content(p2m, gfn, &level); - if ( !is_epte_present(&e) || !p2m_has_emt(e.sa_p2mt) ) - continue; - - order = 0; - mfn = _mfn(e.mfn); - - if ( is_epte_superpage(&e) ) - { - while ( level ) - { - trunk = (1UL << (level * EPT_TABLE_ORDER)) - 1; - if ( !(gfn & trunk) && (gfn + trunk <= end_gfn) ) - { - /* gfn assigned with 2M or 1G, and the end covers more than - * the super page areas. - * Set emt for super page. - */ - order = level * EPT_TABLE_ORDER; - if ( need_modify_ept_entry(p2m, gfn, mfn, - e.ipat, e.emt, e.sa_p2mt) ) - { - rc = ept_set_entry(p2m, gfn, mfn, order, - e.sa_p2mt, e.access); - ASSERT(rc); - } - gfn += trunk; - break; - } - level--; - } - } - else /* gfn assigned with 4k */ - { - if ( need_modify_ept_entry(p2m, gfn, mfn, - e.ipat, e.emt, e.sa_p2mt) ) - { - rc = ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); - ASSERT(rc); - } - } - } - p2m_unlock(p2m); -} - -/* * Walk the whole p2m table, changing any entries of the old type * to the new type. This is used in hardware-assisted paging to * quickly enable or diable log-dirty tracking diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3376418..8dd2b40 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -156,7 +156,6 @@ struct hvm_function_table { int (*msr_read_intercept)(unsigned int msr, uint64_t *msr_content); int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); - void (*set_uc_mode)(struct vcpu *v); void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:52:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:52: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 1VeBqR-0006py-V6; Wed, 06 Nov 2013 22:45:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq6-0006pV-9y for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:42 +0000 Received: from [85.158.139.211:62522] by server-13.bemta-5.messagelabs.com id D7/31-31104-456CA725; Wed, 06 Nov 2013 22:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383777874!427105!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17872 invoked from network); 6 Nov 2013 22:44:35 -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; 6 Nov 2013 22:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpy-0008Va-BO for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpy-0006kW-96 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:34 +0000 Date: Wed, 06 Nov 2013 22:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: remove the problematic set_uc_mode logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c84d046735102e02d2df454ab07f14ac51f235d Author: Liu Jinsong AuthorDate: Wed Nov 6 10:12:00 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:12:00 2013 +0100 VMX: remove the problematic set_uc_mode logic XSA-60 security hole comes from the problematic vmx_set_uc_mode. This patch remove vmx_set_uc_mode logic, which will be replaced by PAT approach at later patch. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/hvm.c | 2 - xen/arch/x86/hvm/mtrr.c | 3 - xen/arch/x86/hvm/vmx/vmx.c | 9 --- xen/arch/x86/mm/p2m-ept.c | 120 ----------------------------------------- xen/include/asm-x86/hvm/hvm.h | 1 - 5 files changed, 0 insertions(+), 135 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5f3a94a..090dfad 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1619,8 +1619,6 @@ static void hvm_set_uc_mode(struct vcpu *v, bool_t is_in_uc_mode) { v->domain->arch.hvm_domain.is_in_uc_mode = is_in_uc_mode; shadow_blow_tables_per_domain(v->domain); - if ( hvm_funcs.set_uc_mode ) - return hvm_funcs.set_uc_mode(v); } int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index ef51a8d..4ff1e55 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -696,9 +696,6 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) return MTRR_TYPE_WRBACK; - if ( (v == current) && v->domain->arch.hvm_domain.is_in_uc_mode ) - return MTRR_TYPE_UNCACHABLE; - if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index e6743b8..2a5b3ac 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1392,14 +1392,6 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_uc_mode(struct vcpu *v) -{ - if ( paging_mode_hap(v->domain) ) - ept_change_entry_emt_with_range( - v->domain, 0, p2m_get_hostp2m(v->domain)->max_mapped_pfn); - hvm_asid_flush_vcpu(v); -} - static void vmx_set_info_guest(struct vcpu *v) { unsigned long intr_shadow; @@ -1558,7 +1550,6 @@ static struct hvm_function_table __initdata vmx_function_table = { .msr_read_intercept = vmx_msr_read_intercept, .msr_write_intercept = vmx_msr_write_intercept, .invlpg_intercept = vmx_invlpg_intercept, - .set_uc_mode = vmx_set_uc_mode, .set_info_guest = vmx_set_info_guest, .set_rdtsc_exiting = vmx_set_rdtsc_exiting, .nhvm_vcpu_initialise = nvmx_vcpu_initialise, diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 595c6e7..92d9e2d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -587,44 +587,6 @@ out: return mfn; } -/* WARNING: Only caller doesn't care about PoD pages. So this function will - * always return 0 for PoD pages, not populate them. If that becomes necessary, - * pass a p2m_query_t type along to distinguish. */ -static ept_entry_t ept_get_entry_content(struct p2m_domain *p2m, - unsigned long gfn, int *level) -{ - ept_entry_t *table = map_domain_page(pagetable_get_pfn(p2m_get_pagetable(p2m))); - unsigned long gfn_remainder = gfn; - ept_entry_t *ept_entry; - ept_entry_t content = { .epte = 0 }; - u32 index; - int i; - int ret=0; - struct ept_data *ept = &p2m->ept; - - /* This pfn is higher than the highest the p2m map currently holds */ - if ( gfn > p2m->max_mapped_pfn ) - goto out; - - for ( i = ept_get_wl(ept); i > 0; i-- ) - { - ret = ept_next_level(p2m, 1, &table, &gfn_remainder, i); - if ( !ret || ret == GUEST_TABLE_POD_PAGE ) - goto out; - else if ( ret == GUEST_TABLE_SUPER_PAGE ) - break; - } - - index = gfn_remainder >> (i * EPT_TABLE_ORDER); - ept_entry = table + index; - content = *ept_entry; - *level = i; - - out: - unmap_domain_page(table); - return content; -} - void ept_walk_table(struct domain *d, unsigned long gfn) { struct p2m_domain *p2m = p2m_get_hostp2m(d); @@ -677,88 +639,6 @@ out: } /* - * To test if the new emt type is the same with old, - * return 1 to not to reset ept entry. - */ -static int need_modify_ept_entry(struct p2m_domain *p2m, unsigned long gfn, - mfn_t mfn, uint8_t o_ipat, uint8_t o_emt, - p2m_type_t p2mt) -{ - uint8_t ipat; - uint8_t emt; - bool_t direct_mmio = (p2mt == p2m_mmio_direct); - - emt = epte_get_entry_emt(p2m->domain, gfn, mfn, &ipat, direct_mmio); - - if ( (emt == o_emt) && (ipat == o_ipat) ) - return 0; - - return 1; -} - -void ept_change_entry_emt_with_range(struct domain *d, - unsigned long start_gfn, - unsigned long end_gfn) -{ - unsigned long gfn; - ept_entry_t e; - mfn_t mfn; - int order = 0; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int rc; - - p2m_lock(p2m); - for ( gfn = start_gfn; gfn <= end_gfn; gfn++ ) - { - int level = 0; - uint64_t trunk = 0; - - e = ept_get_entry_content(p2m, gfn, &level); - if ( !is_epte_present(&e) || !p2m_has_emt(e.sa_p2mt) ) - continue; - - order = 0; - mfn = _mfn(e.mfn); - - if ( is_epte_superpage(&e) ) - { - while ( level ) - { - trunk = (1UL << (level * EPT_TABLE_ORDER)) - 1; - if ( !(gfn & trunk) && (gfn + trunk <= end_gfn) ) - { - /* gfn assigned with 2M or 1G, and the end covers more than - * the super page areas. - * Set emt for super page. - */ - order = level * EPT_TABLE_ORDER; - if ( need_modify_ept_entry(p2m, gfn, mfn, - e.ipat, e.emt, e.sa_p2mt) ) - { - rc = ept_set_entry(p2m, gfn, mfn, order, - e.sa_p2mt, e.access); - ASSERT(rc); - } - gfn += trunk; - break; - } - level--; - } - } - else /* gfn assigned with 4k */ - { - if ( need_modify_ept_entry(p2m, gfn, mfn, - e.ipat, e.emt, e.sa_p2mt) ) - { - rc = ept_set_entry(p2m, gfn, mfn, order, e.sa_p2mt, e.access); - ASSERT(rc); - } - } - } - p2m_unlock(p2m); -} - -/* * Walk the whole p2m table, changing any entries of the old type * to the new type. This is used in hardware-assisted paging to * quickly enable or diable log-dirty tracking diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3376418..8dd2b40 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -156,7 +156,6 @@ struct hvm_function_table { int (*msr_read_intercept)(unsigned int msr, uint64_t *msr_content); int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); - void (*set_uc_mode)(struct vcpu *v); void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:54:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:54:58 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqz-0006qO-8q; Wed, 06 Nov 2013 22:45:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq5-0006pC-Th for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:42 +0000 Received: from [85.158.143.35:57635] by server-3.bemta-4.messagelabs.com id 5B/D5-19578-A46CA725; Wed, 06 Nov 2013 22:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383777864!1459578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26602 invoked from network); 6 Nov 2013 22:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpo-0008VV-32 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpn-0006k6-Vd for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:23 +0000 Date: Wed, 06 Nov 2013 22:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: disable EPT when !cpu_has_vmx_pat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c13b0d65ddedd74508edef5cd66defffe30468fc Author: Liu Jinsong AuthorDate: Wed Nov 6 10:11:18 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:11:18 2013 +0100 VMX: disable EPT when !cpu_has_vmx_pat Recently Oracle developers found a Xen security issue as DOS affecting, named as XSA-60. Please refer http://xenbits.xen.org/xsa/advisory-60.html Basically it involves how to handle guest cr0.cd setting, which under some environment it consumes much time resulting in DOS-like behavior. This is a preparing patch for fixing XSA-60. Later patch will fix XSA-60 via PAT under Intel EPT case, which depends on cpu_has_vmx_pat. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 6526504..6916c6d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -921,7 +921,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); - if ( cpu_has_vmx_pat && paging_mode_hap(d) ) + if ( paging_mode_hap(d) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); } @@ -1063,7 +1063,7 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(EPT_POINTER, ept_get_eptp(ept)); } - if ( cpu_has_vmx_pat && paging_mode_hap(d) ) + if ( paging_mode_hap(d) ) { u64 host_pat, guest_pat; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9ca8632..e6743b8 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -908,7 +908,7 @@ static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { - if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) ) return 0; vmx_vmcs_enter(v); @@ -919,7 +919,7 @@ static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) { - if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) ) return 0; vmx_vmcs_enter(v); @@ -1591,7 +1591,11 @@ const struct hvm_function_table * __init start_vmx(void) return NULL; } - if ( cpu_has_vmx_ept ) + /* + * Do not enable EPT when (!cpu_has_vmx_pat), to prevent security hole + * (refer to http://xenbits.xen.org/xsa/advisory-60.html). + */ + if ( cpu_has_vmx_ept && cpu_has_vmx_pat ) { vmx_function_table.hap_supported = 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 Nov 06 22:54:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:54:58 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqz-0006qO-8q; Wed, 06 Nov 2013 22:45:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq5-0006pC-Th for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:42 +0000 Received: from [85.158.143.35:57635] by server-3.bemta-4.messagelabs.com id 5B/D5-19578-A46CA725; Wed, 06 Nov 2013 22:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383777864!1459578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26602 invoked from network); 6 Nov 2013 22:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpo-0008VV-32 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpn-0006k6-Vd for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:23 +0000 Date: Wed, 06 Nov 2013 22:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: disable EPT when !cpu_has_vmx_pat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c13b0d65ddedd74508edef5cd66defffe30468fc Author: Liu Jinsong AuthorDate: Wed Nov 6 10:11:18 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:11:18 2013 +0100 VMX: disable EPT when !cpu_has_vmx_pat Recently Oracle developers found a Xen security issue as DOS affecting, named as XSA-60. Please refer http://xenbits.xen.org/xsa/advisory-60.html Basically it involves how to handle guest cr0.cd setting, which under some environment it consumes much time resulting in DOS-like behavior. This is a preparing patch for fixing XSA-60. Later patch will fix XSA-60 via PAT under Intel EPT case, which depends on cpu_has_vmx_pat. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 6526504..6916c6d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -921,7 +921,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); - if ( cpu_has_vmx_pat && paging_mode_hap(d) ) + if ( paging_mode_hap(d) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); } @@ -1063,7 +1063,7 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(EPT_POINTER, ept_get_eptp(ept)); } - if ( cpu_has_vmx_pat && paging_mode_hap(d) ) + if ( paging_mode_hap(d) ) { u64 host_pat, guest_pat; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9ca8632..e6743b8 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -908,7 +908,7 @@ static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { - if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) ) return 0; vmx_vmcs_enter(v); @@ -919,7 +919,7 @@ static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) { - if ( !cpu_has_vmx_pat || !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) ) return 0; vmx_vmcs_enter(v); @@ -1591,7 +1591,11 @@ const struct hvm_function_table * __init start_vmx(void) return NULL; } - if ( cpu_has_vmx_ept ) + /* + * Do not enable EPT when (!cpu_has_vmx_pat), to prevent security hole + * (refer to http://xenbits.xen.org/xsa/advisory-60.html). + */ + if ( cpu_has_vmx_ept && cpu_has_vmx_pat ) { vmx_function_table.hap_supported = 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 Nov 06 22:56:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:56:08 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpr-0006p7-Mv; Wed, 06 Nov 2013 22:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpW-0006oz-EM for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:06 +0000 Received: from [193.109.254.147:4312] by server-3.bemta-14.messagelabs.com id C5/11-03488-536CA725; Wed, 06 Nov 2013 22:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383777843!1106160!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7823 invoked from network); 6 Nov 2013 22:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpT-0008VP-KD for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpT-0006ia-A0 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:03 +0000 Date: Wed, 06 Nov 2013 22:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: Time Reference Count 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 e36cd2cdc9674a7a4855d21fb7b3e6e17c4bb33b Author: Paul Durrant AuthorDate: Wed Nov 6 10:04:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:04:12 2013 +0100 x86/viridian: Time Reference Count MSR This viridian MSR is a read-only source of time (in units of 100ns) since the domain started. Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/viridian.c | 24 ++++++++++++++++-------- xen/include/asm-x86/perfc_defn.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index a6721c3..f363037 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -17,13 +17,14 @@ #include /* Viridian MSR numbers. */ -#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000 -#define VIRIDIAN_MSR_HYPERCALL 0x40000001 -#define VIRIDIAN_MSR_VP_INDEX 0x40000002 -#define VIRIDIAN_MSR_EOI 0x40000070 -#define VIRIDIAN_MSR_ICR 0x40000071 -#define VIRIDIAN_MSR_TPR 0x40000072 -#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073 +#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000 +#define VIRIDIAN_MSR_HYPERCALL 0x40000001 +#define VIRIDIAN_MSR_VP_INDEX 0x40000002 +#define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_EOI 0x40000070 +#define VIRIDIAN_MSR_ICR 0x40000071 +#define VIRIDIAN_MSR_TPR 0x40000072 +#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073 /* Viridian Hypercall Status Codes. */ #define HV_STATUS_SUCCESS 0x0000 @@ -33,6 +34,7 @@ #define HvNotifyLongSpinWait 8 /* Viridian CPUID 4000003, Viridian MSR availability. */ +#define CPUID3A_MSR_REF_COUNT (1 << 1) #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) @@ -83,7 +85,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, break; case 3: /* Which hypervisor MSRs are available to the guest */ - *eax = (CPUID3A_MSR_APIC_ACCESS | + *eax = (CPUID3A_MSR_REF_COUNT | + CPUID3A_MSR_APIC_ACCESS | CPUID3A_MSR_HYPERCALL | CPUID3A_MSR_VP_INDEX); break; @@ -305,6 +308,11 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = v->vcpu_id; break; + case VIRIDIAN_MSR_TIME_REF_COUNT: + perfc_incr(mshv_rdmsr_time_ref_count); + *val = hvm_get_guest_time(v) / 100; + break; + case VIRIDIAN_MSR_ICR: perfc_incr(mshv_rdmsr_icr); *val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) | diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 5eaa417..bd251f5 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -118,6 +118,7 @@ PERFCOUNTER(mshv_call_long_wait, "MS Hv Notify long wait") PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") +PERFCOUNTER(mshv_rdmsr_time_ref_count, "MS Hv rdmsr time reference count") PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:56:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:56:08 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpr-0006p7-Mv; Wed, 06 Nov 2013 22:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpW-0006oz-EM for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:06 +0000 Received: from [193.109.254.147:4312] by server-3.bemta-14.messagelabs.com id C5/11-03488-536CA725; Wed, 06 Nov 2013 22:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383777843!1106160!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7823 invoked from network); 6 Nov 2013 22:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpT-0008VP-KD for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpT-0006ia-A0 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:03 +0000 Date: Wed, 06 Nov 2013 22:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: Time Reference Count 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 e36cd2cdc9674a7a4855d21fb7b3e6e17c4bb33b Author: Paul Durrant AuthorDate: Wed Nov 6 10:04:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:04:12 2013 +0100 x86/viridian: Time Reference Count MSR This viridian MSR is a read-only source of time (in units of 100ns) since the domain started. Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/viridian.c | 24 ++++++++++++++++-------- xen/include/asm-x86/perfc_defn.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index a6721c3..f363037 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -17,13 +17,14 @@ #include /* Viridian MSR numbers. */ -#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000 -#define VIRIDIAN_MSR_HYPERCALL 0x40000001 -#define VIRIDIAN_MSR_VP_INDEX 0x40000002 -#define VIRIDIAN_MSR_EOI 0x40000070 -#define VIRIDIAN_MSR_ICR 0x40000071 -#define VIRIDIAN_MSR_TPR 0x40000072 -#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073 +#define VIRIDIAN_MSR_GUEST_OS_ID 0x40000000 +#define VIRIDIAN_MSR_HYPERCALL 0x40000001 +#define VIRIDIAN_MSR_VP_INDEX 0x40000002 +#define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_EOI 0x40000070 +#define VIRIDIAN_MSR_ICR 0x40000071 +#define VIRIDIAN_MSR_TPR 0x40000072 +#define VIRIDIAN_MSR_APIC_ASSIST 0x40000073 /* Viridian Hypercall Status Codes. */ #define HV_STATUS_SUCCESS 0x0000 @@ -33,6 +34,7 @@ #define HvNotifyLongSpinWait 8 /* Viridian CPUID 4000003, Viridian MSR availability. */ +#define CPUID3A_MSR_REF_COUNT (1 << 1) #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) @@ -83,7 +85,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, break; case 3: /* Which hypervisor MSRs are available to the guest */ - *eax = (CPUID3A_MSR_APIC_ACCESS | + *eax = (CPUID3A_MSR_REF_COUNT | + CPUID3A_MSR_APIC_ACCESS | CPUID3A_MSR_HYPERCALL | CPUID3A_MSR_VP_INDEX); break; @@ -305,6 +308,11 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = v->vcpu_id; break; + case VIRIDIAN_MSR_TIME_REF_COUNT: + perfc_incr(mshv_rdmsr_time_ref_count); + *val = hvm_get_guest_time(v) / 100; + break; + case VIRIDIAN_MSR_ICR: perfc_incr(mshv_rdmsr_icr); *val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) | diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 5eaa417..bd251f5 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -118,6 +118,7 @@ PERFCOUNTER(mshv_call_long_wait, "MS Hv Notify long wait") PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") +PERFCOUNTER(mshv_rdmsr_time_ref_count, "MS Hv rdmsr time reference count") PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:57:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq7-0006pj-Q4; Wed, 06 Nov 2013 22:44:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpl-0006p9-Po for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:22 +0000 Received: from [85.158.139.211:5847] by server-11.bemta-5.messagelabs.com id 71/E7-03454-046CA725; Wed, 06 Nov 2013 22:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383777854!427081!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17544 invoked from network); 6 Nov 2013 22:44:15 -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; 6 Nov 2013 22:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpd-0008VS-S5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpd-0006jk-Pt for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:13 +0000 Date: Wed, 06 Nov 2013 22:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: TSC and APIC Frequency MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84657efd9116f40924aa13c9d5a349e007da716f Author: Paul Durrant AuthorDate: Wed Nov 6 10:04:56 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:04:56 2013 +0100 x86/viridian: TSC and APIC Frequency MSRs These viridian MSRs are read-only sources of the TSC and APIC frequency (in units of Hz) Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/viridian.c | 16 +++++++++++++++- xen/arch/x86/hvm/vlapic.c | 3 --- xen/include/asm-x86/hvm/vlapic.h | 3 +++ xen/include/asm-x86/perfc_defn.h | 2 ++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index f363037..2b86d66 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -21,6 +21,8 @@ #define VIRIDIAN_MSR_HYPERCALL 0x40000001 #define VIRIDIAN_MSR_VP_INDEX 0x40000002 #define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_TSC_FREQUENCY 0x40000022 +#define VIRIDIAN_MSR_APIC_FREQUENCY 0x40000023 #define VIRIDIAN_MSR_EOI 0x40000070 #define VIRIDIAN_MSR_ICR 0x40000071 #define VIRIDIAN_MSR_TPR 0x40000072 @@ -38,6 +40,7 @@ #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) +#define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ #define CPUID4A_MSR_BASED_APIC (1 << 3) @@ -88,7 +91,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, *eax = (CPUID3A_MSR_REF_COUNT | CPUID3A_MSR_APIC_ACCESS | CPUID3A_MSR_HYPERCALL | - CPUID3A_MSR_VP_INDEX); + CPUID3A_MSR_VP_INDEX | + CPUID3A_MSR_FREQ); break; case 4: /* Recommended hypercall usage. */ @@ -313,6 +317,16 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = hvm_get_guest_time(v) / 100; break; + case VIRIDIAN_MSR_TSC_FREQUENCY: + perfc_incr(mshv_rdmsr_tsc_frequency); + *val = (uint64_t)d->arch.tsc_khz * 1000ull; + break; + + case VIRIDIAN_MSR_APIC_FREQUENCY: + perfc_incr(mshv_rdmsr_apic_frequency); + *val = 1000000000ull / APIC_BUS_CYCLE_NS; + break; + case VIRIDIAN_MSR_ICR: perfc_incr(mshv_rdmsr_icr); *val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) | diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 5c33d3a..bc06010 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -44,9 +44,6 @@ #define VLAPIC_VERSION 0x00050014 #define VLAPIC_LVT_NUM 6 -/* vlapic's frequence is 100 MHz */ -#define APIC_BUS_CYCLE_NS 10 - #define LVT_MASK \ APIC_LVT_MASKED | APIC_SEND_PENDING | APIC_VECTOR_MASK diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index eb6dec9..66f0aff 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -80,6 +80,9 @@ struct vlapic { } init_sipi; }; +/* vlapic's frequence is 100 MHz */ +#define APIC_BUS_CYCLE_NS 10 + static inline uint32_t vlapic_get_reg(struct vlapic *vlapic, uint32_t reg) { return *((uint32_t *)(&vlapic->regs->data[reg])); diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index bd251f5..6c590aa 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -119,6 +119,8 @@ PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") PERFCOUNTER(mshv_rdmsr_time_ref_count, "MS Hv rdmsr time reference count") +PERFCOUNTER(mshv_rdmsr_tsc_frequency, "MS Hv rdmsr TSC frequency") +PERFCOUNTER(mshv_rdmsr_apic_frequency, "MS Hv rdmsr APIC frequency") PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:57:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq7-0006pj-Q4; Wed, 06 Nov 2013 22:44:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpl-0006p9-Po for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:22 +0000 Received: from [85.158.139.211:5847] by server-11.bemta-5.messagelabs.com id 71/E7-03454-046CA725; Wed, 06 Nov 2013 22:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1383777854!427081!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17544 invoked from network); 6 Nov 2013 22:44:15 -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; 6 Nov 2013 22:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBpd-0008VS-S5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBpd-0006jk-Pt for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:13 +0000 Date: Wed, 06 Nov 2013 22:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: TSC and APIC Frequency MSRs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84657efd9116f40924aa13c9d5a349e007da716f Author: Paul Durrant AuthorDate: Wed Nov 6 10:04:56 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:04:56 2013 +0100 x86/viridian: TSC and APIC Frequency MSRs These viridian MSRs are read-only sources of the TSC and APIC frequency (in units of Hz) Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/viridian.c | 16 +++++++++++++++- xen/arch/x86/hvm/vlapic.c | 3 --- xen/include/asm-x86/hvm/vlapic.h | 3 +++ xen/include/asm-x86/perfc_defn.h | 2 ++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index f363037..2b86d66 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -21,6 +21,8 @@ #define VIRIDIAN_MSR_HYPERCALL 0x40000001 #define VIRIDIAN_MSR_VP_INDEX 0x40000002 #define VIRIDIAN_MSR_TIME_REF_COUNT 0x40000020 +#define VIRIDIAN_MSR_TSC_FREQUENCY 0x40000022 +#define VIRIDIAN_MSR_APIC_FREQUENCY 0x40000023 #define VIRIDIAN_MSR_EOI 0x40000070 #define VIRIDIAN_MSR_ICR 0x40000071 #define VIRIDIAN_MSR_TPR 0x40000072 @@ -38,6 +40,7 @@ #define CPUID3A_MSR_APIC_ACCESS (1 << 4) #define CPUID3A_MSR_HYPERCALL (1 << 5) #define CPUID3A_MSR_VP_INDEX (1 << 6) +#define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ #define CPUID4A_MSR_BASED_APIC (1 << 3) @@ -88,7 +91,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, *eax = (CPUID3A_MSR_REF_COUNT | CPUID3A_MSR_APIC_ACCESS | CPUID3A_MSR_HYPERCALL | - CPUID3A_MSR_VP_INDEX); + CPUID3A_MSR_VP_INDEX | + CPUID3A_MSR_FREQ); break; case 4: /* Recommended hypercall usage. */ @@ -313,6 +317,16 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) *val = hvm_get_guest_time(v) / 100; break; + case VIRIDIAN_MSR_TSC_FREQUENCY: + perfc_incr(mshv_rdmsr_tsc_frequency); + *val = (uint64_t)d->arch.tsc_khz * 1000ull; + break; + + case VIRIDIAN_MSR_APIC_FREQUENCY: + perfc_incr(mshv_rdmsr_apic_frequency); + *val = 1000000000ull / APIC_BUS_CYCLE_NS; + break; + case VIRIDIAN_MSR_ICR: perfc_incr(mshv_rdmsr_icr); *val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) | diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 5c33d3a..bc06010 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -44,9 +44,6 @@ #define VLAPIC_VERSION 0x00050014 #define VLAPIC_LVT_NUM 6 -/* vlapic's frequence is 100 MHz */ -#define APIC_BUS_CYCLE_NS 10 - #define LVT_MASK \ APIC_LVT_MASKED | APIC_SEND_PENDING | APIC_VECTOR_MASK diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index eb6dec9..66f0aff 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -80,6 +80,9 @@ struct vlapic { } init_sipi; }; +/* vlapic's frequence is 100 MHz */ +#define APIC_BUS_CYCLE_NS 10 + static inline uint32_t vlapic_get_reg(struct vlapic *vlapic, uint32_t reg) { return *((uint32_t *)(&vlapic->regs->data[reg])); diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index bd251f5..6c590aa 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -119,6 +119,8 @@ PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") PERFCOUNTER(mshv_rdmsr_time_ref_count, "MS Hv rdmsr time reference count") +PERFCOUNTER(mshv_rdmsr_tsc_frequency, "MS Hv rdmsr TSC frequency") +PERFCOUNTER(mshv_rdmsr_apic_frequency, "MS Hv rdmsr APIC frequency") PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr") PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr") PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:57:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:33 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBsW-0006rs-Hy; Wed, 06 Nov 2013 22:47:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqR-0006pr-2p for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:03 +0000 Received: from [193.109.254.147:2693] by server-11.bemta-14.messagelabs.com id 5D/8C-08419-F56CA725; Wed, 06 Nov 2013 22:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383777884!1106233!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9920 invoked from network); 6 Nov 2013 22:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq8-0008Vd-HB for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBq8-0006ks-FT for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:44 +0000 Date: Wed, 06 Nov 2013 22:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix cr0.cd 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 62652c00efa55fb45374bcc92f7d96fc411aebb2 Author: Liu Jinsong AuthorDate: Wed Nov 6 10:12:36 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:12:36 2013 +0100 VMX: fix cr0.cd handling This patch solves XSA-60 security hole: 1. For guest w/o VT-d, and for guest with VT-d but snooped, Xen need do nothing, since hardware snoop mechanism has ensured cache coherency. 2. For guest with VT-d but non-snooped, cache coherency can not be guaranteed by h/w snoop, therefore it need emulate UC type to guest: 2.1). if it works w/ Intel EPT, set guest IA32_PAT fields as UC so that guest memory type are all UC. 2.2). if it works w/ shadow, drop all shadows so that any new ones would be created on demand w/ UC. This patch also fix a bug of shadow cr0.cd setting. Current shadow has a small window between cache flush and TLB invalidation, resulting in possilbe cache pollution. This patch pause vcpus so that no vcpus context involved into the window. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 75 ++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 58 +++++++++++++++++++++++++++- xen/common/domain.c | 10 +++++ xen/include/asm-x86/hvm/hvm.h | 1 + xen/include/asm-x86/hvm/support.h | 2 + xen/include/xen/sched.h | 1 + 7 files changed, 117 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 090dfad..73d1cf0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1701,6 +1701,40 @@ int hvm_mov_from_cr(unsigned int cr, unsigned int gpr) return X86EMUL_UNHANDLEABLE; } +void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value) +{ + if ( value & X86_CR0_CD ) + { + /* Entering no fill cache mode. */ + spin_lock(&v->domain->arch.hvm_domain.uc_lock); + v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; + + if ( !v->domain->arch.hvm_domain.is_in_uc_mode ) + { + domain_pause_nosync(v->domain); + + /* Flush physical caches. */ + on_each_cpu(local_flush_cache, NULL, 1); + hvm_set_uc_mode(v, 1); + + domain_unpause(v->domain); + } + spin_unlock(&v->domain->arch.hvm_domain.uc_lock); + } + else if ( !(value & X86_CR0_CD) && + (v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + { + /* Exit from no fill cache mode. */ + spin_lock(&v->domain->arch.hvm_domain.uc_lock); + v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; + + if ( domain_exit_uc_mode(v) ) + hvm_set_uc_mode(v, 0); + + spin_unlock(&v->domain->arch.hvm_domain.uc_lock); + } +} + int hvm_set_cr0(unsigned long value) { struct vcpu *v = current; @@ -1784,35 +1818,18 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) - { - if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) - { - /* Entering no fill cache mode. */ - spin_lock(&v->domain->arch.hvm_domain.uc_lock); - v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; - - if ( !v->domain->arch.hvm_domain.is_in_uc_mode ) - { - /* Flush physical caches. */ - on_each_cpu(local_flush_cache, NULL, 1); - hvm_set_uc_mode(v, 1); - } - spin_unlock(&v->domain->arch.hvm_domain.uc_lock); - } - else if ( !(value & (X86_CR0_CD | X86_CR0_NW)) && - (v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) - { - /* Exit from no fill cache mode. */ - spin_lock(&v->domain->arch.hvm_domain.uc_lock); - v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; - - if ( domain_exit_uc_mode(v) ) - hvm_set_uc_mode(v, 0); - - spin_unlock(&v->domain->arch.hvm_domain.uc_lock); - } - } + /* + * When cr0.cd setting + * 1. For guest w/o VT-d, and for guest with VT-d but snooped, Xen need not + * do anything, since hardware snoop mechanism has ensured cache coherency; + * 2. For guest with VT-d but non-snooped, cache coherency cannot be + * guaranteed by h/w so need emulate UC memory type to guest. + */ + if ( ((value ^ old_value) & X86_CR0_CD) && + has_arch_pdevs(v->domain) && + iommu_enabled && !iommu_snoop && + hvm_funcs.handle_cd ) + hvm_funcs.handle_cd(v, value); v->arch.hvm_vcpu.guest_cr[0] = value; hvm_update_guest_cr(v, 0); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 6916c6d..7a01b1f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -921,7 +921,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); - if ( paging_mode_hap(d) ) + if ( paging_mode_hap(d) && (!iommu_enabled || iommu_snoop) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2a5b3ac..75be62e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -642,6 +642,10 @@ static void vmx_ctxt_switch_to(struct vcpu *v) __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept_data), 0); } + /* For guest cr0.cd setting, do not use potentially polluted cache */ + if ( unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + wbinvd(); + vmx_restore_guest_msrs(v); vmx_restore_dr(v); } @@ -908,7 +912,8 @@ static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { - if ( !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) || + unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) return 0; vmx_vmcs_enter(v); @@ -919,7 +924,8 @@ static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) { - if ( !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) || + unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) return 0; vmx_vmcs_enter(v); @@ -928,6 +934,53 @@ static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) return 1; } +static void vmx_handle_cd(struct vcpu *v, unsigned long value) +{ + if ( !paging_mode_hap(v->domain) ) + { + /* + * For shadow, 'load IA32_PAT' VM-entry control is 0, so it cannot + * set guest memory type as UC via IA32_PAT. Xen drop all shadows + * so that any new ones would be created on demand. + */ + hvm_shadow_handle_cd(v, value); + } + else + { + u64 *pat = &v->arch.hvm_vcpu.pat_cr; + + if ( value & X86_CR0_CD ) + { + /* + * For EPT, set guest IA32_PAT fields as UC so that guest + * memory type are all UC. + */ + u64 uc_pat = + ((uint64_t)PAT_TYPE_UNCACHABLE) | /* PAT0 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 8) | /* PAT1 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 16) | /* PAT2 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 24) | /* PAT3 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 32) | /* PAT4 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 40) | /* PAT5 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 48) | /* PAT6 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 56); /* PAT7 */ + + vmx_get_guest_pat(v, pat); + vmx_set_guest_pat(v, uc_pat); + + wbinvd(); /* flush possibly polluted cache */ + hvm_asid_flush_vcpu(v); /* invalidate memory type cached in TLB */ + v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; + } + else + { + v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; + vmx_set_guest_pat(v, *pat); + hvm_asid_flush_vcpu(v); /* no need to flush cache */ + } + } +} + static void vmx_set_tsc_offset(struct vcpu *v, u64 offset) { vmx_vmcs_enter(v); @@ -1550,6 +1603,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .msr_read_intercept = vmx_msr_read_intercept, .msr_write_intercept = vmx_msr_write_intercept, .invlpg_intercept = vmx_invlpg_intercept, + .handle_cd = vmx_handle_cd, .set_info_guest = vmx_set_info_guest, .set_rdtsc_exiting = vmx_set_rdtsc_exiting, .nhvm_vcpu_initialise = nvmx_vcpu_initialise, diff --git a/xen/common/domain.c b/xen/common/domain.c index 5999779..ce20323 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -825,6 +825,16 @@ void domain_pause(struct domain *d) vcpu_sleep_sync(v); } +void domain_pause_nosync(struct domain *d) +{ + struct vcpu *v; + + atomic_inc(&d->pause_count); + + for_each_vcpu( d, v ) + vcpu_sleep_nosync(v); +} + void domain_unpause(struct domain *d) { struct vcpu *v; diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 8dd2b40..c9afb56 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -156,6 +156,7 @@ struct hvm_function_table { int (*msr_read_intercept)(unsigned int msr, uint64_t *msr_content); int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); + void (*handle_cd)(struct vcpu *v, unsigned long value); void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 7ddc806..52aef1f 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -130,6 +130,8 @@ void hvm_rdtsc_intercept(struct cpu_user_regs *regs); int __must_check hvm_handle_xsetbv(u32 index, u64 new_bv); +void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value); + /* These functions all return X86EMUL return codes. */ int hvm_set_efer(uint64_t value); int hvm_set_cr0(unsigned long value); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 25bf637..0628727 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -725,6 +725,7 @@ void vcpu_unblock(struct vcpu *v); void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); void domain_pause(struct domain *d); +void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); void domain_pause_by_systemcontroller(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:57:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:33 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBsW-0006rs-Hy; Wed, 06 Nov 2013 22:47:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqR-0006pr-2p for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:03 +0000 Received: from [193.109.254.147:2693] by server-11.bemta-14.messagelabs.com id 5D/8C-08419-F56CA725; Wed, 06 Nov 2013 22:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1383777884!1106233!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9920 invoked from network); 6 Nov 2013 22:44:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBq8-0008Vd-HB for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBq8-0006ks-FT for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:44 +0000 Date: Wed, 06 Nov 2013 22:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix cr0.cd 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 62652c00efa55fb45374bcc92f7d96fc411aebb2 Author: Liu Jinsong AuthorDate: Wed Nov 6 10:12:36 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:12:36 2013 +0100 VMX: fix cr0.cd handling This patch solves XSA-60 security hole: 1. For guest w/o VT-d, and for guest with VT-d but snooped, Xen need do nothing, since hardware snoop mechanism has ensured cache coherency. 2. For guest with VT-d but non-snooped, cache coherency can not be guaranteed by h/w snoop, therefore it need emulate UC type to guest: 2.1). if it works w/ Intel EPT, set guest IA32_PAT fields as UC so that guest memory type are all UC. 2.2). if it works w/ shadow, drop all shadows so that any new ones would be created on demand w/ UC. This patch also fix a bug of shadow cr0.cd setting. Current shadow has a small window between cache flush and TLB invalidation, resulting in possilbe cache pollution. This patch pause vcpus so that no vcpus context involved into the window. This is CVE-2013-2212 / XSA-60. Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Jun Nakajima Acked-by: Keir Fraser --- xen/arch/x86/hvm/hvm.c | 75 ++++++++++++++++++++++-------------- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 58 +++++++++++++++++++++++++++- xen/common/domain.c | 10 +++++ xen/include/asm-x86/hvm/hvm.h | 1 + xen/include/asm-x86/hvm/support.h | 2 + xen/include/xen/sched.h | 1 + 7 files changed, 117 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 090dfad..73d1cf0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1701,6 +1701,40 @@ int hvm_mov_from_cr(unsigned int cr, unsigned int gpr) return X86EMUL_UNHANDLEABLE; } +void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value) +{ + if ( value & X86_CR0_CD ) + { + /* Entering no fill cache mode. */ + spin_lock(&v->domain->arch.hvm_domain.uc_lock); + v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; + + if ( !v->domain->arch.hvm_domain.is_in_uc_mode ) + { + domain_pause_nosync(v->domain); + + /* Flush physical caches. */ + on_each_cpu(local_flush_cache, NULL, 1); + hvm_set_uc_mode(v, 1); + + domain_unpause(v->domain); + } + spin_unlock(&v->domain->arch.hvm_domain.uc_lock); + } + else if ( !(value & X86_CR0_CD) && + (v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + { + /* Exit from no fill cache mode. */ + spin_lock(&v->domain->arch.hvm_domain.uc_lock); + v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; + + if ( domain_exit_uc_mode(v) ) + hvm_set_uc_mode(v, 0); + + spin_unlock(&v->domain->arch.hvm_domain.uc_lock); + } +} + int hvm_set_cr0(unsigned long value) { struct vcpu *v = current; @@ -1784,35 +1818,18 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) - { - if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) - { - /* Entering no fill cache mode. */ - spin_lock(&v->domain->arch.hvm_domain.uc_lock); - v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; - - if ( !v->domain->arch.hvm_domain.is_in_uc_mode ) - { - /* Flush physical caches. */ - on_each_cpu(local_flush_cache, NULL, 1); - hvm_set_uc_mode(v, 1); - } - spin_unlock(&v->domain->arch.hvm_domain.uc_lock); - } - else if ( !(value & (X86_CR0_CD | X86_CR0_NW)) && - (v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) - { - /* Exit from no fill cache mode. */ - spin_lock(&v->domain->arch.hvm_domain.uc_lock); - v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; - - if ( domain_exit_uc_mode(v) ) - hvm_set_uc_mode(v, 0); - - spin_unlock(&v->domain->arch.hvm_domain.uc_lock); - } - } + /* + * When cr0.cd setting + * 1. For guest w/o VT-d, and for guest with VT-d but snooped, Xen need not + * do anything, since hardware snoop mechanism has ensured cache coherency; + * 2. For guest with VT-d but non-snooped, cache coherency cannot be + * guaranteed by h/w so need emulate UC memory type to guest. + */ + if ( ((value ^ old_value) & X86_CR0_CD) && + has_arch_pdevs(v->domain) && + iommu_enabled && !iommu_snoop && + hvm_funcs.handle_cd ) + hvm_funcs.handle_cd(v, value); v->arch.hvm_vcpu.guest_cr[0] = value; hvm_update_guest_cr(v, 0); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 6916c6d..7a01b1f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -921,7 +921,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); - if ( paging_mode_hap(d) ) + if ( paging_mode_hap(d) && (!iommu_enabled || iommu_snoop) ) vmx_disable_intercept_for_msr(v, MSR_IA32_CR_PAT, MSR_TYPE_R | MSR_TYPE_W); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2a5b3ac..75be62e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -642,6 +642,10 @@ static void vmx_ctxt_switch_to(struct vcpu *v) __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept_data), 0); } + /* For guest cr0.cd setting, do not use potentially polluted cache */ + if ( unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + wbinvd(); + vmx_restore_guest_msrs(v); vmx_restore_dr(v); } @@ -908,7 +912,8 @@ static unsigned long vmx_get_shadow_gs_base(struct vcpu *v) static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) { - if ( !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) || + unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) return 0; vmx_vmcs_enter(v); @@ -919,7 +924,8 @@ static int vmx_set_guest_pat(struct vcpu *v, u64 gpat) static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) { - if ( !paging_mode_hap(v->domain) ) + if ( !paging_mode_hap(v->domain) || + unlikely(v->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) return 0; vmx_vmcs_enter(v); @@ -928,6 +934,53 @@ static int vmx_get_guest_pat(struct vcpu *v, u64 *gpat) return 1; } +static void vmx_handle_cd(struct vcpu *v, unsigned long value) +{ + if ( !paging_mode_hap(v->domain) ) + { + /* + * For shadow, 'load IA32_PAT' VM-entry control is 0, so it cannot + * set guest memory type as UC via IA32_PAT. Xen drop all shadows + * so that any new ones would be created on demand. + */ + hvm_shadow_handle_cd(v, value); + } + else + { + u64 *pat = &v->arch.hvm_vcpu.pat_cr; + + if ( value & X86_CR0_CD ) + { + /* + * For EPT, set guest IA32_PAT fields as UC so that guest + * memory type are all UC. + */ + u64 uc_pat = + ((uint64_t)PAT_TYPE_UNCACHABLE) | /* PAT0 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 8) | /* PAT1 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 16) | /* PAT2 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 24) | /* PAT3 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 32) | /* PAT4 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 40) | /* PAT5 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 48) | /* PAT6 */ + ((uint64_t)PAT_TYPE_UNCACHABLE << 56); /* PAT7 */ + + vmx_get_guest_pat(v, pat); + vmx_set_guest_pat(v, uc_pat); + + wbinvd(); /* flush possibly polluted cache */ + hvm_asid_flush_vcpu(v); /* invalidate memory type cached in TLB */ + v->arch.hvm_vcpu.cache_mode = NO_FILL_CACHE_MODE; + } + else + { + v->arch.hvm_vcpu.cache_mode = NORMAL_CACHE_MODE; + vmx_set_guest_pat(v, *pat); + hvm_asid_flush_vcpu(v); /* no need to flush cache */ + } + } +} + static void vmx_set_tsc_offset(struct vcpu *v, u64 offset) { vmx_vmcs_enter(v); @@ -1550,6 +1603,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .msr_read_intercept = vmx_msr_read_intercept, .msr_write_intercept = vmx_msr_write_intercept, .invlpg_intercept = vmx_invlpg_intercept, + .handle_cd = vmx_handle_cd, .set_info_guest = vmx_set_info_guest, .set_rdtsc_exiting = vmx_set_rdtsc_exiting, .nhvm_vcpu_initialise = nvmx_vcpu_initialise, diff --git a/xen/common/domain.c b/xen/common/domain.c index 5999779..ce20323 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -825,6 +825,16 @@ void domain_pause(struct domain *d) vcpu_sleep_sync(v); } +void domain_pause_nosync(struct domain *d) +{ + struct vcpu *v; + + atomic_inc(&d->pause_count); + + for_each_vcpu( d, v ) + vcpu_sleep_nosync(v); +} + void domain_unpause(struct domain *d) { struct vcpu *v; diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 8dd2b40..c9afb56 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -156,6 +156,7 @@ struct hvm_function_table { int (*msr_read_intercept)(unsigned int msr, uint64_t *msr_content); int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); + void (*handle_cd)(struct vcpu *v, unsigned long value); void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 7ddc806..52aef1f 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -130,6 +130,8 @@ void hvm_rdtsc_intercept(struct cpu_user_regs *regs); int __must_check hvm_handle_xsetbv(u32 index, u64 new_bv); +void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value); + /* These functions all return X86EMUL return codes. */ int hvm_set_efer(uint64_t value); int hvm_set_cr0(unsigned long value); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 25bf637..0628727 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -725,6 +725,7 @@ void vcpu_unblock(struct vcpu *v); void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); void domain_pause(struct domain *d); +void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); void domain_pause_by_systemcontroller(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:57:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:43 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBtA-0006sP-Nw; Wed, 06 Nov 2013 22:47:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrL-0006qU-CY for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:59 +0000 Received: from [85.158.143.35:55920] by server-1.bemta-4.messagelabs.com id BE/4D-17304-886CA725; Wed, 06 Nov 2013 22:45:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383777927!1486215!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30580 invoked from network); 6 Nov 2013 22:45: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; 6 Nov 2013 22:45:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqo-000058-Us for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqo-0006n8-S5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:26 +0000 Date: Wed, 06 Nov 2013 22:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] call sched_destroy_domain before cpupool_rm_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 117f67350fd18b11ab09d628b4edea3364b09441 Author: Nathan Studer AuthorDate: Wed Nov 6 10:21:09 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:21:09 2013 +0100 call sched_destroy_domain before cpupool_rm_domain The domain destruction code, removes a domain from its cpupool before attempting to destroy its scheduler information. Since the scheduler framework uses the domain's cpupool information to decide on which scheduler ops to use, this results in the the wrong scheduler's destroy domain function being called when the cpupool scheduler and the initial scheduler are different. Correct this by destroying the domain's scheduling information before removing it from the pool. Signed-off-by: Nathan Studer Reviewed-by: Juergen Gross Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Acked-by: Keir Fraser --- xen/common/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index ce20323..8c9b813 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -727,10 +727,10 @@ static void complete_domain_destroy(struct rcu_head *head) rangeset_domain_destroy(d); - cpupool_rm_domain(d); - sched_destroy_domain(d); + cpupool_rm_domain(d); + /* Free page used by xen oprofile buffer. */ #ifdef CONFIG_XENOPROF free_xenoprof_pages(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:57:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:57:43 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBtA-0006sP-Nw; Wed, 06 Nov 2013 22:47:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrL-0006qU-CY for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:59 +0000 Received: from [85.158.143.35:55920] by server-1.bemta-4.messagelabs.com id BE/4D-17304-886CA725; Wed, 06 Nov 2013 22:45:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383777927!1486215!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30580 invoked from network); 6 Nov 2013 22:45: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; 6 Nov 2013 22:45:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqo-000058-Us for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqo-0006n8-S5 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:26 +0000 Date: Wed, 06 Nov 2013 22:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] call sched_destroy_domain before cpupool_rm_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 117f67350fd18b11ab09d628b4edea3364b09441 Author: Nathan Studer AuthorDate: Wed Nov 6 10:21:09 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:21:09 2013 +0100 call sched_destroy_domain before cpupool_rm_domain The domain destruction code, removes a domain from its cpupool before attempting to destroy its scheduler information. Since the scheduler framework uses the domain's cpupool information to decide on which scheduler ops to use, this results in the the wrong scheduler's destroy domain function being called when the cpupool scheduler and the initial scheduler are different. Correct this by destroying the domain's scheduling information before removing it from the pool. Signed-off-by: Nathan Studer Reviewed-by: Juergen Gross Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Acked-by: Keir Fraser --- xen/common/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index ce20323..8c9b813 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -727,10 +727,10 @@ static void complete_domain_destroy(struct rcu_head *head) rangeset_domain_destroy(d); - cpupool_rm_domain(d); - sched_destroy_domain(d); + cpupool_rm_domain(d); + /* Free page used by xen oprofile buffer. */ #ifdef CONFIG_XENOPROF free_xenoprof_pages(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:58:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:03 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBto-0006t7-Tu; Wed, 06 Nov 2013 22:48:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrL-0006qU-RJ for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:59 +0000 Received: from [85.158.143.35:60042] by server-1.bemta-4.messagelabs.com id 55/6D-17304-296CA725; Wed, 06 Nov 2013 22:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383777937!1486236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30901 invoked from network); 6 Nov 2013 22:45:38 -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; 6 Nov 2013 22:45:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqz-00005D-4M for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqz-0006nf-2U for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:37 +0000 Date: Wed, 06 Nov 2013 22:45:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: remove Jacob Shin X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11662fa1a92f2d9d9cfaff7b041e0f4180d86566 Author: Jan Beulich AuthorDate: Wed Nov 6 10:33:17 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:33:17 2013 +0100 MAINTAINERS: remove Jacob Shin As was requested by him, now that he left AMD. Signed-off-by: Jan Beulich --- MAINTAINERS | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d7825c0..01a8aea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -106,14 +106,12 @@ F: xen/include/acpi/ AMD IOMMU M: Suravee Suthikulpanit -M: Jacob Shin S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM M: Boris Ostrovsky M: Suravee Suthikulpanit -M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:58:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:03 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBto-0006t7-Tu; Wed, 06 Nov 2013 22:48:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrL-0006qU-RJ for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:59 +0000 Received: from [85.158.143.35:60042] by server-1.bemta-4.messagelabs.com id 55/6D-17304-296CA725; Wed, 06 Nov 2013 22:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383777937!1486236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30901 invoked from network); 6 Nov 2013 22:45:38 -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; 6 Nov 2013 22:45:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqz-00005D-4M for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqz-0006nf-2U for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:37 +0000 Date: Wed, 06 Nov 2013 22:45:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: remove Jacob Shin X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11662fa1a92f2d9d9cfaff7b041e0f4180d86566 Author: Jan Beulich AuthorDate: Wed Nov 6 10:33:17 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:33:17 2013 +0100 MAINTAINERS: remove Jacob Shin As was requested by him, now that he left AMD. Signed-off-by: Jan Beulich --- MAINTAINERS | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d7825c0..01a8aea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -106,14 +106,12 @@ F: xen/include/acpi/ AMD IOMMU M: Suravee Suthikulpanit -M: Jacob Shin S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM M: Boris Ostrovsky M: Suravee Suthikulpanit -M: Jacob Shin S: Supported F: xen/arch/x86/hvm/svm/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:58:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:43 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBsq-0006s0-LH; Wed, 06 Nov 2013 22:47:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqq-0006qA-8G for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:28 +0000 Received: from [85.158.139.211:7108] by server-12.bemta-5.messagelabs.com id 7D/4E-15833-376CA725; Wed, 06 Nov 2013 22:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383777905!457786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9722 invoked from network); 6 Nov 2013 22:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqT-000051-74 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqT-0006mO-34 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:05 +0000 Date: Wed, 06 Nov 2013 22:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add FIFO-based event channel ABI maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 636b6433908ebedc8928fd47b95f75d6580e1d3e Author: David Vrabel AuthorDate: Wed Nov 6 10:20:07 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:20:07 2013 +0100 MAINTAINERS: Add FIFO-based event channel ABI maintainer Suggested-by: Jan Beulich Signed-off-by: David Vrabel Acked-by: Keir Fraser --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index adacac2..d7825c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -156,6 +156,12 @@ F: xen/include/efi/ F: xen/include/asm-x86/efi*.h F: xen/include/asm-x86/x86_*/efi*.h +EVENT CHANNELS (FIFO-BASED ABI) +M: David Vrabel +S: Supported +F: xen/common/event_fifo.c +F: xen/include/xen/event_fifo.h + GDBSX DEBUGGER M: Mukesh Rathor S: Supported -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:58:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:43 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBsq-0006s0-LH; Wed, 06 Nov 2013 22:47:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqq-0006qA-8G for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:28 +0000 Received: from [85.158.139.211:7108] by server-12.bemta-5.messagelabs.com id 7D/4E-15833-376CA725; Wed, 06 Nov 2013 22:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1383777905!457786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9722 invoked from network); 6 Nov 2013 22:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqT-000051-74 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqT-0006mO-34 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:05 +0000 Date: Wed, 06 Nov 2013 22:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add FIFO-based event channel ABI maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 636b6433908ebedc8928fd47b95f75d6580e1d3e Author: David Vrabel AuthorDate: Wed Nov 6 10:20:07 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:20:07 2013 +0100 MAINTAINERS: Add FIFO-based event channel ABI maintainer Suggested-by: Jan Beulich Signed-off-by: David Vrabel Acked-by: Keir Fraser --- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index adacac2..d7825c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -156,6 +156,12 @@ F: xen/include/efi/ F: xen/include/asm-x86/efi*.h F: xen/include/asm-x86/x86_*/efi*.h +EVENT CHANNELS (FIFO-BASED ABI) +M: David Vrabel +S: Supported +F: xen/common/event_fifo.c +F: xen/include/xen/event_fifo.h + GDBSX DEBUGGER M: Mukesh Rathor S: Supported -- generated by git-patchbot for /home/xen/git/xen.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 Nov 06 22:58:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:53 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrJ-0006qg-Bm; Wed, 06 Nov 2013 22:45:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqQ-0006pz-8F for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:03 +0000 Received: from [193.109.254.147:56399] by server-7.bemta-14.messagelabs.com id EF/DF-14870-866CA725; Wed, 06 Nov 2013 22:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1383777894!1118343!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14242 invoked from network); 6 Nov 2013 22:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqI-0008Vj-Nh for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqI-0006lG-Lf for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:54 +0000 Date: Wed, 06 Nov 2013 22:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: flush cache when vmentry back to UC 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 86d60e855fe118df0dbdf67b67b1a0ec8fdb9f0d Author: Liu Jinsong AuthorDate: Wed Nov 6 10:13:20 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:13:20 2013 +0100 VMX: flush cache when vmentry back to UC guest This patch flush cache when vmentry back to UC guest, to prevent cache polluted by hypervisor access guest memory during UC mode. The elegant way to do this is, simply add wbinvd just before vmentry. However, currently wbinvd before vmentry will mysteriously trigger lapic timer interrupt storm, hung booting stage for 10s ~ 60s. We still didn't dig out the root cause of interrupt storm, so currently this patch add flag indicating hypervisor access UC guest memory to prevent interrupt storm -- though it still leaves aspects un-addressed, i.e. speculative reads, and multi-vCPU issues, etc. Whenever the interrupt storm got root caused and fixed, the protection flag can be removed -- that would be final clean and elegant approach dealing with cache flushing before vmentry. This is CVE-2013-2212 / XSA-60. Suggested-by: Jan Beulich Suggested-by: Andrew Cooper Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Acked-by: Jun Nakajima --- xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/arch/x86/hvm/vmx/vmx.c | 7 +++++++ xen/include/asm-x86/hvm/vcpu.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 73d1cf0..36699b8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2477,6 +2477,9 @@ static enum hvm_copy_result __hvm_copy( return HVMCOPY_unhandleable; #endif + if ( unlikely(curr->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 1; + while ( todo > 0 ) { count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); @@ -2588,6 +2591,9 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) return HVMCOPY_unhandleable; #endif + if ( unlikely(curr->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 1; + while ( todo > 0 ) { count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 75be62e..a0ad37a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2974,6 +2974,13 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) struct hvm_vcpu_asid *p_asid; bool_t need_flush; + /* In case hypervisor access hvm memory when guest uc mode */ + if ( unlikely(curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory) ) + { + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 0; + wbinvd(); + } + if ( !cpu_has_vmx_vpid ) goto out; if ( nestedhvm_vcpu_in_guestmode(curr) ) diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 8fa5452..a309389 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -167,6 +167,7 @@ struct hvm_vcpu { /* Which cache mode is this VCPU in (CR0:CD/NW)? */ u8 cache_mode; + bool_t hypervisor_access_uc_hvm_memory; struct hvm_vcpu_io hvm_io; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 22:58:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 22:58:53 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrJ-0006qg-Bm; Wed, 06 Nov 2013 22:45:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqQ-0006pz-8F for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:03 +0000 Received: from [193.109.254.147:56399] by server-7.bemta-14.messagelabs.com id EF/DF-14870-866CA725; Wed, 06 Nov 2013 22:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1383777894!1118343!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14242 invoked from network); 6 Nov 2013 22:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Nov 2013 22:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqI-0008Vj-Nh for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqI-0006lG-Lf for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:44:54 +0000 Date: Wed, 06 Nov 2013 22:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: flush cache when vmentry back to UC 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 86d60e855fe118df0dbdf67b67b1a0ec8fdb9f0d Author: Liu Jinsong AuthorDate: Wed Nov 6 10:13:20 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:13:20 2013 +0100 VMX: flush cache when vmentry back to UC guest This patch flush cache when vmentry back to UC guest, to prevent cache polluted by hypervisor access guest memory during UC mode. The elegant way to do this is, simply add wbinvd just before vmentry. However, currently wbinvd before vmentry will mysteriously trigger lapic timer interrupt storm, hung booting stage for 10s ~ 60s. We still didn't dig out the root cause of interrupt storm, so currently this patch add flag indicating hypervisor access UC guest memory to prevent interrupt storm -- though it still leaves aspects un-addressed, i.e. speculative reads, and multi-vCPU issues, etc. Whenever the interrupt storm got root caused and fixed, the protection flag can be removed -- that would be final clean and elegant approach dealing with cache flushing before vmentry. This is CVE-2013-2212 / XSA-60. Suggested-by: Jan Beulich Suggested-by: Andrew Cooper Signed-off-by: Liu Jinsong Reviewed-by: Jan Beulich Acked-by: Jun Nakajima --- xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/arch/x86/hvm/vmx/vmx.c | 7 +++++++ xen/include/asm-x86/hvm/vcpu.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 73d1cf0..36699b8 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2477,6 +2477,9 @@ static enum hvm_copy_result __hvm_copy( return HVMCOPY_unhandleable; #endif + if ( unlikely(curr->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 1; + while ( todo > 0 ) { count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); @@ -2588,6 +2591,9 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) return HVMCOPY_unhandleable; #endif + if ( unlikely(curr->arch.hvm_vcpu.cache_mode == NO_FILL_CACHE_MODE) ) + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 1; + while ( todo > 0 ) { count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 75be62e..a0ad37a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2974,6 +2974,13 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) struct hvm_vcpu_asid *p_asid; bool_t need_flush; + /* In case hypervisor access hvm memory when guest uc mode */ + if ( unlikely(curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory) ) + { + curr->arch.hvm_vcpu.hypervisor_access_uc_hvm_memory = 0; + wbinvd(); + } + if ( !cpu_has_vmx_vpid ) goto out; if ( nestedhvm_vcpu_in_guestmode(curr) ) diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 8fa5452..a309389 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -167,6 +167,7 @@ struct hvm_vcpu { /* Which cache mode is this VCPU in (CR0:CD/NW)? */ u8 cache_mode; + bool_t hypervisor_access_uc_hvm_memory; struct hvm_vcpu_io hvm_io; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 06 23:02:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 23:02:24 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBtU-0006sm-Qr; Wed, 06 Nov 2013 22:48:12 +0000 Received: from [85.158.143.247] (helo=mail6.bemta4.messagelabs.com) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrP-0006qP-90 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:46:03 +0000 Received: from [85.158.143.35:51610] by server-3.bemta-4.messagelabs.com id 16/26-19578-D76CA725; Wed, 06 Nov 2013 22:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383777915!1482833!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3090 invoked from network); 6 Nov 2013 22:45:16 -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; 6 Nov 2013 22:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqd-000054-Dq for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqd-0006mm-B7 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:15 +0000 Date: Wed, 06 Nov 2013 22:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: don't lose pending state if FIFO event array page is missing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 917c12302985f7702664faa572f9a2963f4aa947 Author: David Vrabel AuthorDate: Wed Nov 6 10:20:24 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:20:24 2013 +0100 evtchn: don't lose pending state if FIFO event array page is missing When the FIFO-based ABI is in use, if an event is bound when the corresponding event array page is missing any attempt to set the event pending will lose the event (because there is nowhere to write the pending state). This wasn't initially considered an issue because guests were expected to only bind events once they had expanded the event array, however: 1. A domain may start with events already bound (by the toolstack). 2. The guest does not know what the port number will be until the event is bound (it doesn't know how many already bound events there are), so it does not know how many event array pages are required. This makes it difficult to expand in advanced (the current Linux implementation expands after binding for example). To prevent pending events from being lost because there is no array page, temporarily store the pending state in evtchn->pending. When an array page is added, use this state to set the port as pending. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/event_fifo.c | 47 +++++++++++++++++++++++++++++++++++++++++------ xen/include/xen/sched.h | 1 + 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index bec8d87..64dbfff 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -61,8 +61,16 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) port = evtchn->port; word = evtchn_fifo_word_from_port(d, port); + + /* + * Event array page may not exist yet, save the pending state for + * when the page is added. + */ if ( unlikely(!word) ) + { + evtchn->pending = 1; return; + } /* * No locking around getting the queue. This may race with @@ -322,16 +330,29 @@ static void cleanup_event_array(struct domain *d) xfree(d->evtchn_fifo); } -static void set_priority_all(struct domain *d, unsigned int priority) +static void setup_ports(struct domain *d) { unsigned int port; + /* + * For each port that is already bound: + * + * - save its pending state. + * - set default priority. + */ for ( port = 1; port < d->max_evtchns; port++ ) { + struct evtchn *evtchn; + if ( !port_is_valid(d, port) ) break; - evtchn_port_set_priority(d, evtchn_from_port(d, port), priority); + evtchn = evtchn_from_port(d, port); + + if ( test_bit(port, &shared_info(d, evtchn_pending)) ) + evtchn->pending = 1; + + evtchn_fifo_set_priority(d, evtchn, EVTCHN_FIFO_PRIORITY_DEFAULT); } } @@ -369,9 +390,6 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. - * - * Any ports currently bound will have their priority set to the - * default. */ if ( rc == 0 && !d->evtchn_fifo ) { @@ -382,7 +400,7 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) { d->evtchn_port_ops = &evtchn_port_ops_fifo; d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - set_priority_all(d, EVTCHN_FIFO_PRIORITY_DEFAULT); + setup_ports(d); } } @@ -395,6 +413,7 @@ static int add_page_to_event_array(struct domain *d, unsigned long gfn) { void *virt; unsigned int slot; + unsigned int port = d->evtchn_fifo->num_evtchns; int rc; slot = d->evtchn_fifo->num_evtchns / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE; @@ -408,6 +427,22 @@ static int add_page_to_event_array(struct domain *d, unsigned long gfn) d->evtchn_fifo->event_array[slot] = virt; d->evtchn_fifo->num_evtchns += EVTCHN_FIFO_EVENT_WORDS_PER_PAGE; + /* + * Re-raise any events that were pending while this array page was + * missing. + */ + for ( ; port < d->evtchn_fifo->num_evtchns; port++ ) + { + struct evtchn *evtchn; + + if ( !port_is_valid(d, port) ) + break; + + evtchn = evtchn_from_port(d, port); + if ( evtchn->pending ) + evtchn_fifo_set_pending(d->vcpu[evtchn->notify_vcpu_id], evtchn); + } + return 0; } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0628727..2397537 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -97,6 +97,7 @@ struct evtchn u16 virq; /* state == ECS_VIRQ */ } u; u8 priority; + u8 pending:1; #ifdef FLASK_ENABLE void *ssid; #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 Nov 06 23:02:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Nov 2013 23:02:24 +0000 Received: from [127.0.0.1] (helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBtU-0006sm-Qr; Wed, 06 Nov 2013 22:48:12 +0000 Received: from [85.158.143.247] (helo=mail6.bemta4.messagelabs.com) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBrP-0006qP-90 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:46:03 +0000 Received: from [85.158.143.35:51610] by server-3.bemta-4.messagelabs.com id 16/26-19578-D76CA725; Wed, 06 Nov 2013 22:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1383777915!1482833!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3090 invoked from network); 6 Nov 2013 22:45:16 -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; 6 Nov 2013 22:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeBqd-000054-Dq for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeBqd-0006mm-B7 for xen-changelog@lists.xensource.com; Wed, 06 Nov 2013 22:45:15 +0000 Date: Wed, 06 Nov 2013 22:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: don't lose pending state if FIFO event array page is missing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 917c12302985f7702664faa572f9a2963f4aa947 Author: David Vrabel AuthorDate: Wed Nov 6 10:20:24 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 6 10:20:24 2013 +0100 evtchn: don't lose pending state if FIFO event array page is missing When the FIFO-based ABI is in use, if an event is bound when the corresponding event array page is missing any attempt to set the event pending will lose the event (because there is nowhere to write the pending state). This wasn't initially considered an issue because guests were expected to only bind events once they had expanded the event array, however: 1. A domain may start with events already bound (by the toolstack). 2. The guest does not know what the port number will be until the event is bound (it doesn't know how many already bound events there are), so it does not know how many event array pages are required. This makes it difficult to expand in advanced (the current Linux implementation expands after binding for example). To prevent pending events from being lost because there is no array page, temporarily store the pending state in evtchn->pending. When an array page is added, use this state to set the port as pending. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/event_fifo.c | 47 +++++++++++++++++++++++++++++++++++++++++------ xen/include/xen/sched.h | 1 + 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index bec8d87..64dbfff 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -61,8 +61,16 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) port = evtchn->port; word = evtchn_fifo_word_from_port(d, port); + + /* + * Event array page may not exist yet, save the pending state for + * when the page is added. + */ if ( unlikely(!word) ) + { + evtchn->pending = 1; return; + } /* * No locking around getting the queue. This may race with @@ -322,16 +330,29 @@ static void cleanup_event_array(struct domain *d) xfree(d->evtchn_fifo); } -static void set_priority_all(struct domain *d, unsigned int priority) +static void setup_ports(struct domain *d) { unsigned int port; + /* + * For each port that is already bound: + * + * - save its pending state. + * - set default priority. + */ for ( port = 1; port < d->max_evtchns; port++ ) { + struct evtchn *evtchn; + if ( !port_is_valid(d, port) ) break; - evtchn_port_set_priority(d, evtchn_from_port(d, port), priority); + evtchn = evtchn_from_port(d, port); + + if ( test_bit(port, &shared_info(d, evtchn_pending)) ) + evtchn->pending = 1; + + evtchn_fifo_set_priority(d, evtchn, EVTCHN_FIFO_PRIORITY_DEFAULT); } } @@ -369,9 +390,6 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. - * - * Any ports currently bound will have their priority set to the - * default. */ if ( rc == 0 && !d->evtchn_fifo ) { @@ -382,7 +400,7 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) { d->evtchn_port_ops = &evtchn_port_ops_fifo; d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - set_priority_all(d, EVTCHN_FIFO_PRIORITY_DEFAULT); + setup_ports(d); } } @@ -395,6 +413,7 @@ static int add_page_to_event_array(struct domain *d, unsigned long gfn) { void *virt; unsigned int slot; + unsigned int port = d->evtchn_fifo->num_evtchns; int rc; slot = d->evtchn_fifo->num_evtchns / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE; @@ -408,6 +427,22 @@ static int add_page_to_event_array(struct domain *d, unsigned long gfn) d->evtchn_fifo->event_array[slot] = virt; d->evtchn_fifo->num_evtchns += EVTCHN_FIFO_EVENT_WORDS_PER_PAGE; + /* + * Re-raise any events that were pending while this array page was + * missing. + */ + for ( ; port < d->evtchn_fifo->num_evtchns; port++ ) + { + struct evtchn *evtchn; + + if ( !port_is_valid(d, port) ) + break; + + evtchn = evtchn_from_port(d, port); + if ( evtchn->pending ) + evtchn_fifo_set_pending(d->vcpu[evtchn->notify_vcpu_id], evtchn); + } + return 0; } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0628727..2397537 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -97,6 +97,7 @@ struct evtchn u16 virq; /* state == ECS_VIRQ */ } u; u8 priority; + u8 pending:1; #ifdef FLASK_ENABLE void *ssid; #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 Thu Nov 07 23:44:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF9-0002PJ-4y; Thu, 07 Nov 2013 23:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF8-0002PD-8J for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:06 +0000 Received: from [85.158.143.35:40017] by server-1.bemta-4.messagelabs.com id 68/17-17304-5C52C725; Thu, 07 Nov 2013 23:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383867844!1738617!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30459 invoked from network); 7 Nov 2013 23:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Nov 2013 23:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF5-0008Df-R1 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZF5-000795-KF for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:03 +0000 Date: Thu, 07 Nov 2013 23:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/acpi: Warn about multiple HPET 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 a8a8953873063435e3c73739874edbdce5c114dc Author: Andrew Cooper AuthorDate: Thu Nov 7 15:15:28 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:15:28 2013 +0100 x86/acpi: Warn about multiple HPET tables Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/acpi/boot.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index df26423..6d7984f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -289,6 +289,22 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) return -1; } + /* + * Some BIOSes provide multiple HPET tables. Sometimes this is a BIOS + * bug; the intended way of supporting more than 1 HPET is to use AML + * entries. + * + * If someone finds a real system with two genuine HPET tables, perhaps + * they will be kind and implement support. Until then however, warn + * that we will ignore subsequent tables. + */ + if (hpet_address) + { + printk(KERN_WARNING PREFIX + "Found multiple HPET tables. Only using first\n"); + return -1; + } + hpet_address = hpet_tbl->address.address; hpet_blockid = hpet_tbl->sequence; printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\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 Thu Nov 07 23:44:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFJ-0002Q0-7a; Thu, 07 Nov 2013 23: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 1VeZFI-0002Ps-Qn for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:16 +0000 Received: from [193.109.254.147:47074] by server-5.bemta-14.messagelabs.com id 89/73-13525-0D52C725; Thu, 07 Nov 2013 23:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1383867854!1382611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10881 invoked from network); 7 Nov 2013 23:44: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; 7 Nov 2013 23:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFG-0008Di-1N for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZFF-00079Z-V4 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:13 +0000 Date: Thu, 07 Nov 2013 23:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hpet: Fix ambiguity in broadcast info message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bf1f7ba5cd447e7a0aa05c31038be5bf6197ca3 Author: Andrew Cooper AuthorDate: Thu Nov 7 15:15:45 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:15:45 2013 +0100 x86/hpet: Fix ambiguity in broadcast info message "$N will be used for broadcast" is ambiguous between "$N timers" or "timer $N", particuarly when N is 0. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hpet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 99882b1..4373791 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -430,8 +430,8 @@ static void __init hpet_fsb_cap_lookup(void) num_hpets_used++; } - printk(XENLOG_INFO "HPET: %u timers (%u will be used for broadcast)\n", - num_chs, num_hpets_used); + printk(XENLOG_INFO "HPET: %u timers usable for broadcast (%u total)\n", + num_hpets_used, num_chs); } static struct hpet_event_channel *hpet_get_channel(unsigned int cpu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 07 23:44:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFJ-0002Q0-7a; Thu, 07 Nov 2013 23: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 1VeZFI-0002Ps-Qn for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:16 +0000 Received: from [193.109.254.147:47074] by server-5.bemta-14.messagelabs.com id 89/73-13525-0D52C725; Thu, 07 Nov 2013 23:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1383867854!1382611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10881 invoked from network); 7 Nov 2013 23:44: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; 7 Nov 2013 23:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFG-0008Di-1N for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZFF-00079Z-V4 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:13 +0000 Date: Thu, 07 Nov 2013 23:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hpet: Fix ambiguity in broadcast info message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bf1f7ba5cd447e7a0aa05c31038be5bf6197ca3 Author: Andrew Cooper AuthorDate: Thu Nov 7 15:15:45 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:15:45 2013 +0100 x86/hpet: Fix ambiguity in broadcast info message "$N will be used for broadcast" is ambiguous between "$N timers" or "timer $N", particuarly when N is 0. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hpet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 99882b1..4373791 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -430,8 +430,8 @@ static void __init hpet_fsb_cap_lookup(void) num_hpets_used++; } - printk(XENLOG_INFO "HPET: %u timers (%u will be used for broadcast)\n", - num_chs, num_hpets_used); + printk(XENLOG_INFO "HPET: %u timers usable for broadcast (%u total)\n", + num_hpets_used, num_chs); } static struct hpet_event_channel *hpet_get_channel(unsigned int cpu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 07 23:44:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF9-0002PJ-4y; Thu, 07 Nov 2013 23:44:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF8-0002PD-8J for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:06 +0000 Received: from [85.158.143.35:40017] by server-1.bemta-4.messagelabs.com id 68/17-17304-5C52C725; Thu, 07 Nov 2013 23:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1383867844!1738617!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30459 invoked from network); 7 Nov 2013 23:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Nov 2013 23:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZF5-0008Df-R1 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZF5-000795-KF for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:03 +0000 Date: Thu, 07 Nov 2013 23:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/acpi: Warn about multiple HPET 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 a8a8953873063435e3c73739874edbdce5c114dc Author: Andrew Cooper AuthorDate: Thu Nov 7 15:15:28 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:15:28 2013 +0100 x86/acpi: Warn about multiple HPET tables Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/acpi/boot.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index df26423..6d7984f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -289,6 +289,22 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) return -1; } + /* + * Some BIOSes provide multiple HPET tables. Sometimes this is a BIOS + * bug; the intended way of supporting more than 1 HPET is to use AML + * entries. + * + * If someone finds a real system with two genuine HPET tables, perhaps + * they will be kind and implement support. Until then however, warn + * that we will ignore subsequent tables. + */ + if (hpet_address) + { + printk(KERN_WARNING PREFIX + "Found multiple HPET tables. Only using first\n"); + return -1; + } + hpet_address = hpet_tbl->address.address; hpet_blockid = hpet_tbl->sequence; printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\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 Thu Nov 07 23:44:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44: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 1VeZFU-0002RK-Ah; Thu, 07 Nov 2013 23:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFT-0002RA-93 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:27 +0000 Received: from [85.158.139.211:48775] by server-9.bemta-5.messagelabs.com id A2/13-12926-AD52C725; Thu, 07 Nov 2013 23:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383867864!715001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12182 invoked from network); 7 Nov 2013 23:44:25 -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; 7 Nov 2013 23:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFQ-0008Dr-AW for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZFQ-00079v-63 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:24 +0000 Date: Thu, 07 Nov 2013 23:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/msi: Refactor msi_compose_message() to not require an irq_desc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac6e1ae87b229f452fa5859bf95dc51459eaeb68 Author: Andrew Cooper AuthorDate: Thu Nov 7 15:17:48 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:17:48 2013 +0100 x86/msi: Refactor msi_compose_message() to not require an irq_desc Subsequent changes will cause HPET MSIs to not have an associated IRQ. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hpet.c | 2 +- xen/arch/x86/msi.c | 9 ++++----- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-x86/msi.h | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 4373791..3a4f7e8 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -331,7 +331,7 @@ static int __hpet_setup_msi_irq(struct irq_desc *desc) { struct msi_msg msg; - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); return hpet_msi_write(desc->action->dev_id, &msg); } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index b43c36a..284042e 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -124,13 +124,12 @@ static void msix_put_fixmap(struct arch_msix *msix, int idx) /* * MSI message composition */ -void msi_compose_msg(struct irq_desc *desc, struct msi_msg *msg) +void msi_compose_msg(unsigned vector, const cpumask_t *cpu_mask, struct msi_msg *msg) { unsigned dest; - int vector = desc->arch.vector; memset(msg, 0, sizeof(*msg)); - if ( !cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) { + if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) { dprintk(XENLOG_ERR,"%s, compose msi message error!!\n", __func__); return; } @@ -138,7 +137,7 @@ void msi_compose_msg(struct irq_desc *desc, struct msi_msg *msg) if ( vector ) { cpumask_t *mask = this_cpu(scratch_mask); - cpumask_and(mask, desc->arch.cpu_mask, &cpu_online_map); + cpumask_and(mask, cpu_mask, &cpu_online_map); dest = cpu_mask_to_apicid(mask); msg->address_hi = MSI_ADDR_BASE_HI; @@ -491,7 +490,7 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, desc->msi_desc = msidesc; desc->handler = handler; - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); return write_msi_msg(msidesc, &msg); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2dbe97a..97d5b5e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1039,7 +1039,7 @@ static void dma_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask) return; } - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); /* Are these overrides really needed? */ if (x2apic_enabled) msg.address_hi = dest & 0xFFFFFF00; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 9eeef63..89a9266 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -231,7 +231,8 @@ struct arch_msix { }; void early_msi_init(void); -void msi_compose_msg(struct irq_desc *, struct msi_msg *); +void msi_compose_msg(unsigned vector, const cpumask_t *mask, + struct msi_msg *msg); void __msi_set_enable(u16 seg, u8 bus, u8 slot, u8 func, int pos, int enable); void mask_msi_irq(struct irq_desc *); void unmask_msi_irq(struct irq_desc *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 07 23:44:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Nov 2013 23:44: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 1VeZFU-0002RK-Ah; Thu, 07 Nov 2013 23:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFT-0002RA-93 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:27 +0000 Received: from [85.158.139.211:48775] by server-9.bemta-5.messagelabs.com id A2/13-12926-AD52C725; Thu, 07 Nov 2013 23:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1383867864!715001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12182 invoked from network); 7 Nov 2013 23:44:25 -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; 7 Nov 2013 23:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeZFQ-0008Dr-AW for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeZFQ-00079v-63 for xen-changelog@lists.xensource.com; Thu, 07 Nov 2013 23:44:24 +0000 Date: Thu, 07 Nov 2013 23:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/msi: Refactor msi_compose_message() to not require an irq_desc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac6e1ae87b229f452fa5859bf95dc51459eaeb68 Author: Andrew Cooper AuthorDate: Thu Nov 7 15:17:48 2013 +0100 Commit: Jan Beulich CommitDate: Thu Nov 7 15:17:48 2013 +0100 x86/msi: Refactor msi_compose_message() to not require an irq_desc Subsequent changes will cause HPET MSIs to not have an associated IRQ. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hpet.c | 2 +- xen/arch/x86/msi.c | 9 ++++----- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-x86/msi.h | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 4373791..3a4f7e8 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -331,7 +331,7 @@ static int __hpet_setup_msi_irq(struct irq_desc *desc) { struct msi_msg msg; - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); return hpet_msi_write(desc->action->dev_id, &msg); } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index b43c36a..284042e 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -124,13 +124,12 @@ static void msix_put_fixmap(struct arch_msix *msix, int idx) /* * MSI message composition */ -void msi_compose_msg(struct irq_desc *desc, struct msi_msg *msg) +void msi_compose_msg(unsigned vector, const cpumask_t *cpu_mask, struct msi_msg *msg) { unsigned dest; - int vector = desc->arch.vector; memset(msg, 0, sizeof(*msg)); - if ( !cpumask_intersects(desc->arch.cpu_mask, &cpu_online_map) ) { + if ( !cpumask_intersects(cpu_mask, &cpu_online_map) ) { dprintk(XENLOG_ERR,"%s, compose msi message error!!\n", __func__); return; } @@ -138,7 +137,7 @@ void msi_compose_msg(struct irq_desc *desc, struct msi_msg *msg) if ( vector ) { cpumask_t *mask = this_cpu(scratch_mask); - cpumask_and(mask, desc->arch.cpu_mask, &cpu_online_map); + cpumask_and(mask, cpu_mask, &cpu_online_map); dest = cpu_mask_to_apicid(mask); msg->address_hi = MSI_ADDR_BASE_HI; @@ -491,7 +490,7 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, desc->msi_desc = msidesc; desc->handler = handler; - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); return write_msi_msg(msidesc, &msg); } diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2dbe97a..97d5b5e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1039,7 +1039,7 @@ static void dma_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask) return; } - msi_compose_msg(desc, &msg); + msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); /* Are these overrides really needed? */ if (x2apic_enabled) msg.address_hi = dest & 0xFFFFFF00; diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 9eeef63..89a9266 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -231,7 +231,8 @@ struct arch_msix { }; void early_msi_init(void); -void msi_compose_msg(struct irq_desc *, struct msi_msg *); +void msi_compose_msg(unsigned vector, const cpumask_t *mask, + struct msi_msg *msg); void __msi_set_enable(u16 seg, u8 bus, u8 slot, u8 func, int pos, int enable); void mask_msi_irq(struct irq_desc *); void unmask_msi_irq(struct irq_desc *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezt5-0003AY-9E; Sat, 09 Nov 2013 04: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 1Vezt4-0003AS-0V for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:06 +0000 Received: from [85.158.137.68:64047] by server-15.bemta-3.messagelabs.com id 11/B1-10403-9D5BD725; Sat, 09 Nov 2013 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1383970263!469220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24482 invoked from network); 9 Nov 2013 04:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Nov 2013 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezt1-000075-8B for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vezt1-0004hl-4J for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:03 +0000 Date: Sat, 09 Nov 2013 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix restart of RTC periodic timer with vpt_align=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 48535f5798e3e237d9920a74c1ce3802958136c0 Author: Kouya Shimura AuthorDate: Fri Nov 8 11:07:14 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:07:14 2013 +0100 x86/hvm: fix restart of RTC periodic timer with vpt_align=1 The commit 58afa7ef "x86/hvm: Run the RTC periodic timer on a consistent time series" aligns the RTC periodic timer to the VM's boot time. However, it's aligned later again to the system time in create_periodic_time() with vpt_align=1. The next tick might be skipped. Signed-off-by: Kouya Shimura Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/hvm/rtc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d1a6848..cdedefe 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -130,7 +130,10 @@ static void rtc_timer_update(RTCState *s) s->pt_code = period_code; period = 1 << (period_code - 1); /* period in 32 Khz cycles */ period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ - delta = period - ((NOW() - s->start_time) % period); + if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) + delta = 0; + else + delta = period - ((NOW() - s->start_time) % period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, NULL, s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezt5-0003AY-9E; Sat, 09 Nov 2013 04: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 1Vezt4-0003AS-0V for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:06 +0000 Received: from [85.158.137.68:64047] by server-15.bemta-3.messagelabs.com id 11/B1-10403-9D5BD725; Sat, 09 Nov 2013 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1383970263!469220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24482 invoked from network); 9 Nov 2013 04:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Nov 2013 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezt1-000075-8B for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vezt1-0004hl-4J for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:03 +0000 Date: Sat, 09 Nov 2013 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix restart of RTC periodic timer with vpt_align=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 48535f5798e3e237d9920a74c1ce3802958136c0 Author: Kouya Shimura AuthorDate: Fri Nov 8 11:07:14 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:07:14 2013 +0100 x86/hvm: fix restart of RTC periodic timer with vpt_align=1 The commit 58afa7ef "x86/hvm: Run the RTC periodic timer on a consistent time series" aligns the RTC periodic timer to the VM's boot time. However, it's aligned later again to the system time in create_periodic_time() with vpt_align=1. The next tick might be skipped. Signed-off-by: Kouya Shimura Reviewed-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/hvm/rtc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d1a6848..cdedefe 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -130,7 +130,10 @@ static void rtc_timer_update(RTCState *s) s->pt_code = period_code; period = 1 << (period_code - 1); /* period in 32 Khz cycles */ period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ - delta = period - ((NOW() - s->start_time) % period); + if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) + delta = 0; + else + delta = period - ((NOW() - s->start_time) % period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, NULL, s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1VeztP-0003BW-CE; Sat, 09 Nov 2013 04:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztO-0003BP-KS for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:26 +0000 Received: from [85.158.143.35:53929] by server-2.bemta-4.messagelabs.com id 52/60-06473-DE5BD725; Sat, 09 Nov 2013 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383970284!2032053!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9268 invoked from network); 9 Nov 2013 04:11:24 -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; 9 Nov 2013 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztL-00007C-NO for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztL-0004jC-Kw for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:23 +0000 Date: Sat, 09 Nov 2013 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: drop redundant newlines from blexit() argument 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 0d7fe8fe3be2dcba30efdaf88e66514246938aa2 Author: Jan Beulich AuthorDate: Fri Nov 8 11:09:06 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:09:06 2013 +0100 x86/EFI: drop redundant newlines from blexit() argument strings The function issues a newline itself. Also correct two slightly misplaced __initdata annotations. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 68c9abe..0dd935c 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -61,8 +61,8 @@ struct file { static EFI_BOOT_SERVICES *__initdata efi_bs; static EFI_HANDLE __initdata efi_ih; -static SIMPLE_TEXT_OUTPUT_INTERFACE __initdata *StdOut; -static SIMPLE_TEXT_OUTPUT_INTERFACE __initdata *StdErr; +static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; +static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; @@ -736,7 +736,7 @@ static void __init relocate_image(unsigned long delta) } break; default: - blexit(L"Unsupported relocation type\r\n"); + blexit(L"Unsupported relocation type"); } } base_relocs = (const void *)(base_relocs->entries + i + (i & 1)); @@ -804,9 +804,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) xen_phys_start = (UINTN)loaded_image->ImageBase; if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 ) - blexit(L"Xen must be loaded below 4Gb.\r\n"); + blexit(L"Xen must be loaded below 4Gb."); if ( xen_phys_start & ((1 << L2_PAGETABLE_SHIFT) - 1) ) - blexit(L"Xen must be loaded at a 2Mb boundary.\r\n"); + blexit(L"Xen must be loaded at a 2Mb boundary."); trampoline_xen_phys_start = xen_phys_start; /* Get the file system interface. */ @@ -925,13 +925,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) *tail = 0; } if ( !tail ) - blexit(L"No configuration file found\r\n"); + blexit(L"No configuration file found."); PrintStr(L"Using configuration file '"); PrintStr(file_name); PrintStr(L"'\r\n"); } else if ( !read_file(dir_handle, cfg_file_name, &cfg) ) - blexit(L"Configuration file not found\r\n"); + blexit(L"Configuration file not found."); pre_parse(&cfg); if ( section.w ) @@ -954,13 +954,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) PrintStr(L"Chained configuration file '"); PrintStr(name.w); efi_bs->FreePool(name.w); - blexit(L"'not found\r\n"); + blexit(L"'not found."); } pre_parse(&cfg); efi_bs->FreePool(name.w); } if ( !name.s ) - blexit(L"No Dom0 kernel image specified\r\n"); + blexit(L"No Dom0 kernel image specified."); split_value(name.s); read_file(dir_handle, s2w(&name), &kernel); efi_bs->FreePool(name.w); @@ -968,7 +968,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, (void **)&shim_lock)) && shim_lock->Verify(kernel.ptr, kernel.size) != EFI_SUCCESS ) - blexit(L"Dom0 kernel image could not be verified\r\n"); + blexit(L"Dom0 kernel image could not be verified."); name.s = get_value(&cfg, section.s, "ramdisk"); if ( name.s ) @@ -1384,12 +1384,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) mbi.mem_upper -= efi_memmap_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) - blexit(L"Out of static memory\r\n"); + blexit(L"Out of static memory"); efi_memmap = (void *)(long)mbi.mem_upper; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map\r\n"); + blexit(L"Cannot obtain memory map"); /* Populate E820 table and check trampoline area availability. */ e = e820map - 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 Nov 09 04:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1VeztP-0003BW-CE; Sat, 09 Nov 2013 04:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztO-0003BP-KS for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:26 +0000 Received: from [85.158.143.35:53929] by server-2.bemta-4.messagelabs.com id 52/60-06473-DE5BD725; Sat, 09 Nov 2013 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1383970284!2032053!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9268 invoked from network); 9 Nov 2013 04:11:24 -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; 9 Nov 2013 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztL-00007C-NO for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztL-0004jC-Kw for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:23 +0000 Date: Sat, 09 Nov 2013 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: drop redundant newlines from blexit() argument 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 0d7fe8fe3be2dcba30efdaf88e66514246938aa2 Author: Jan Beulich AuthorDate: Fri Nov 8 11:09:06 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:09:06 2013 +0100 x86/EFI: drop redundant newlines from blexit() argument strings The function issues a newline itself. Also correct two slightly misplaced __initdata annotations. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 68c9abe..0dd935c 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -61,8 +61,8 @@ struct file { static EFI_BOOT_SERVICES *__initdata efi_bs; static EFI_HANDLE __initdata efi_ih; -static SIMPLE_TEXT_OUTPUT_INTERFACE __initdata *StdOut; -static SIMPLE_TEXT_OUTPUT_INTERFACE __initdata *StdErr; +static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdOut; +static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; @@ -736,7 +736,7 @@ static void __init relocate_image(unsigned long delta) } break; default: - blexit(L"Unsupported relocation type\r\n"); + blexit(L"Unsupported relocation type"); } } base_relocs = (const void *)(base_relocs->entries + i + (i & 1)); @@ -804,9 +804,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) xen_phys_start = (UINTN)loaded_image->ImageBase; if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 ) - blexit(L"Xen must be loaded below 4Gb.\r\n"); + blexit(L"Xen must be loaded below 4Gb."); if ( xen_phys_start & ((1 << L2_PAGETABLE_SHIFT) - 1) ) - blexit(L"Xen must be loaded at a 2Mb boundary.\r\n"); + blexit(L"Xen must be loaded at a 2Mb boundary."); trampoline_xen_phys_start = xen_phys_start; /* Get the file system interface. */ @@ -925,13 +925,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) *tail = 0; } if ( !tail ) - blexit(L"No configuration file found\r\n"); + blexit(L"No configuration file found."); PrintStr(L"Using configuration file '"); PrintStr(file_name); PrintStr(L"'\r\n"); } else if ( !read_file(dir_handle, cfg_file_name, &cfg) ) - blexit(L"Configuration file not found\r\n"); + blexit(L"Configuration file not found."); pre_parse(&cfg); if ( section.w ) @@ -954,13 +954,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) PrintStr(L"Chained configuration file '"); PrintStr(name.w); efi_bs->FreePool(name.w); - blexit(L"'not found\r\n"); + blexit(L"'not found."); } pre_parse(&cfg); efi_bs->FreePool(name.w); } if ( !name.s ) - blexit(L"No Dom0 kernel image specified\r\n"); + blexit(L"No Dom0 kernel image specified."); split_value(name.s); read_file(dir_handle, s2w(&name), &kernel); efi_bs->FreePool(name.w); @@ -968,7 +968,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, (void **)&shim_lock)) && shim_lock->Verify(kernel.ptr, kernel.size) != EFI_SUCCESS ) - blexit(L"Dom0 kernel image could not be verified\r\n"); + blexit(L"Dom0 kernel image could not be verified."); name.s = get_value(&cfg, section.s, "ramdisk"); if ( name.s ) @@ -1384,12 +1384,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) mbi.mem_upper -= efi_memmap_size; mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); if ( mbi.mem_upper < xen_phys_start ) - blexit(L"Out of static memory\r\n"); + blexit(L"Out of static memory"); efi_memmap = (void *)(long)mbi.mem_upper; status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, &efi_mdesc_size, &mdesc_ver); if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map\r\n"); + blexit(L"Cannot obtain memory map"); /* Populate E820 table and check trampoline area availability. */ e = e820map - 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 Nov 09 04:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04: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 1VeztT-0003C4-Ew; Sat, 09 Nov 2013 04:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztS-0003Bw-HZ for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:30 +0000 Received: from [85.158.139.211:7419] by server-17.bemta-5.messagelabs.com id BB/68-17059-1F5BD725; Sat, 09 Nov 2013 04:11:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1383970287!955342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4840 invoked from network); 9 Nov 2013 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Nov 2013 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztB-000078-GG for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztB-0004iK-DE for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:13 +0000 Date: Sat, 09 Nov 2013 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1f2dfe8f6a559bc28935f24e31bb33d17d9713d Author: Jan Beulich AuthorDate: Fri Nov 8 11:08:32 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:08:32 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 66a6fdb..68c9abe 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -746,6 +746,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -765,7 +781,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1268,23 +1283,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and boot-map page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1400,10 +1405,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1431,6 +1440,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04: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 1VeztT-0003C4-Ew; Sat, 09 Nov 2013 04:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztS-0003Bw-HZ for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:30 +0000 Received: from [85.158.139.211:7419] by server-17.bemta-5.messagelabs.com id BB/68-17059-1F5BD725; Sat, 09 Nov 2013 04:11:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1383970287!955342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4840 invoked from network); 9 Nov 2013 04:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Nov 2013 04:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztB-000078-GG for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztB-0004iK-DE for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:13 +0000 Date: Sat, 09 Nov 2013 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1f2dfe8f6a559bc28935f24e31bb33d17d9713d Author: Jan Beulich AuthorDate: Fri Nov 8 11:08:32 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:08:32 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 66a6fdb..68c9abe 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -746,6 +746,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -765,7 +781,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1268,23 +1283,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and boot-map page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1400,10 +1405,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1431,6 +1440,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1VeztZ-0003Cv-HX; Sat, 09 Nov 2013 04:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztY-0003CY-EF for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:36 +0000 Received: from [85.158.143.35:62552] by server-3.bemta-4.messagelabs.com id 03/69-19578-7F5BD725; Sat, 09 Nov 2013 04:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1383970294!2021464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26473 invoked from network); 9 Nov 2013 04:11:35 -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; 9 Nov 2013 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztV-00007J-Us for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztV-0004jf-Rs for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:33 +0000 Date: Sat, 09 Nov 2013 04:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nestedsvm: remove pointless BUG_ON X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4e2dfccdd1dc4775f248a0cc726a86299a15dea Author: Matthew Daley AuthorDate: Fri Nov 8 11:09:37 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:09:37 2013 +0100 nestedsvm: remove pointless BUG_ON It's already handled just above. Signed-off-by: Matthew Daley --- xen/arch/x86/hvm/svm/nestedsvm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index e32c872..705b653 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -847,7 +847,6 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, /* MSR not in the permission map: Let the guest handle it. */ return NESTEDHVM_VMEXIT_INJECT; - BUG_ON(msr_bit == NULL); msr &= 0x1fff; if (write) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1VeztZ-0003Cv-HX; Sat, 09 Nov 2013 04:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztY-0003CY-EF for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:36 +0000 Received: from [85.158.143.35:62552] by server-3.bemta-4.messagelabs.com id 03/69-19578-7F5BD725; Sat, 09 Nov 2013 04:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1383970294!2021464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26473 invoked from network); 9 Nov 2013 04:11:35 -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; 9 Nov 2013 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VeztV-00007J-Us for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VeztV-0004jf-Rs for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:33 +0000 Date: Sat, 09 Nov 2013 04:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nestedsvm: remove pointless BUG_ON X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4e2dfccdd1dc4775f248a0cc726a86299a15dea Author: Matthew Daley AuthorDate: Fri Nov 8 11:09:37 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:09:37 2013 +0100 nestedsvm: remove pointless BUG_ON It's already handled just above. Signed-off-by: Matthew Daley --- xen/arch/x86/hvm/svm/nestedsvm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index e32c872..705b653 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -847,7 +847,6 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, /* MSR not in the permission map: Let the guest handle it. */ return NESTEDHVM_VMEXIT_INJECT; - BUG_ON(msr_bit == NULL); msr &= 0x1fff; if (write) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1Veztj-0003El-Lh; Sat, 09 Nov 2013 04:11:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezti-0003EV-UT for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:47 +0000 Received: from [85.158.143.35:54365] by server-1.bemta-4.messagelabs.com id 39/7B-17304-206BD725; Sat, 09 Nov 2013 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1383970304!2015996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16108 invoked from network); 9 Nov 2013 04:11:45 -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 Nov 2013 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Veztg-00007Q-7R for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Veztg-0004k1-20 for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:44 +0000 Date: Sat, 09 Nov 2013 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: remove repeated statement in netfront_input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c42fd7f914cbe8e2c2a3a7a5f75ff457b0f4845 Author: Matthew Daley AuthorDate: Fri Nov 8 11:10:08 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:10:08 2013 +0100 mini-os: remove repeated statement in netfront_input Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/lwip-net.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/lwip-net.c b/extras/mini-os/lwip-net.c index 9fded11..449b70f 100644 --- a/extras/mini-os/lwip-net.c +++ b/extras/mini-os/lwip-net.c @@ -194,8 +194,6 @@ netfront_input(struct netif *netif, unsigned char* data, int len) /* points to packet payload, which starts with an Ethernet header */ ethhdr = p->payload; - - ethhdr = p->payload; switch (htons(ethhdr->type)) { /* IP packet? */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 09 04:11:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Nov 2013 04:11: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 1Veztj-0003El-Lh; Sat, 09 Nov 2013 04:11:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vezti-0003EV-UT for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:47 +0000 Received: from [85.158.143.35:54365] by server-1.bemta-4.messagelabs.com id 39/7B-17304-206BD725; Sat, 09 Nov 2013 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1383970304!2015996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16108 invoked from network); 9 Nov 2013 04:11:45 -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 Nov 2013 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Veztg-00007Q-7R for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Veztg-0004k1-20 for xen-changelog@lists.xensource.com; Sat, 09 Nov 2013 04:11:44 +0000 Date: Sat, 09 Nov 2013 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: remove repeated statement in netfront_input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c42fd7f914cbe8e2c2a3a7a5f75ff457b0f4845 Author: Matthew Daley AuthorDate: Fri Nov 8 11:10:08 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 8 11:10:08 2013 +0100 mini-os: remove repeated statement in netfront_input Signed-off-by: Matthew Daley Acked-by: Samuel Thibault --- extras/mini-os/lwip-net.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/lwip-net.c b/extras/mini-os/lwip-net.c index 9fded11..449b70f 100644 --- a/extras/mini-os/lwip-net.c +++ b/extras/mini-os/lwip-net.c @@ -194,8 +194,6 @@ netfront_input(struct netif *netif, unsigned char* data, int len) /* points to packet payload, which starts with an Ethernet header */ ethhdr = p->payload; - - ethhdr = p->payload; switch (htons(ethhdr->type)) { /* IP packet? */ -- generated by git-patchbot for /home/xen/git/xen.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 Nov 11 18:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 18:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwdf-0006qk-Ev; Mon, 11 Nov 2013 18:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwde-0006qf-Mj for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:06 +0000 Received: from [193.109.254.147:32698] by server-6.bemta-14.messagelabs.com id 7B/86-19621-A0821825; Mon, 11 Nov 2013 18:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384196104!2080936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16117 invoked from network); 11 Nov 2013 18:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2013 18:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwdc-0007Op-4B for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfwdb-000513-EA for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:03 +0000 Date: Mon, 11 Nov 2013 18:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b10c183d5cb230e7fd018d2a2aa286b92f6c5b91 Author: Jan Beulich AuthorDate: Mon Nov 11 09:18:59 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:18:59 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell master commit: 4e87bc5b03e05123ba5c888f77969140c8ebd1bf master date: 2013-11-11 09:15:04 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 278b50f..1b95a46 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1075,15 +1075,10 @@ int nvmx_handle_vmxoff(struct cpu_user_regs *regs) return X86EMUL_OKAY; } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1100,6 +1095,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) { int launched; struct vcpu *v = current; + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1119,8 +1118,11 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { int launched; - int rc; struct vcpu *v = current; + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- 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 Nov 11 18:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 18:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwdf-0006qk-Ev; Mon, 11 Nov 2013 18:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwde-0006qf-Mj for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:06 +0000 Received: from [193.109.254.147:32698] by server-6.bemta-14.messagelabs.com id 7B/86-19621-A0821825; Mon, 11 Nov 2013 18:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384196104!2080936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16117 invoked from network); 11 Nov 2013 18:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2013 18:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfwdc-0007Op-4B for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfwdb-000513-EA for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 18:55:03 +0000 Date: Mon, 11 Nov 2013 18:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b10c183d5cb230e7fd018d2a2aa286b92f6c5b91 Author: Jan Beulich AuthorDate: Mon Nov 11 09:18:59 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:18:59 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell master commit: 4e87bc5b03e05123ba5c888f77969140c8ebd1bf master date: 2013-11-11 09:15:04 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 278b50f..1b95a46 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1075,15 +1075,10 @@ int nvmx_handle_vmxoff(struct cpu_user_regs *regs) return X86EMUL_OKAY; } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1100,6 +1095,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) { int launched; struct vcpu *v = current; + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1119,8 +1118,11 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { int launched; - int rc; struct vcpu *v = current; + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- 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 Nov 11 20:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfxzr-0004bv-8J; Mon, 11 Nov 2013 20: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 1Vfxzp-0004bk-J4 for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:05 +0000 Received: from [85.158.143.35:9292] by server-2.bemta-4.messagelabs.com id 6E/4F-06473-C6C31825; Mon, 11 Nov 2013 20:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384201323!2461709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22067 invoked from network); 11 Nov 2013 20:22: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; 11 Nov 2013 20:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfxzn-0008Np-65 for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfxzn-0007Me-2Q for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:03 +0000 Date: Mon, 11 Nov 2013 20:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e87bc5b03e05123ba5c888f77969140c8ebd1bf Author: Jan Beulich AuthorDate: Mon Nov 11 09:15:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:15:04 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2b2de77..2647036 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1509,15 +1509,10 @@ static void clear_vvmcs_launched(struct list_head *launched_list, } } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1536,6 +1531,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1555,10 +1554,13 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; - int rc; struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 11 20:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfxzr-0004bv-8J; Mon, 11 Nov 2013 20: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 1Vfxzp-0004bk-J4 for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:05 +0000 Received: from [85.158.143.35:9292] by server-2.bemta-4.messagelabs.com id 6E/4F-06473-C6C31825; Mon, 11 Nov 2013 20:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384201323!2461709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22067 invoked from network); 11 Nov 2013 20:22: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; 11 Nov 2013 20:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfxzn-0008Np-65 for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfxzn-0007Me-2Q for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:03 +0000 Date: Mon, 11 Nov 2013 20:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e87bc5b03e05123ba5c888f77969140c8ebd1bf Author: Jan Beulich AuthorDate: Mon Nov 11 09:15:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:15:04 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2b2de77..2647036 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1509,15 +1509,10 @@ static void clear_vvmcs_launched(struct list_head *launched_list, } } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1536,6 +1531,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1555,10 +1554,13 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; - int rc; struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 11 20:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfy02-0004ct-B5; Mon, 11 Nov 2013 20: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 1Vfy00-0004cc-Vz for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:17 +0000 Received: from [85.158.137.68:17702] by server-6.bemta-3.messagelabs.com id FF/E8-23777-87C31825; Mon, 11 Nov 2013 20:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384201333!837606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15175 invoked from network); 11 Nov 2013 20:22:14 -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; 11 Nov 2013 20:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfxzx-0008Ns-Fv for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfxzx-0007Nq-AO for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:13 +0000 Date: Mon, 11 Nov 2013 20:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: don't probe CPUID faulting on family 0xf 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 f214ac959a471176e6ea195fb1952429f50ad7de Author: Jan Beulich AuthorDate: Mon Nov 11 11:00:21 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 11:00:21 2013 +0100 x86/Intel: don't probe CPUID faulting on family 0xf CPUs These are known to not support the feature, so we can save ourselves from emitting the resulting #GP fault recovery related message (which might worry people looking at the logs). Signed-off-by: Jan Beulich Acked-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index e855211..27fe762 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -204,7 +204,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) detect_ht(c); } - if (smp_processor_id() == 0) { + if (c == &boot_cpu_data && c->x86 == 6) { if (probe_intel_cpuid_faulting()) set_bit(X86_FEATURE_CPUID_FAULTING, c->x86_capability); } else if (boot_cpu_has(X86_FEATURE_CPUID_FAULTING)) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 11 20:22:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfy02-0004ct-B5; Mon, 11 Nov 2013 20: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 1Vfy00-0004cc-Vz for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:17 +0000 Received: from [85.158.137.68:17702] by server-6.bemta-3.messagelabs.com id FF/E8-23777-87C31825; Mon, 11 Nov 2013 20:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384201333!837606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15175 invoked from network); 11 Nov 2013 20:22:14 -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; 11 Nov 2013 20:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfxzx-0008Ns-Fv for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfxzx-0007Nq-AO for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:13 +0000 Date: Mon, 11 Nov 2013 20:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/Intel: don't probe CPUID faulting on family 0xf 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 f214ac959a471176e6ea195fb1952429f50ad7de Author: Jan Beulich AuthorDate: Mon Nov 11 11:00:21 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 11:00:21 2013 +0100 x86/Intel: don't probe CPUID faulting on family 0xf CPUs These are known to not support the feature, so we can save ourselves from emitting the resulting #GP fault recovery related message (which might worry people looking at the logs). Signed-off-by: Jan Beulich Acked-by: Liu Jinsong Acked-by: Keir Fraser --- xen/arch/x86/cpu/intel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index e855211..27fe762 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -204,7 +204,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) detect_ht(c); } - if (smp_processor_id() == 0) { + if (c == &boot_cpu_data && c->x86 == 6) { if (probe_intel_cpuid_faulting()) set_bit(X86_FEATURE_CPUID_FAULTING, c->x86_capability); } else if (boot_cpu_has(X86_FEATURE_CPUID_FAULTING)) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 11 20:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfy0B-0004et-Ez; Mon, 11 Nov 2013 20:22:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfy0A-0004eb-9w for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:26 +0000 Received: from [85.158.143.35:13953] by server-3.bemta-4.messagelabs.com id 8A/57-19578-18C31825; Mon, 11 Nov 2013 20:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1384201343!2477937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31327 invoked from network); 11 Nov 2013 20:22:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2013 20:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfy07-0008Nz-Kv for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfy07-0007OC-Is for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:23 +0000 Date: Mon, 11 Nov 2013 20:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/idle: reduce contention on ACPI register accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 178fd279dc138243b514b4ecd48509e4bf5d1ede Author: Jan Beulich AuthorDate: Mon Nov 11 11:01:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 11:01:04 2013 +0100 x86/idle: reduce contention on ACPI register accesses Other than when they're located in I/O port space, accessing them when in MMIO space (currently) implies usage of some sort of global lock: In -unstable this would be due to the use of vmap(), is older trees the necessary locking was introduced by 2ee9cbf9 ("ACPI: fix acpi_os_map_memory()"). This contention was observed to result in Dom0 kernel soft lockups during the loading of the ACPI processor driver there on systems with very many CPU cores. There are a couple of things being done for this: - re-order elements of an if() condition so that the register access only happens when we really need it - turn off arbitration disabling only when the first CPU leaves C3 (paralleling how arbitration disabling gets turned on) - only set the (global) bus master reload flag once (when the first target CPU gets processed) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/cpu_idle.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 870fab8..9313285 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -439,8 +439,8 @@ static void acpi_processor_idle(void) (next_state = cpuidle_current_governor->select(power)) > 0 ) { cx = &power->states[next_state]; - if ( power->flags.bm_check && acpi_idle_bm_check() - && cx->type == ACPI_STATE_C3 ) + if ( cx->type == ACPI_STATE_C3 && power->flags.bm_check && + acpi_idle_bm_check() ) cx = power->safe_state; if ( cx->idx > max_cstate ) cx = &power->states[max_cstate]; @@ -563,8 +563,8 @@ static void acpi_processor_idle(void) { /* Enable bus master arbitration */ spin_lock(&c3_cpu_status.lock); - acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); - c3_cpu_status.count--; + if ( c3_cpu_status.count-- == num_online_cpus() ) + acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); spin_unlock(&c3_cpu_status.lock); } @@ -821,12 +821,10 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) return -EINVAL; /* All the logic here assumes flags.bm_check is same across all CPUs */ - if ( bm_check_flag == -1 ) + if ( bm_check_flag < 0 ) { /* Determine whether bm_check is needed based on CPU */ acpi_processor_power_init_bm_check(&(power->flags)); - bm_check_flag = power->flags.bm_check; - bm_control_flag = power->flags.bm_control; } else { @@ -853,14 +851,13 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) } } /* - * On older chipsets, BM_RLD needs to be set - * in order for Bus Master activity to wake the - * system from C3. Newer chipsets handle DMA - * during C3 automatically and BM_RLD is a NOP. - * In either case, the proper way to - * handle BM_RLD is to set it and leave it set. + * On older chipsets, BM_RLD needs to be set in order for Bus + * Master activity to wake the system from C3, hence + * acpi_set_register() is always being called once below. Newer + * chipsets handle DMA during C3 automatically and BM_RLD is a + * NOP. In either case, the proper way to handle BM_RLD is to + * set it and leave it set. */ - acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1); } else { @@ -875,7 +872,13 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) " for C3 to be enabled on SMP systems\n")); return -EINVAL; } - acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); + } + + if ( bm_check_flag < 0 ) + { + bm_check_flag = power->flags.bm_check; + bm_control_flag = power->flags.bm_control; + acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, bm_check_flag); } 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 Nov 11 20:22:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Nov 2013 20: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 1Vfy0B-0004et-Ez; Mon, 11 Nov 2013 20:22:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfy0A-0004eb-9w for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:26 +0000 Received: from [85.158.143.35:13953] by server-3.bemta-4.messagelabs.com id 8A/57-19578-18C31825; Mon, 11 Nov 2013 20:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1384201343!2477937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31327 invoked from network); 11 Nov 2013 20:22:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2013 20:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vfy07-0008Nz-Kv for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vfy07-0007OC-Is for xen-changelog@lists.xensource.com; Mon, 11 Nov 2013 20:22:23 +0000 Date: Mon, 11 Nov 2013 20:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/idle: reduce contention on ACPI register accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 178fd279dc138243b514b4ecd48509e4bf5d1ede Author: Jan Beulich AuthorDate: Mon Nov 11 11:01:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 11:01:04 2013 +0100 x86/idle: reduce contention on ACPI register accesses Other than when they're located in I/O port space, accessing them when in MMIO space (currently) implies usage of some sort of global lock: In -unstable this would be due to the use of vmap(), is older trees the necessary locking was introduced by 2ee9cbf9 ("ACPI: fix acpi_os_map_memory()"). This contention was observed to result in Dom0 kernel soft lockups during the loading of the ACPI processor driver there on systems with very many CPU cores. There are a couple of things being done for this: - re-order elements of an if() condition so that the register access only happens when we really need it - turn off arbitration disabling only when the first CPU leaves C3 (paralleling how arbitration disabling gets turned on) - only set the (global) bus master reload flag once (when the first target CPU gets processed) Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/acpi/cpu_idle.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 870fab8..9313285 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -439,8 +439,8 @@ static void acpi_processor_idle(void) (next_state = cpuidle_current_governor->select(power)) > 0 ) { cx = &power->states[next_state]; - if ( power->flags.bm_check && acpi_idle_bm_check() - && cx->type == ACPI_STATE_C3 ) + if ( cx->type == ACPI_STATE_C3 && power->flags.bm_check && + acpi_idle_bm_check() ) cx = power->safe_state; if ( cx->idx > max_cstate ) cx = &power->states[max_cstate]; @@ -563,8 +563,8 @@ static void acpi_processor_idle(void) { /* Enable bus master arbitration */ spin_lock(&c3_cpu_status.lock); - acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); - c3_cpu_status.count--; + if ( c3_cpu_status.count-- == num_online_cpus() ) + acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); spin_unlock(&c3_cpu_status.lock); } @@ -821,12 +821,10 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) return -EINVAL; /* All the logic here assumes flags.bm_check is same across all CPUs */ - if ( bm_check_flag == -1 ) + if ( bm_check_flag < 0 ) { /* Determine whether bm_check is needed based on CPU */ acpi_processor_power_init_bm_check(&(power->flags)); - bm_check_flag = power->flags.bm_check; - bm_control_flag = power->flags.bm_control; } else { @@ -853,14 +851,13 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) } } /* - * On older chipsets, BM_RLD needs to be set - * in order for Bus Master activity to wake the - * system from C3. Newer chipsets handle DMA - * during C3 automatically and BM_RLD is a NOP. - * In either case, the proper way to - * handle BM_RLD is to set it and leave it set. + * On older chipsets, BM_RLD needs to be set in order for Bus + * Master activity to wake the system from C3, hence + * acpi_set_register() is always being called once below. Newer + * chipsets handle DMA during C3 automatically and BM_RLD is a + * NOP. In either case, the proper way to handle BM_RLD is to + * set it and leave it set. */ - acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1); } else { @@ -875,7 +872,13 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) " for C3 to be enabled on SMP systems\n")); return -EINVAL; } - acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); + } + + if ( bm_check_flag < 0 ) + { + bm_check_flag = power->flags.bm_check; + bm_control_flag = power->flags.bm_control; + acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, bm_check_flag); } 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 Tue Nov 12 11:11:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsC-0003Ib-I4; Tue, 12 Nov 2013 11: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 1VgBsA-0003I8-Ft for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:06 +0000 Received: from [85.158.143.35:37052] by server-1.bemta-4.messagelabs.com id 54/5E-17304-9CC02825; Tue, 12 Nov 2013 11:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384254663!2588982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20692 invoked from network); 12 Nov 2013 11: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; 12 Nov 2013 11:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBs7-0000dK-CY for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBs7-0008L1-9B for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:03 +0000 Date: Tue, 12 Nov 2013 11:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use new LOG* and GCSPRINTF macros in tools/libxl/libxl_device.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 9919bc90cf52dc2cd900197568d78e0c7d662faa Author: Alexandra Sava AuthorDate: Mon Nov 11 11:00:39 2013 +0200 Commit: Ian Campbell CommitDate: Mon Nov 11 11:22:38 2013 +0000 libxl: Use new LOG* and GCSPRINTF macros in tools/libxl/libxl_device.c Replace libxl__sprintf, LIBXL__LOG and LIBXL__LOG_ERRNO with new "Convenience macros": GCSPRINTF, LOG, LOGE in tools/libxl/libxl_device.c Signed-off-by: Alexandra Sava Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 95 ++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 48acc92..4e24ff4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -24,20 +24,20 @@ char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device) /* Console 0 is a special case */ if (device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) - return libxl__sprintf(gc, "%s/console", dom_path); + return GCSPRINTF("%s/console", dom_path); - return libxl__sprintf(gc, "%s/device/%s/%d", dom_path, - libxl__device_kind_to_string(device->kind), - device->devid); + return GCSPRINTF("%s/device/%s/%d", dom_path, + libxl__device_kind_to_string(device->kind), + device->devid); } char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device) { char *dom_path = libxl__xs_get_dompath(gc, device->backend_domid); - return libxl__sprintf(gc, "%s/backend/%s/%u/%d", dom_path, - libxl__device_kind_to_string(device->backend_kind), - device->domid, device->devid); + return GCSPRINTF("%s/backend/%s/%u/%d", dom_path, + libxl__device_kind_to_string(device->backend_kind), + device->domid, device->devid); } int libxl__parse_backend_path(libxl__gc *gc, @@ -125,7 +125,8 @@ retry_transaction: else xs_set_permissions(ctx->xsh, t, frontend_path, frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/backend", frontend_path), backend_path, strlen(backend_path)); + xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path)); if (fents) libxl__xs_writev_perms(gc, t, frontend_path, fents, frontend_perms, ARRAY_SIZE(frontend_perms)); @@ -138,7 +139,8 @@ retry_transaction: xs_rm(ctx->xsh, t, backend_path); xs_mkdir(ctx->xsh, t, backend_path); xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/frontend", backend_path), frontend_path, strlen(frontend_path)); + xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path)); libxl__xs_writev(gc, t, backend_path, bents); } @@ -149,7 +151,7 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs transaction failed"); + LOGE(ERROR, "xs transaction failed"); return ERROR_FAIL; } } @@ -168,7 +170,6 @@ static int disk_try_backend(disk_try_backend_args *a, libxl__gc *gc = a->gc; /* returns 0 (ie, DISK_BACKEND_UNKNOWN) on failure, or * backend on success */ - libxl_ctx *ctx = libxl__gc_owner(gc); switch (backend) { case LIBXL_DISK_BACKEND_PHY: @@ -192,24 +193,21 @@ static int disk_try_backend(disk_try_backend_args *a, if (libxl__try_phy_backend(a->stab.st_mode)) return backend; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend phy" - " unsuitable as phys path not a block device", - a->disk->vdev); + LOG(DEBUG, "Disk vdev=%s, backend phy unsuitable as phys path not a " + "block device", a->disk->vdev); return 0; case LIBXL_DISK_BACKEND_TAP: if (a->disk->script) goto bad_script; if (a->disk->is_cdrom) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" - " unsuitable for cdroms", + LOG(DEBUG, "Disk vdev=%s, backend tap unsuitable for cdroms", a->disk->vdev); return 0; } if (!libxl__blktap_enabled(a->gc)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" - " unsuitable because blktap not available", - a->disk->vdev); + LOG(DEBUG, "Disk vdev=%s, backend tap unsuitable because blktap " + "not available", a->disk->vdev); return 0; } if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || @@ -223,16 +221,14 @@ static int disk_try_backend(disk_try_backend_args *a, return backend; default: - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend " - " %d unknown", a->disk->vdev, backend); + LOG(DEBUG, "Disk vdev=%s, backend %d unknown", a->disk->vdev, backend); return 0; } abort(); /* notreached */ bad_format: - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend %s" - " unsuitable due to format %s", + LOG(DEBUG, "Disk vdev=%s, backend %s unsuitable due to format %s", a->disk->vdev, libxl_disk_backend_to_string(backend), libxl_disk_format_to_string(a->disk->format)); @@ -245,22 +241,18 @@ static int disk_try_backend(disk_try_backend_args *a, } int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { - libxl_ctx *ctx = libxl__gc_owner(gc); libxl_disk_backend ok; disk_try_backend_args a; a.gc = gc; a.disk = disk; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s spec.backend=%s", - disk->vdev, + LOG(DEBUG, "Disk vdev=%s spec.backend=%s", disk->vdev, libxl_disk_backend_to_string(disk->backend)); if (disk->format == LIBXL_DISK_FORMAT_EMPTY) { if (!disk->is_cdrom) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s is empty" - " but not cdrom", - disk->vdev); + LOG(ERROR, "Disk vdev=%s is empty but not cdrom", disk->vdev); return ERROR_INVAL; } memset(&a.stab, 0, sizeof(a.stab)); @@ -269,16 +261,14 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { disk->backend_domid == LIBXL_TOOLSTACK_DOMID && !disk->script) { if (stat(disk->pdev_path, &a.stab)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s " - "failed to stat: %s", - disk->vdev, disk->pdev_path); + LOGE(ERROR, "Disk vdev=%s failed to stat: %s", + disk->vdev, disk->pdev_path); return ERROR_INVAL; } if (!S_ISBLK(a.stab.st_mode) & !S_ISREG(a.stab.st_mode)) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s " - "phys path is not a block dev or file: %s", - disk->vdev, disk->pdev_path); + LOG(ERROR, "Disk vdev=%s phys path is not a block dev or file: %s", + disk->vdev, disk->pdev_path); return ERROR_INVAL; } } @@ -291,13 +281,12 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { 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", + LOG(DEBUG, "Disk vdev=%s, using backend %s", disk->vdev, libxl_disk_backend_to_string(ok)); } if (!ok) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "no suitable backend for disk %s", - disk->vdev); + LOG(ERROR, "no suitable backend for disk %s", disk->vdev); return ERROR_INVAL; } disk->backend = ok; @@ -595,7 +584,6 @@ static void devices_remove_callback(libxl__egc *egc, void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { STATE_AO_GC(drs->ao); - libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t domid = drs->domid; char *path; unsigned int num_kinds, num_dev_xsentries; @@ -609,12 +597,11 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) libxl__multidev_begin(ao, multidev); multidev->callback = devices_remove_callback; - path = libxl__sprintf(gc, "/local/domain/%d/device", domid); + path = GCSPRINTF("/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); if (!kinds) { if (errno != ENOENT) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get xenstore" - " device listing %s", path); + LOGE(ERROR, "unable to get xenstore device listing %s", path); goto out; } num_kinds = 0; @@ -623,13 +610,13 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) if (libxl__device_kind_from_string(kinds[i], &kind)) continue; - path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, kinds[i]); + path = GCSPRINTF("/local/domain/%d/device/%s", domid, kinds[i]); devs = libxl__xs_directory(gc, XBT_NULL, path, &num_dev_xsentries); if (!devs) continue; for (j = 0; j < num_dev_xsentries; j++) { - path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s/backend", - domid, kinds[i], devs[j]); + path = GCSPRINTF("/local/domain/%d/device/%s/%s/backend", + domid, kinds[i], devs[j]); path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && libxl__parse_backend_path(gc, path, dev) == 0) { @@ -654,7 +641,7 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) } /* console 0 frontend directory is not under /local/domain//device */ - path = libxl__sprintf(gc, "/local/domain/%d/console/backend", domid); + path = GCSPRINTF("/local/domain/%d/console/backend", domid); path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && strcmp(path, "") && @@ -714,7 +701,7 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *state_path = libxl__sprintf(gc, "%s/state", be_path); + char *state_path = GCSPRINTF("%s/state", be_path); int rc = 0; if (QEMU_BACKEND(aodev->dev)) { @@ -752,7 +739,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, STATE_AO_GC(aodev->ao); xs_transaction_t t = 0; char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *state_path = libxl__sprintf(gc, "%s/state", be_path); + char *state_path = GCSPRINTF("%s/state", be_path); char *online_path = GCSPRINTF("%s/online", be_path); const char *state; libxl_dominfo info; @@ -1080,7 +1067,7 @@ int libxl__wait_for_device_model(libxl__gc *gc, void *check_callback_userdata) { char *path; - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); + path = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); return libxl__wait_for_offspring(gc, domid, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, state, spawning, @@ -1093,18 +1080,16 @@ int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state) int watchdog = 100; unsigned int len; char *p; - char *path = libxl__sprintf(gc, "%s/state", be_path); + char *path = GCSPRINTF("%s/state", be_path); int rc = -1; while (watchdog > 0) { p = xs_read(ctx->xsh, XBT_NULL, path, &len); if (p == NULL) { if (errno == ENOENT) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Backend %s does not exist", - be_path); + LOG(ERROR, "Backend %s does not exist", be_path); } else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed to access backend %s", - be_path); + LOGE(ERROR, "Failed to access backend %s", be_path); } goto out; } else { @@ -1117,7 +1102,7 @@ int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state) } } } - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Backend %s not ready", be_path); + LOG(ERROR, "Backend %s not ready", be_path); out: return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsC-0003Ib-I4; Tue, 12 Nov 2013 11: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 1VgBsA-0003I8-Ft for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:06 +0000 Received: from [85.158.143.35:37052] by server-1.bemta-4.messagelabs.com id 54/5E-17304-9CC02825; Tue, 12 Nov 2013 11:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384254663!2588982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20692 invoked from network); 12 Nov 2013 11: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; 12 Nov 2013 11:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBs7-0000dK-CY for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBs7-0008L1-9B for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:03 +0000 Date: Tue, 12 Nov 2013 11:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use new LOG* and GCSPRINTF macros in tools/libxl/libxl_device.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 9919bc90cf52dc2cd900197568d78e0c7d662faa Author: Alexandra Sava AuthorDate: Mon Nov 11 11:00:39 2013 +0200 Commit: Ian Campbell CommitDate: Mon Nov 11 11:22:38 2013 +0000 libxl: Use new LOG* and GCSPRINTF macros in tools/libxl/libxl_device.c Replace libxl__sprintf, LIBXL__LOG and LIBXL__LOG_ERRNO with new "Convenience macros": GCSPRINTF, LOG, LOGE in tools/libxl/libxl_device.c Signed-off-by: Alexandra Sava Acked-by: Ian Campbell --- tools/libxl/libxl_device.c | 95 ++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 55 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 48acc92..4e24ff4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -24,20 +24,20 @@ char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device) /* Console 0 is a special case */ if (device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) - return libxl__sprintf(gc, "%s/console", dom_path); + return GCSPRINTF("%s/console", dom_path); - return libxl__sprintf(gc, "%s/device/%s/%d", dom_path, - libxl__device_kind_to_string(device->kind), - device->devid); + return GCSPRINTF("%s/device/%s/%d", dom_path, + libxl__device_kind_to_string(device->kind), + device->devid); } char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device) { char *dom_path = libxl__xs_get_dompath(gc, device->backend_domid); - return libxl__sprintf(gc, "%s/backend/%s/%u/%d", dom_path, - libxl__device_kind_to_string(device->backend_kind), - device->domid, device->devid); + return GCSPRINTF("%s/backend/%s/%u/%d", dom_path, + libxl__device_kind_to_string(device->backend_kind), + device->domid, device->devid); } int libxl__parse_backend_path(libxl__gc *gc, @@ -125,7 +125,8 @@ retry_transaction: else xs_set_permissions(ctx->xsh, t, frontend_path, frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/backend", frontend_path), backend_path, strlen(backend_path)); + xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path)); if (fents) libxl__xs_writev_perms(gc, t, frontend_path, fents, frontend_perms, ARRAY_SIZE(frontend_perms)); @@ -138,7 +139,8 @@ retry_transaction: xs_rm(ctx->xsh, t, backend_path); xs_mkdir(ctx->xsh, t, backend_path); xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/frontend", backend_path), frontend_path, strlen(frontend_path)); + xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path)); libxl__xs_writev(gc, t, backend_path, bents); } @@ -149,7 +151,7 @@ retry_transaction: if (errno == EAGAIN) goto retry_transaction; else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs transaction failed"); + LOGE(ERROR, "xs transaction failed"); return ERROR_FAIL; } } @@ -168,7 +170,6 @@ static int disk_try_backend(disk_try_backend_args *a, libxl__gc *gc = a->gc; /* returns 0 (ie, DISK_BACKEND_UNKNOWN) on failure, or * backend on success */ - libxl_ctx *ctx = libxl__gc_owner(gc); switch (backend) { case LIBXL_DISK_BACKEND_PHY: @@ -192,24 +193,21 @@ static int disk_try_backend(disk_try_backend_args *a, if (libxl__try_phy_backend(a->stab.st_mode)) return backend; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend phy" - " unsuitable as phys path not a block device", - a->disk->vdev); + LOG(DEBUG, "Disk vdev=%s, backend phy unsuitable as phys path not a " + "block device", a->disk->vdev); return 0; case LIBXL_DISK_BACKEND_TAP: if (a->disk->script) goto bad_script; if (a->disk->is_cdrom) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" - " unsuitable for cdroms", + LOG(DEBUG, "Disk vdev=%s, backend tap unsuitable for cdroms", a->disk->vdev); return 0; } if (!libxl__blktap_enabled(a->gc)) { - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap" - " unsuitable because blktap not available", - a->disk->vdev); + LOG(DEBUG, "Disk vdev=%s, backend tap unsuitable because blktap " + "not available", a->disk->vdev); return 0; } if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || @@ -223,16 +221,14 @@ static int disk_try_backend(disk_try_backend_args *a, return backend; default: - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend " - " %d unknown", a->disk->vdev, backend); + LOG(DEBUG, "Disk vdev=%s, backend %d unknown", a->disk->vdev, backend); return 0; } abort(); /* notreached */ bad_format: - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend %s" - " unsuitable due to format %s", + LOG(DEBUG, "Disk vdev=%s, backend %s unsuitable due to format %s", a->disk->vdev, libxl_disk_backend_to_string(backend), libxl_disk_format_to_string(a->disk->format)); @@ -245,22 +241,18 @@ static int disk_try_backend(disk_try_backend_args *a, } int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { - libxl_ctx *ctx = libxl__gc_owner(gc); libxl_disk_backend ok; disk_try_backend_args a; a.gc = gc; a.disk = disk; - LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s spec.backend=%s", - disk->vdev, + LOG(DEBUG, "Disk vdev=%s spec.backend=%s", disk->vdev, libxl_disk_backend_to_string(disk->backend)); if (disk->format == LIBXL_DISK_FORMAT_EMPTY) { if (!disk->is_cdrom) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s is empty" - " but not cdrom", - disk->vdev); + LOG(ERROR, "Disk vdev=%s is empty but not cdrom", disk->vdev); return ERROR_INVAL; } memset(&a.stab, 0, sizeof(a.stab)); @@ -269,16 +261,14 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { disk->backend_domid == LIBXL_TOOLSTACK_DOMID && !disk->script) { if (stat(disk->pdev_path, &a.stab)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s " - "failed to stat: %s", - disk->vdev, disk->pdev_path); + LOGE(ERROR, "Disk vdev=%s failed to stat: %s", + disk->vdev, disk->pdev_path); return ERROR_INVAL; } if (!S_ISBLK(a.stab.st_mode) & !S_ISREG(a.stab.st_mode)) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Disk vdev=%s " - "phys path is not a block dev or file: %s", - disk->vdev, disk->pdev_path); + LOG(ERROR, "Disk vdev=%s phys path is not a block dev or file: %s", + disk->vdev, disk->pdev_path); return ERROR_INVAL; } } @@ -291,13 +281,12 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) { 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", + LOG(DEBUG, "Disk vdev=%s, using backend %s", disk->vdev, libxl_disk_backend_to_string(ok)); } if (!ok) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "no suitable backend for disk %s", - disk->vdev); + LOG(ERROR, "no suitable backend for disk %s", disk->vdev); return ERROR_INVAL; } disk->backend = ok; @@ -595,7 +584,6 @@ static void devices_remove_callback(libxl__egc *egc, void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) { STATE_AO_GC(drs->ao); - libxl_ctx *ctx = libxl__gc_owner(gc); uint32_t domid = drs->domid; char *path; unsigned int num_kinds, num_dev_xsentries; @@ -609,12 +597,11 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) libxl__multidev_begin(ao, multidev); multidev->callback = devices_remove_callback; - path = libxl__sprintf(gc, "/local/domain/%d/device", domid); + path = GCSPRINTF("/local/domain/%d/device", domid); kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); if (!kinds) { if (errno != ENOENT) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get xenstore" - " device listing %s", path); + LOGE(ERROR, "unable to get xenstore device listing %s", path); goto out; } num_kinds = 0; @@ -623,13 +610,13 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) if (libxl__device_kind_from_string(kinds[i], &kind)) continue; - path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, kinds[i]); + path = GCSPRINTF("/local/domain/%d/device/%s", domid, kinds[i]); devs = libxl__xs_directory(gc, XBT_NULL, path, &num_dev_xsentries); if (!devs) continue; for (j = 0; j < num_dev_xsentries; j++) { - path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s/backend", - domid, kinds[i], devs[j]); + path = GCSPRINTF("/local/domain/%d/device/%s/%s/backend", + domid, kinds[i], devs[j]); path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && libxl__parse_backend_path(gc, path, dev) == 0) { @@ -654,7 +641,7 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) } /* console 0 frontend directory is not under /local/domain//device */ - path = libxl__sprintf(gc, "/local/domain/%d/console/backend", domid); + path = GCSPRINTF("/local/domain/%d/console/backend", domid); path = libxl__xs_read(gc, XBT_NULL, path); GCNEW(dev); if (path && strcmp(path, "") && @@ -714,7 +701,7 @@ void libxl__wait_device_connection(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *state_path = libxl__sprintf(gc, "%s/state", be_path); + char *state_path = GCSPRINTF("%s/state", be_path); int rc = 0; if (QEMU_BACKEND(aodev->dev)) { @@ -752,7 +739,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, STATE_AO_GC(aodev->ao); xs_transaction_t t = 0; char *be_path = libxl__device_backend_path(gc, aodev->dev); - char *state_path = libxl__sprintf(gc, "%s/state", be_path); + char *state_path = GCSPRINTF("%s/state", be_path); char *online_path = GCSPRINTF("%s/online", be_path); const char *state; libxl_dominfo info; @@ -1080,7 +1067,7 @@ int libxl__wait_for_device_model(libxl__gc *gc, void *check_callback_userdata) { char *path; - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); + path = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); return libxl__wait_for_offspring(gc, domid, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, state, spawning, @@ -1093,18 +1080,16 @@ int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state) int watchdog = 100; unsigned int len; char *p; - char *path = libxl__sprintf(gc, "%s/state", be_path); + char *path = GCSPRINTF("%s/state", be_path); int rc = -1; while (watchdog > 0) { p = xs_read(ctx->xsh, XBT_NULL, path, &len); if (p == NULL) { if (errno == ENOENT) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Backend %s does not exist", - be_path); + LOG(ERROR, "Backend %s does not exist", be_path); } else { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed to access backend %s", - be_path); + LOGE(ERROR, "Failed to access backend %s", be_path); } goto out; } else { @@ -1117,7 +1102,7 @@ int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state) } } } - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Backend %s not ready", be_path); + LOG(ERROR, "Backend %s not ready", be_path); out: return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsL-0003K2-MS; Tue, 12 Nov 2013 11:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsK-0003Jl-8t for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:16 +0000 Received: from [85.158.139.211:18401] by server-2.bemta-5.messagelabs.com id D4/ED-14533-3DC02825; Tue, 12 Nov 2013 11:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384254673!1481726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15438 invoked from network); 12 Nov 2013 11:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsH-0000dN-JN for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsH-0008Lv-Ft for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:13 +0000 Date: Tue, 12 Nov 2013 11:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: macro LOG() used in place of LIBXL__LOG in libxl_qmp.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 930921ccb14f005cffa093a43dcb374798626338 Author: Kelley Nielsen AuthorDate: Sat Nov 9 19:05:05 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:43 2013 +0000 libxl: macro LOG() used in place of LIBXL__LOG in libxl_qmp.c Code cleanup -- no functional changes Coding style has recently been changed for libxl. The convenience macro LOG() has been introduced, and it is intended that it calls to the old macro LIBXL__LOG() be replaced with it. Change 7 occurences of the old macro (in functions that have a local libxl_gc *gc) to the new one. Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 395258e..1f76d53 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -31,7 +31,7 @@ #ifdef DEBUG_RECEIVED # define DEBUG_REPORT_RECEIVED(buf, len) \ - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "received: '%.*s'", len, buf) + LOG(DEBUG, "received: '%.*s'", len, buf) #else # define DEBUG_REPORT_RECEIVED(buf, len) ((void)0) #endif @@ -190,8 +190,7 @@ static int qmp_register_vnc_callback(libxl__qmp_handler *qmp, port = libxl__json_object_get_string(obj); if (!addr || !port) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to retreive VNC connect information."); + LOG(ERROR, "Failed to retreive VNC connect information."); goto out; } @@ -435,7 +434,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) ret = select(qmp->qmp_fd + 1, &rfds, NULL, NULL, &timeout); if (ret == 0) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "timeout"); + LOG(ERROR, "timeout"); return -1; } else if (ret < 0) { if (errno == EINTR) @@ -446,7 +445,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) rd = read(qmp->qmp_fd, qmp->buffer, QMP_RECEIVE_BUFFER_SIZE); if (rd == 0) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Unexpected end of socket"); + LOG(ERROR, "Unexpected end of socket"); return -1; } else if (rd < 0) { LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error"); @@ -484,8 +483,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (o) { rc = qmp_handle_response(qmp, o); } else { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Parse error of : %s\n", s); + LOG(ERROR, "Parse error of : %s\n", s); return -1; } @@ -531,8 +529,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, s = yajl_gen_get_buf(hand, &buf, &len); if (s) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to generate a qmp command"); + LOG(ERROR, "Failed to generate a qmp command"); goto out; } @@ -550,7 +547,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, ret = libxl__strndup(gc, (const char*)buf, len); - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "next qmp command: '%s'", buf); + LOG(DEBUG, "next qmp command: '%s'", buf); out: yajl_gen_free(hand); @@ -702,7 +699,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) return NULL; } - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "connected to %s", qmp_socket); + LOG(DEBUG, "connected to %s", qmp_socket); /* Wait for the response to qmp_capabilities */ while (!qmp->connected) { @@ -712,7 +709,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) } if (!qmp->connected) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Failed to connect to QMP"); + LOG(ERROR, "Failed to connect to QMP"); libxl__qmp_close(qmp); 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 Tue Nov 12 11:11:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsL-0003K2-MS; Tue, 12 Nov 2013 11:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsK-0003Jl-8t for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:16 +0000 Received: from [85.158.139.211:18401] by server-2.bemta-5.messagelabs.com id D4/ED-14533-3DC02825; Tue, 12 Nov 2013 11:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384254673!1481726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15438 invoked from network); 12 Nov 2013 11:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsH-0000dN-JN for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsH-0008Lv-Ft for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:13 +0000 Date: Tue, 12 Nov 2013 11:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: macro LOG() used in place of LIBXL__LOG in libxl_qmp.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 930921ccb14f005cffa093a43dcb374798626338 Author: Kelley Nielsen AuthorDate: Sat Nov 9 19:05:05 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:43 2013 +0000 libxl: macro LOG() used in place of LIBXL__LOG in libxl_qmp.c Code cleanup -- no functional changes Coding style has recently been changed for libxl. The convenience macro LOG() has been introduced, and it is intended that it calls to the old macro LIBXL__LOG() be replaced with it. Change 7 occurences of the old macro (in functions that have a local libxl_gc *gc) to the new one. Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 395258e..1f76d53 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -31,7 +31,7 @@ #ifdef DEBUG_RECEIVED # define DEBUG_REPORT_RECEIVED(buf, len) \ - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "received: '%.*s'", len, buf) + LOG(DEBUG, "received: '%.*s'", len, buf) #else # define DEBUG_REPORT_RECEIVED(buf, len) ((void)0) #endif @@ -190,8 +190,7 @@ static int qmp_register_vnc_callback(libxl__qmp_handler *qmp, port = libxl__json_object_get_string(obj); if (!addr || !port) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to retreive VNC connect information."); + LOG(ERROR, "Failed to retreive VNC connect information."); goto out; } @@ -435,7 +434,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) ret = select(qmp->qmp_fd + 1, &rfds, NULL, NULL, &timeout); if (ret == 0) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "timeout"); + LOG(ERROR, "timeout"); return -1; } else if (ret < 0) { if (errno == EINTR) @@ -446,7 +445,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) rd = read(qmp->qmp_fd, qmp->buffer, QMP_RECEIVE_BUFFER_SIZE); if (rd == 0) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Unexpected end of socket"); + LOG(ERROR, "Unexpected end of socket"); return -1; } else if (rd < 0) { LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error"); @@ -484,8 +483,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (o) { rc = qmp_handle_response(qmp, o); } else { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Parse error of : %s\n", s); + LOG(ERROR, "Parse error of : %s\n", s); return -1; } @@ -531,8 +529,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, s = yajl_gen_get_buf(hand, &buf, &len); if (s) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to generate a qmp command"); + LOG(ERROR, "Failed to generate a qmp command"); goto out; } @@ -550,7 +547,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, ret = libxl__strndup(gc, (const char*)buf, len); - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "next qmp command: '%s'", buf); + LOG(DEBUG, "next qmp command: '%s'", buf); out: yajl_gen_free(hand); @@ -702,7 +699,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) return NULL; } - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "connected to %s", qmp_socket); + LOG(DEBUG, "connected to %s", qmp_socket); /* Wait for the response to qmp_capabilities */ while (!qmp->connected) { @@ -712,7 +709,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) } if (!qmp->connected) { - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Failed to connect to QMP"); + LOG(ERROR, "Failed to connect to QMP"); libxl__qmp_close(qmp); 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 Tue Nov 12 11:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsV-0003MG-PT; Tue, 12 Nov 2013 11:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsU-0003Lo-H9 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:26 +0000 Received: from [193.109.254.147:20307] by server-16.bemta-14.messagelabs.com id BF/34-03396-DDC02825; Tue, 12 Nov 2013 11:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1384254684!2217519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22127 invoked from network); 12 Nov 2013 11:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsR-0000dT-W4 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsR-0008MH-Tv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:23 +0000 Date: Tue, 12 Nov 2013 11:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add convenience macros to qmp_send() in libxl_qmp.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 e273738ef1df2e376921ef59c236662d72d0cafa Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:08:57 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: add convenience macros to qmp_send() in libxl_qmp.c Update qmp_send() in libxl_qmp.c to use the new convenience macros declared in libxl_internal.h. Uses GC_INIT at the top of the function, and GC_FREE at the exit. Since GC_INIT returns a libxl__gc by reference and not by value, remove the address operator from the left of the variable gc where it is passed as a parameter. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 1f76d53..7fa8748 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -561,9 +561,9 @@ static int qmp_send(libxl__qmp_handler *qmp, { char *buf = NULL; int rc = -1; - libxl__gc gc; LIBXL_INIT_GC(gc,qmp->ctx); + GC_INIT(qmp->ctx); - buf = qmp_send_prepare(&gc, qmp, cmd, args, callback, opaque, context); + buf = qmp_send_prepare(gc, qmp, cmd, args, callback, opaque, context); if (buf == NULL) { goto out; @@ -578,7 +578,7 @@ static int qmp_send(libxl__qmp_handler *qmp, rc = qmp->last_id_used; out: - libxl__free_all(&gc); + GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsV-0003MG-PT; Tue, 12 Nov 2013 11:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsU-0003Lo-H9 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:26 +0000 Received: from [193.109.254.147:20307] by server-16.bemta-14.messagelabs.com id BF/34-03396-DDC02825; Tue, 12 Nov 2013 11:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1384254684!2217519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22127 invoked from network); 12 Nov 2013 11:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsR-0000dT-W4 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsR-0008MH-Tv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:23 +0000 Date: Tue, 12 Nov 2013 11:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add convenience macros to qmp_send() in libxl_qmp.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 e273738ef1df2e376921ef59c236662d72d0cafa Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:08:57 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: add convenience macros to qmp_send() in libxl_qmp.c Update qmp_send() in libxl_qmp.c to use the new convenience macros declared in libxl_internal.h. Uses GC_INIT at the top of the function, and GC_FREE at the exit. Since GC_INIT returns a libxl__gc by reference and not by value, remove the address operator from the left of the variable gc where it is passed as a parameter. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 1f76d53..7fa8748 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -561,9 +561,9 @@ static int qmp_send(libxl__qmp_handler *qmp, { char *buf = NULL; int rc = -1; - libxl__gc gc; LIBXL_INIT_GC(gc,qmp->ctx); + GC_INIT(qmp->ctx); - buf = qmp_send_prepare(&gc, qmp, cmd, args, callback, opaque, context); + buf = qmp_send_prepare(gc, qmp, cmd, args, callback, opaque, context); if (buf == NULL) { goto out; @@ -578,7 +578,7 @@ static int qmp_send(libxl__qmp_handler *qmp, rc = qmp->last_id_used; out: - libxl__free_all(&gc); + GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsg-0003ON-TZ; Tue, 12 Nov 2013 11:11:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBse-0003Nj-Ux for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:37 +0000 Received: from [85.158.139.211:6664] by server-1.bemta-5.messagelabs.com id 07/8B-16887-8EC02825; Tue, 12 Nov 2013 11:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384254694!1463218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23976 invoked from network); 12 Nov 2013 11:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsc-0000de-71 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsc-0008Mh-2R for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:34 +0000 Date: Tue, 12 Nov 2013 11:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use macro CTX in libxl_qmp.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 d5aa78056d9da638caf8800597e3292b41a59e24 Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:08:58 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: use macro CTX in libxl_qmp.c The new coding style uses the convenience macro CTX as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the one place it occurs in libxl_qmp.c. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 7fa8748..4af7db6 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -348,7 +348,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid) "Failed to allocate qmp_handler"); return NULL; } - qmp->ctx = libxl__gc_owner(gc); + qmp->ctx = CTX; qmp->domid = domid; qmp->timeout = 5; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:45 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsg-0003ON-TZ; Tue, 12 Nov 2013 11:11:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBse-0003Nj-Ux for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:37 +0000 Received: from [85.158.139.211:6664] by server-1.bemta-5.messagelabs.com id 07/8B-16887-8EC02825; Tue, 12 Nov 2013 11:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384254694!1463218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23976 invoked from network); 12 Nov 2013 11:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsc-0000de-71 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsc-0008Mh-2R for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:34 +0000 Date: Tue, 12 Nov 2013 11:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use macro CTX in libxl_qmp.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 d5aa78056d9da638caf8800597e3292b41a59e24 Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:08:58 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: use macro CTX in libxl_qmp.c The new coding style uses the convenience macro CTX as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the one place it occurs in libxl_qmp.c. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 7fa8748..4af7db6 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -348,7 +348,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid) "Failed to allocate qmp_handler"); return NULL; } - qmp->ctx = libxl__gc_owner(gc); + qmp->ctx = CTX; qmp->domid = domid; qmp->timeout = 5; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:11:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsq-0003QY-0N; Tue, 12 Nov 2013 11: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 1VgBsp-0003QH-7M for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:47 +0000 Received: from [85.158.137.68:49206] by server-2.bemta-3.messagelabs.com id 90/BB-29572-2FC02825; Tue, 12 Nov 2013 11:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384254704!985726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10070 invoked from network); 12 Nov 2013 11:11:45 -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 Nov 2013 11:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsm-0000dk-ED for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsm-0008N3-9g for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:44 +0000 Date: Tue, 12 Nov 2013 11:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use macro GCNEW in libxl_qmp.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 362c286ddb7ab2a8f189b8d71da1ced7db556383 Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:27:54 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: use macro GCNEW in libxl_qmp.c The new coding style uses the convenience macro GCNEW as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the one place it occurs in libxl_qmp.c. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 4af7db6..db40126 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -632,7 +632,7 @@ static void qmp_parameters_common_add(libxl__gc *gc, *param = libxl__json_object_alloc(gc, JSON_MAP); } - arg = libxl__zalloc(gc, sizeof(*arg)); + GCNEW(arg); arg->map_key = libxl__strdup(gc, name); arg->obj = obj; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:11:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:11: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 1VgBsq-0003QY-0N; Tue, 12 Nov 2013 11: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 1VgBsp-0003QH-7M for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:47 +0000 Received: from [85.158.137.68:49206] by server-2.bemta-3.messagelabs.com id 90/BB-29572-2FC02825; Tue, 12 Nov 2013 11:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384254704!985726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10070 invoked from network); 12 Nov 2013 11:11:45 -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 Nov 2013 11:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsm-0000dk-ED for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsm-0008N3-9g for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:44 +0000 Date: Tue, 12 Nov 2013 11:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use macro GCNEW in libxl_qmp.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 362c286ddb7ab2a8f189b8d71da1ced7db556383 Author: Kelley Nielsen AuthorDate: Mon Nov 11 02:27:54 2013 -0800 Commit: Ian Campbell CommitDate: Mon Nov 11 12:16:50 2013 +0000 libxl: use macro GCNEW in libxl_qmp.c The new coding style uses the convenience macro GCNEW as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the one place it occurs in libxl_qmp.c. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 4af7db6..db40126 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -632,7 +632,7 @@ static void qmp_parameters_common_add(libxl__gc *gc, *param = libxl__json_object_alloc(gc, JSON_MAP); } - arg = libxl__zalloc(gc, sizeof(*arg)); + GCNEW(arg); arg->map_key = libxl__strdup(gc, name); arg->obj = obj; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:12:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBt0-0003Sw-3G; Tue, 12 Nov 2013 11:11:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsz-0003Se-Ex for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:57 +0000 Received: from [85.158.143.35:20011] by server-3.bemta-4.messagelabs.com id F1/6E-19578-CFC02825; Tue, 12 Nov 2013 11:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384254714!2619780!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27845 invoked from network); 12 Nov 2013 11:11:55 -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; 12 Nov 2013 11:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsw-0000dw-Ke for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsw-0008NQ-Ir for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:54 +0000 Date: Tue, 12 Nov 2013 11:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Config.mk: update OVMF changeset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e363c96f8b2a95d612f4a91ff14e22e91432ea3 Author: Wei Liu AuthorDate: Tue Oct 29 11:39:48 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:46 2013 +0000 Config.mk: update OVMF changeset Signed-off-by: Wei Liu Acked-by: Ian Campbell --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 9b39d6c..cafe539 100644 --- a/Config.mk +++ b/Config.mk @@ -233,7 +233,7 @@ OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif -OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 +OVMF_UPSTREAM_REVISION ?= a93b0e3f6895a074b99c8817181dfa6dbc7a4807 QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:12:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBt0-0003Sw-3G; Tue, 12 Nov 2013 11:11:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsz-0003Se-Ex for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:57 +0000 Received: from [85.158.143.35:20011] by server-3.bemta-4.messagelabs.com id F1/6E-19578-CFC02825; Tue, 12 Nov 2013 11:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384254714!2619780!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27845 invoked from network); 12 Nov 2013 11:11:55 -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; 12 Nov 2013 11:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBsw-0000dw-Ke for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBsw-0008NQ-Ir for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:11:54 +0000 Date: Tue, 12 Nov 2013 11:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Config.mk: update OVMF changeset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e363c96f8b2a95d612f4a91ff14e22e91432ea3 Author: Wei Liu AuthorDate: Tue Oct 29 11:39:48 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:46 2013 +0000 Config.mk: update OVMF changeset Signed-off-by: Wei Liu Acked-by: Ian Campbell --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 9b39d6c..cafe539 100644 --- a/Config.mk +++ b/Config.mk @@ -233,7 +233,7 @@ OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif -OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 +OVMF_UPSTREAM_REVISION ?= a93b0e3f6895a074b99c8817181dfa6dbc7a4807 QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:12:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtC-0003WB-A4; Tue, 12 Nov 2013 11:12:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtB-0003Vb-Bt for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:09 +0000 Received: from [85.158.137.68:55258] by server-13.bemta-3.messagelabs.com id CC/2F-02689-80D02825; Tue, 12 Nov 2013 11:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384254725!965375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11123 invoked from network); 12 Nov 2013 11:12: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; 12 Nov 2013 11:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBt6-0000eS-SB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBt6-0008O6-Nf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:04 +0000 Date: Tue, 12 Nov 2013 11:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: clone ovmf to ovmf-dir directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 871062d695f145e3511fcd8c5a5ab431f0b20dec Author: Ian Campbell AuthorDate: Tue Oct 29 11:39:49 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:56 2013 +0000 tools: clone ovmf to ovmf-dir directory for consistency with other foo-dir e.g. qemu, seabios. Remove obsolete ovmf-find target. Signed-off-by: Ian Campbell Signed-off-by: Wei Liu --- Makefile | 4 ++++ tools/firmware/Makefile | 29 ++++++++++------------------- tools/firmware/hvmloader/Makefile | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index d915660..4e48457 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,10 @@ endif tools/firmware/seabios-dir-force-update: $(MAKE) -C tools/firmware seabios-dir-force-update +.PHONY: tools/firmware/ovmf-dir-force-update +tools/firmware/ovmf-dir-force-update: + $(MAKE) -C tools/firmware ovmf-dir-force-update + .PHONY: install-docs install-docs: $(MAKE) -C docs install diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index f064765..8633748 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,7 +6,7 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := -SUBDIRS-$(CONFIG_OVMF) += ovmf +SUBDIRS-$(CONFIG_OVMF) += ovmf-dir ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir endif @@ -15,9 +15,9 @@ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot SUBDIRS-y += hvmloader -ovmf: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf - cp ovmf-makefile ovmf/Makefile; +ovmf-dir: + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir + cp ovmf-makefile ovmf-dir/Makefile; seabios-dir: GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir @@ -52,32 +52,23 @@ subdir-distclean-etherboot: .phony $(MAKE) -C etherboot distclean subdir-distclean-ovmf: .phony - rm -rf ovmf ovmf-remote + rm -rf ovmf-dir ovmf-dir-remote subdir-distclean-seabios-dir: .phony rm -rf seabios-dir seabios-dir-remote -.PHONY: ovmf-find -ovmf-find: - if test -d $(OVMF_UPSTREAM_URL) ; then \ - mkdir -p ovmf; \ - else \ - export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf ; \ - fi - -.PHONY: ovmf-force-update -ovmf-force-update: +.PHONY: ovmf-dir-force-update +ovmf-dir-force-update: set -ex; \ if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \ - cd ovmf-remote; \ + cd ovmf-dir-remote; \ $(GIT) fetch origin; \ $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \ fi subdir-clean-ovmf: - set -e; if test -d ovmf/.; then \ - $(MAKE) -C ovmf clean; \ + set -e; if test -d ovmf-dir/.; then \ + $(MAKE) -C ovmf-dir clean; \ fi .PHONY: seabios-dir-force-update diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 8ab1429..e27e457 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -37,7 +37,7 @@ endif CIRRUSVGA_DEBUG ?= n -OVMF_DIR := ../ovmf +OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios SEABIOS_DIR := ../seabios-dir -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:12:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtC-0003WB-A4; Tue, 12 Nov 2013 11:12:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtB-0003Vb-Bt for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:09 +0000 Received: from [85.158.137.68:55258] by server-13.bemta-3.messagelabs.com id CC/2F-02689-80D02825; Tue, 12 Nov 2013 11:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384254725!965375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11123 invoked from network); 12 Nov 2013 11:12: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; 12 Nov 2013 11:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBt6-0000eS-SB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBt6-0008O6-Nf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:04 +0000 Date: Tue, 12 Nov 2013 11:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: clone ovmf to ovmf-dir directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 871062d695f145e3511fcd8c5a5ab431f0b20dec Author: Ian Campbell AuthorDate: Tue Oct 29 11:39:49 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:56 2013 +0000 tools: clone ovmf to ovmf-dir directory for consistency with other foo-dir e.g. qemu, seabios. Remove obsolete ovmf-find target. Signed-off-by: Ian Campbell Signed-off-by: Wei Liu --- Makefile | 4 ++++ tools/firmware/Makefile | 29 ++++++++++------------------- tools/firmware/hvmloader/Makefile | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index d915660..4e48457 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,10 @@ endif tools/firmware/seabios-dir-force-update: $(MAKE) -C tools/firmware seabios-dir-force-update +.PHONY: tools/firmware/ovmf-dir-force-update +tools/firmware/ovmf-dir-force-update: + $(MAKE) -C tools/firmware ovmf-dir-force-update + .PHONY: install-docs install-docs: $(MAKE) -C docs install diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index f064765..8633748 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,7 +6,7 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := -SUBDIRS-$(CONFIG_OVMF) += ovmf +SUBDIRS-$(CONFIG_OVMF) += ovmf-dir ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir endif @@ -15,9 +15,9 @@ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot SUBDIRS-y += hvmloader -ovmf: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf - cp ovmf-makefile ovmf/Makefile; +ovmf-dir: + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir + cp ovmf-makefile ovmf-dir/Makefile; seabios-dir: GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir @@ -52,32 +52,23 @@ subdir-distclean-etherboot: .phony $(MAKE) -C etherboot distclean subdir-distclean-ovmf: .phony - rm -rf ovmf ovmf-remote + rm -rf ovmf-dir ovmf-dir-remote subdir-distclean-seabios-dir: .phony rm -rf seabios-dir seabios-dir-remote -.PHONY: ovmf-find -ovmf-find: - if test -d $(OVMF_UPSTREAM_URL) ; then \ - mkdir -p ovmf; \ - else \ - export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf ; \ - fi - -.PHONY: ovmf-force-update -ovmf-force-update: +.PHONY: ovmf-dir-force-update +ovmf-dir-force-update: set -ex; \ if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \ - cd ovmf-remote; \ + cd ovmf-dir-remote; \ $(GIT) fetch origin; \ $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \ fi subdir-clean-ovmf: - set -e; if test -d ovmf/.; then \ - $(MAKE) -C ovmf clean; \ + set -e; if test -d ovmf-dir/.; then \ + $(MAKE) -C ovmf-dir clean; \ fi .PHONY: seabios-dir-force-update diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 8ab1429..e27e457 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -37,7 +37,7 @@ endif CIRRUSVGA_DEBUG ?= n -OVMF_DIR := ../ovmf +OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios SEABIOS_DIR := ../seabios-dir -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:12:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtK-0003YK-Ct; Tue, 12 Nov 2013 11:12:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtJ-0003Xx-Gs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:17 +0000 Received: from [85.158.143.35:48670] by server-3.bemta-4.messagelabs.com id D0/2F-19578-01D02825; Tue, 12 Nov 2013 11:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384254735!2577889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2488 invoked from network); 12 Nov 2013 11:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtH-0000eY-3I for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtG-0008PD-Vs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:15 +0000 Date: Tue, 12 Nov 2013 11:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: support system supplied ovmf 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 6b2029c9a1f6b4cd7585fd537d45233f8dde14b7 Author: Ian Campbell AuthorDate: Tue Oct 29 11:39:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:57 2013 +0000 tools: support system supplied ovmf binary Debian Jessie at least contains an ovmf package that includes /usr/share/ovmf/OVMF.fd. It's also possible that user may want to supply his/her own ovmf binary. Signed-off-by: Ian Campbell Signed-off-by: Wei Liu --- 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 67f5782..d9d3239 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -24,6 +24,7 @@ BCC := @BCC@ IASL := @IASL@ FETCHER := @FETCHER@ SEABIOS_PATH := @seabios_path@ +OVMF_PATH := @ovmf_path@ # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ diff --git a/tools/configure b/tools/configure index 1da8652..ff82b32 100755 --- a/tools/configure +++ b/tools/configure @@ -682,6 +682,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +ovmf_path seabios_path qemu_xen qemu_traditional @@ -768,6 +769,7 @@ enable_blktap1 enable_qemu_traditional with_system_qemu with_system_seabios +with_system_ovmf ' ac_precious_vars='build_alias host_alias @@ -1440,6 +1442,9 @@ Optional Packages: --with-system-seabios[=PATH] Use system supplied seabios PATH instead of building and installing our own version + --with-system-ovmf[=PATH] + Use system supplied OVMF PATH instead of building + and installing our own version Some influential environment variables: CC C compiler command @@ -3772,6 +3777,19 @@ fi +# Check whether --with-system-ovmf was given. +if test "${with_system_ovmf+set}" = set; then : + withval=$with_system_ovmf; + case $withval in + no) ovmf_path= ;; + *) ovmf_path=$withval ;; + esac + +fi + + + + diff --git a/tools/configure.ac b/tools/configure.ac index 4f3c33a..b2941a4 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -108,6 +108,17 @@ AC_ARG_WITH([system-seabios], ],[]) AC_SUBST(seabios_path) +AC_ARG_WITH([system-ovmf], + AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], + [Use system supplied OVMF PATH instead of building and installing + our own version]),[ + case $withval in + no) ovmf_path= ;; + *) ovmf_path=$withval ;; + esac +],[]) +AC_SUBST(ovmf_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 8633748..cb13212 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,7 +6,9 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := +ifeq ($(OVMF_PATH),) SUBDIRS-$(CONFIG_OVMF) += ovmf-dir +endif ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir endif diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index e27e457..00ee952 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -56,7 +56,11 @@ ROMS := ifeq ($(CONFIG_OVMF),y) OBJS += ovmf.o CFLAGS += -DENABLE_OVMF -OVMF_ROM := $(OVMF_DIR)/ovmf.bin +ifeq ($(OVMF_PATH),) + OVMF_ROM := $(OVMF_DIR)/ovmf.bin +else + OVMF_ROM := $(OVMF_PATH) +endif ROMS += $(OVMF_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 Nov 12 11:12:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtK-0003YK-Ct; Tue, 12 Nov 2013 11:12:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtJ-0003Xx-Gs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:17 +0000 Received: from [85.158.143.35:48670] by server-3.bemta-4.messagelabs.com id D0/2F-19578-01D02825; Tue, 12 Nov 2013 11:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384254735!2577889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2488 invoked from network); 12 Nov 2013 11:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtH-0000eY-3I for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtG-0008PD-Vs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:15 +0000 Date: Tue, 12 Nov 2013 11:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: support system supplied ovmf 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 6b2029c9a1f6b4cd7585fd537d45233f8dde14b7 Author: Ian Campbell AuthorDate: Tue Oct 29 11:39:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 13:38:57 2013 +0000 tools: support system supplied ovmf binary Debian Jessie at least contains an ovmf package that includes /usr/share/ovmf/OVMF.fd. It's also possible that user may want to supply his/her own ovmf binary. Signed-off-by: Ian Campbell Signed-off-by: Wei Liu --- 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 67f5782..d9d3239 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -24,6 +24,7 @@ BCC := @BCC@ IASL := @IASL@ FETCHER := @FETCHER@ SEABIOS_PATH := @seabios_path@ +OVMF_PATH := @ovmf_path@ # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ diff --git a/tools/configure b/tools/configure index 1da8652..ff82b32 100755 --- a/tools/configure +++ b/tools/configure @@ -682,6 +682,7 @@ APPEND_LIB APPEND_INCLUDES PREPEND_LIB PREPEND_INCLUDES +ovmf_path seabios_path qemu_xen qemu_traditional @@ -768,6 +769,7 @@ enable_blktap1 enable_qemu_traditional with_system_qemu with_system_seabios +with_system_ovmf ' ac_precious_vars='build_alias host_alias @@ -1440,6 +1442,9 @@ Optional Packages: --with-system-seabios[=PATH] Use system supplied seabios PATH instead of building and installing our own version + --with-system-ovmf[=PATH] + Use system supplied OVMF PATH instead of building + and installing our own version Some influential environment variables: CC C compiler command @@ -3772,6 +3777,19 @@ fi +# Check whether --with-system-ovmf was given. +if test "${with_system_ovmf+set}" = set; then : + withval=$with_system_ovmf; + case $withval in + no) ovmf_path= ;; + *) ovmf_path=$withval ;; + esac + +fi + + + + diff --git a/tools/configure.ac b/tools/configure.ac index 4f3c33a..b2941a4 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -108,6 +108,17 @@ AC_ARG_WITH([system-seabios], ],[]) AC_SUBST(seabios_path) +AC_ARG_WITH([system-ovmf], + AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], + [Use system supplied OVMF PATH instead of building and installing + our own version]),[ + case $withval in + no) ovmf_path= ;; + *) ovmf_path=$withval ;; + esac +],[]) +AC_SUBST(ovmf_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 8633748..cb13212 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,7 +6,9 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := +ifeq ($(OVMF_PATH),) SUBDIRS-$(CONFIG_OVMF) += ovmf-dir +endif ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir endif diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index e27e457..00ee952 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -56,7 +56,11 @@ ROMS := ifeq ($(CONFIG_OVMF),y) OBJS += ovmf.o CFLAGS += -DENABLE_OVMF -OVMF_ROM := $(OVMF_DIR)/ovmf.bin +ifeq ($(OVMF_PATH),) + OVMF_ROM := $(OVMF_DIR)/ovmf.bin +else + OVMF_ROM := $(OVMF_PATH) +endif ROMS += $(OVMF_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 Nov 12 11:12:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtU-0003b6-Hf; Tue, 12 Nov 2013 11:12:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtT-0003al-O8 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:27 +0000 Received: from [193.109.254.147:31636] by server-10.bemta-14.messagelabs.com id 9C/D8-07477-B1D02825; Tue, 12 Nov 2013 11:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384254745!2188838!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8527 invoked from network); 12 Nov 2013 11:12:26 -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; 12 Nov 2013 11:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtR-0000eo-8F for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtR-0008Pa-5t for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:25 +0000 Date: Tue, 12 Nov 2013 11:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: support for Arrays in bindings generator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ea2941f1d45ac438854a88e5ff70a70ad92cbc1 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:39 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:04:38 2013 +0000 libxl: ocaml: support for Arrays in bindings generator. No change in generated code because no arrays are currently generated. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5757218..1b68b6b 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -143,7 +143,14 @@ def c_val(ty, c, o, indent="", parent = None): raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) elif isinstance (ty,idl.Array): - raise("Cannot handle Array type\n") + s += "{\n" + s += "\tint i;\n" + s += "\t%s = Wosize_val(%s);\n" % (parent + ty.lenvar.name, o) + s += "\t%s = (%s) calloc(%s, sizeof(*%s));\n" % (c, ty.typename, parent + ty.lenvar.name, c) + s += "\tfor(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += c_val(ty.elem_type, c+"[i]", "Field(%s, i)" % o, indent="\t\t", parent=parent) + "\n" + s += "\t}\n" + s += "}\n" elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o @@ -207,7 +214,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): s += "\t value array_elem;\n" s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) - s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "") + s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "", parent=parent) s += "\t Store_field(%s, i, array_elem);\n" % o s += "\t }\n" s += "\t}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:12:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtU-0003b6-Hf; Tue, 12 Nov 2013 11:12:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtT-0003al-O8 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:27 +0000 Received: from [193.109.254.147:31636] by server-10.bemta-14.messagelabs.com id 9C/D8-07477-B1D02825; Tue, 12 Nov 2013 11:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384254745!2188838!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8527 invoked from network); 12 Nov 2013 11:12:26 -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; 12 Nov 2013 11:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtR-0000eo-8F for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtR-0008Pa-5t for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:25 +0000 Date: Tue, 12 Nov 2013 11:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: support for Arrays in bindings generator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ea2941f1d45ac438854a88e5ff70a70ad92cbc1 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:39 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:04:38 2013 +0000 libxl: ocaml: support for Arrays in bindings generator. No change in generated code because no arrays are currently generated. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5757218..1b68b6b 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -143,7 +143,14 @@ def c_val(ty, c, o, indent="", parent = None): raise NotImplementedError("No c_val fn for Builtin %s (%s)" % (ty.typename, type(ty))) s += "%s;" % (fn % { "o": o, "c": c }) elif isinstance (ty,idl.Array): - raise("Cannot handle Array type\n") + s += "{\n" + s += "\tint i;\n" + s += "\t%s = Wosize_val(%s);\n" % (parent + ty.lenvar.name, o) + s += "\t%s = (%s) calloc(%s, sizeof(*%s));\n" % (c, ty.typename, parent + ty.lenvar.name, c) + s += "\tfor(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) + s += c_val(ty.elem_type, c+"[i]", "Field(%s, i)" % o, indent="\t\t", parent=parent) + "\n" + s += "\t}\n" + s += "}\n" elif isinstance(ty,idl.Enumeration) and (parent is None): n = 0 s += "switch(Int_val(%s)) {\n" % o @@ -207,7 +214,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): s += "\t value array_elem;\n" s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) - s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "") + s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "", parent=parent) s += "\t Store_field(%s, i, array_elem);\n" % o s += "\t }\n" s += "\t}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:12:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtf-0003eL-10; Tue, 12 Nov 2013 11:12:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtd-0003do-PV for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:37 +0000 Received: from [85.158.143.35:53073] by server-2.bemta-4.messagelabs.com id C4/F6-11386-52D02825; Tue, 12 Nov 2013 11:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384254755!2577933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3466 invoked from network); 12 Nov 2013 11:12: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 Nov 2013 11:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtb-0000et-GC for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtb-0008Q5-Dk for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:35 +0000 Date: Tue, 12 Nov 2013 11:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: avoid reserved words in type and field names. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af638c407d4cf42abd2d617849d6f0211014e074 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:40 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:16 2013 +0000 libxl: ocaml: avoid reserved words in type and field names. Do this by adding a "xl_" prefix to all names that are OCaml keywords. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 1b68b6b..bdac6e9 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -70,8 +70,21 @@ def ocaml_type_of(ty): else: return ty.rawname +ocaml_keywords = ['and', 'as', 'assert', 'begin', 'end', 'class', 'constraint', + 'do', 'done', 'downto', 'else', 'if', 'end', 'exception', 'external', 'false', + 'for', 'fun', 'function', 'functor', 'if', 'in', 'include', 'inherit', + 'initializer', 'lazy', 'let', 'match', 'method', 'module', 'mutable', 'new', + 'object', 'of', 'open', 'or', 'private', 'rec', 'sig', 'struct', 'then', 'to', + 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'] + +def munge_name(name): + if name in ocaml_keywords: + return "xl_" + name + else: + return name + def ocaml_instance_of(type, name): - return "%s : %s" % (name, ocaml_type_of(type)) + return "%s : %s" % (munge_name(name), ocaml_type_of(type)) def gen_ocaml_ml(ty, interface, indent=""): -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:12:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12: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 1VgBtf-0003eL-10; Tue, 12 Nov 2013 11:12:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtd-0003do-PV for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:37 +0000 Received: from [85.158.143.35:53073] by server-2.bemta-4.messagelabs.com id C4/F6-11386-52D02825; Tue, 12 Nov 2013 11:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384254755!2577933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3466 invoked from network); 12 Nov 2013 11:12: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 Nov 2013 11:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtb-0000et-GC for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtb-0008Q5-Dk for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:35 +0000 Date: Tue, 12 Nov 2013 11:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: avoid reserved words in type and field names. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af638c407d4cf42abd2d617849d6f0211014e074 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:40 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:16 2013 +0000 libxl: ocaml: avoid reserved words in type and field names. Do this by adding a "xl_" prefix to all names that are OCaml keywords. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 1b68b6b..bdac6e9 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -70,8 +70,21 @@ def ocaml_type_of(ty): else: return ty.rawname +ocaml_keywords = ['and', 'as', 'assert', 'begin', 'end', 'class', 'constraint', + 'do', 'done', 'downto', 'else', 'if', 'end', 'exception', 'external', 'false', + 'for', 'fun', 'function', 'functor', 'if', 'in', 'include', 'inherit', + 'initializer', 'lazy', 'let', 'match', 'method', 'module', 'mutable', 'new', + 'object', 'of', 'open', 'or', 'private', 'rec', 'sig', 'struct', 'then', 'to', + 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'] + +def munge_name(name): + if name in ocaml_keywords: + return "xl_" + name + else: + return name + def ocaml_instance_of(type, name): - return "%s : %s" % (name, ocaml_type_of(type)) + return "%s : %s" % (munge_name(name), ocaml_type_of(type)) def gen_ocaml_ml(ty, interface, indent=""): -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:12:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtr-0003hb-5s; Tue, 12 Nov 2013 11:12:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtp-0003gy-4c for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:49 +0000 Received: from [85.158.139.211:57969] by server-9.bemta-5.messagelabs.com id 25/18-12926-03D02825; Tue, 12 Nov 2013 11:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1384254765!1340686!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6934 invoked from network); 12 Nov 2013 11:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtl-0000f2-P1 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtl-0008QY-Is for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:45 +0000 Date: Tue, 12 Nov 2013 11:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: support for KeyedUnion in the bindings generator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f25452103bea924dba504f54713a0aac368e3edf Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:41 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: support for KeyedUnion in the bindings generator. A KeyedUnion consists of two fields in the containing struct. First an enum field ("e") used as a descriminator and second a union ("u") containing potentially anonymous structs associated with each enum value. We map the anonymous structs to structs named after the descriminator field ("e") and the specific enum values. We then declare an ocaml variant type name e__union mapping each enum value to its associated struct. So given IDL: foo = Enumeration("foo", [ (0, "BAR"), (1, "BAZ"), ]) s = Struct("s", [ ("u", KeyedUnion(none, foo, "blargle", [ ("bar", Struct(...xxx...)), ("baz", Struct(...yyy...)), ])), ]) We generate C: enum foo { BAR, BAZ }; struct s { enum foo blargle; union { struct { ...xxx... } bar; struct { ...yyy... } baz; } u; } and map this to ocaml type foo = BAR | BAZ; module S = struct type blargle_bar = ...xxx...; type blargle_baz = ...yyy...; type blargle__union = Bar of blargle_bar | Baz of blargle_baz; type t = { blargle : blargle__union; } end These type names are OK because they are already within the namespace associated with the struct "s". If the struct associated with bar is empty then we don't bother with blargle_bar of "of blargle_bar". No actually change in the generated code since we don't generate any KeyedUnions yet. The actual implementation was inspired by http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php#ref_constvrnt Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/libxl/idl.py | 3 + tools/ocaml/libs/xl/genwrap.py | 160 +++++++++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 17 deletions(-) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 7d95e3f..f4908dd 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -216,6 +216,9 @@ class Struct(Aggregate): kwargs.setdefault('passby', PASS_BY_REFERENCE) Aggregate.__init__(self, "struct", name, fields, **kwargs) + def has_fields(self): + return len(self.fields) != 0 + class Union(Aggregate): def __init__(self, name, fields, **kwargs): # Generally speaking some intelligence is required to free a diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index bdac6e9..f98d686 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -65,6 +65,8 @@ def ocaml_type_of(ty): if not typename: raise NotImplementedError("No typename for Builtin %s (%s)" % (ty.typename, type(ty))) return typename + elif isinstance(ty,idl.KeyedUnion): + return ty.union_name elif isinstance(ty,idl.Aggregate): return ty.rawname.capitalize() + ".t" else: @@ -83,8 +85,67 @@ def munge_name(name): else: return name -def ocaml_instance_of(type, name): - return "%s : %s" % (munge_name(name), ocaml_type_of(type)) +def ocaml_instance_of_field(f): + if isinstance(f.type, idl.KeyedUnion): + name = f.type.keyvar.name + else: + name = f.name + return "%s : %s" % (munge_name(name), ocaml_type_of(f.type)) + +def gen_struct(ty): + s = "" + for f in ty.fields: + if f.type.private: + continue + x = ocaml_instance_of_field(f) + x = x.replace("\n", "\n\t\t") + s += "\t\t" + x + ";\n" + return s + +def gen_ocaml_keyedunions(ty, interface, indent, parent = None): + s = "" + + if ty.rawname is not None: + # Non-anonymous types need no special handling + pass + elif isinstance(ty, idl.KeyedUnion): + if parent is None: + nparent = ty.keyvar.name + else: + nparent = parent + "_" + ty.keyvar.name + + for f in ty.fields: + if f.type is None: continue + if f.type.rawname is not None: continue + if isinstance(f.type, idl.Struct) and not f.type.has_fields(): continue + s += "\ntype %s_%s =\n" % (nparent,f.name) + s += "{\n" + s += gen_struct(f.type) + s += "}\n" + + name = "%s__union" % ty.keyvar.name + s += "\n" + s += "type %s = " % name + u = [] + for f in ty.fields: + if f.type is None: + u.append("%s" % (f.name.capitalize())) + elif isinstance(f.type, idl.Struct): + if f.type.rawname is not None: + u.append("%s of %s" % (f.name.capitalize(), f.type.rawname.capitalize())) + elif f.type.has_fields(): + u.append("%s of %s_%s" % (f.name.capitalize(), nparent, f.name)) + else: + u.append("%s" % (f.name.capitalize())) + else: + raise NotImplementedError("Cannot handle KeyedUnion fields which are not Structs") + + s += " | ".join(u) + "\n" + ty.union_name = name + + if s == "": + return None + return s.replace("\n", "\n%s" % indent) def gen_ocaml_ml(ty, interface, indent=""): @@ -110,16 +171,17 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "module %s : sig\n" % module_name else: s += "module %s = struct\n" % module_name - s += "\ttype t =\n" - s += "\t{\n" - + + # Handle KeyedUnions... for f in ty.fields: - if f.type.private: - continue - x = ocaml_instance_of(f.type, f.name) - x = x.replace("\n", "\n\t\t") - s += "\t\t" + x + ";\n" - + ku = gen_ocaml_keyedunions(f.type, interface, "\t") + if ku is not None: + s += ku + s += "\n" + + s += "\ttype t =\n" + s += "\t{\n" + s += gen_struct(ty) s += "\t}\n" if functions.has_key(ty.rawname): @@ -172,12 +234,43 @@ def c_val(ty, c, o, indent="", parent = None): n += 1 s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty, idl.Aggregate) and (parent is None): + elif isinstance(ty, idl.KeyedUnion): + s += "{\n" + s += "\tif(Is_long(%s)) {\n" % o + n = 0 + s += "\t\tswitch(Int_val(%s)) {\n" % o + for f in ty.fields: + if f.type is None or not f.type.has_fields(): + s += "\t\t case %d: %s = %s; break;\n" % (n, + parent + ty.keyvar.name, + f.enumname) + n += 1 + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t}\n" + s += "\t} else {\n" + s += "\t\t/* Is block... */\n" + s += "\t\tswitch(Tag_val(%s)) {\n" % o + n = 0 + for f in ty.fields: + if f.type is not None and f.type.has_fields(): + if f.type.private: + continue + s += "\t\t case %d:\n" % (n) + s += "\t\t %s = %s;\n" % (parent + ty.keyvar.name, f.enumname) + (nparent,fexpr) = ty.member(c, f, False) + s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") + s += "break;\n" + n += 1 + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t}\n" + s += "\t}\n" + s += "}" + elif isinstance(ty, idl.Aggregate) and (parent is None or ty.rawname is None): n = 0 for f in ty.fields: if f.type.private: continue - (nparent,fexpr) = ty.member(c, f, parent is None) + (nparent,fexpr) = ty.member(c, f, ty.rawname is not None) s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: @@ -199,7 +292,7 @@ def gen_c_val(ty, indent=""): s += "}\n" return s.replace("\n", "\n%s" % indent) - + def ocaml_Val(ty, o, c, indent="", parent = None): s = indent if isinstance(ty,idl.UInt): @@ -239,9 +332,42 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n += 1 s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty,idl.Aggregate) and (parent is None): + elif isinstance(ty, idl.KeyedUnion): + n = 0 + m = 0 + s += "switch(%s) {\n" % (parent + ty.keyvar.name) + for f in ty.fields: + s += "\t case %s:\n" % f.enumname + if f.type is None: + s += "\t /* %d: None */\n" % n + s += "\t %s = Val_long(%d);\n" % (o,n) + n += 1 + elif not f.type.has_fields(): + s += "\t /* %d: Long */\n" % n + s += "\t %s = Val_long(%d);\n" % (o,n) + n += 1 + else: + s += "\t /* %d: Block */\n" % m + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "\t {\n" + s += "\t\t CAMLlocal1(tmp);\n" + s += "\t\t %s = caml_alloc(%d,%d);\n" % (o, 1, m) + s += ocaml_Val(f.type, 'tmp', fexpr, indent="\t\t ", parent=nparent) + s += "\n" + s += "\t\t Store_field(%s, 0, tmp);\n" % o + s += "\t }\n" + m += 1 + #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) + s += "\t break;\n" + s += "\t default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += "\t}" + elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" - s += "\tvalue %s_field;\n" % ty.rawname + if ty.rawname is None: + fn = "anon_field" + else: + fn = "%s_field" % ty.rawname + s += "\tvalue %s;\n" % fn s += "\n" s += "\t%s = caml_alloc_tuple(%d);\n" % (o, len(ty.fields)) @@ -253,8 +379,8 @@ def ocaml_Val(ty, o, c, indent="", parent = None): (nparent,fexpr) = ty.member(c, f, parent is None) s += "\n" - s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, ty.pass_arg(fexpr, c), parent=nparent) - s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) + s += "\t%s\n" % ocaml_Val(f.type, fn, ty.pass_arg(fexpr, c), parent=nparent) + s += "\tStore_field(%s, %d, %s);\n" % (o, n, fn) n = n + 1 s += "}" 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 Tue Nov 12 11:12:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtr-0003hb-5s; Tue, 12 Nov 2013 11:12:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtp-0003gy-4c for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:49 +0000 Received: from [85.158.139.211:57969] by server-9.bemta-5.messagelabs.com id 25/18-12926-03D02825; Tue, 12 Nov 2013 11:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1384254765!1340686!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6934 invoked from network); 12 Nov 2013 11:12:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtl-0000f2-P1 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtl-0008QY-Is for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:45 +0000 Date: Tue, 12 Nov 2013 11:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: support for KeyedUnion in the bindings generator. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f25452103bea924dba504f54713a0aac368e3edf Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:41 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: support for KeyedUnion in the bindings generator. A KeyedUnion consists of two fields in the containing struct. First an enum field ("e") used as a descriminator and second a union ("u") containing potentially anonymous structs associated with each enum value. We map the anonymous structs to structs named after the descriminator field ("e") and the specific enum values. We then declare an ocaml variant type name e__union mapping each enum value to its associated struct. So given IDL: foo = Enumeration("foo", [ (0, "BAR"), (1, "BAZ"), ]) s = Struct("s", [ ("u", KeyedUnion(none, foo, "blargle", [ ("bar", Struct(...xxx...)), ("baz", Struct(...yyy...)), ])), ]) We generate C: enum foo { BAR, BAZ }; struct s { enum foo blargle; union { struct { ...xxx... } bar; struct { ...yyy... } baz; } u; } and map this to ocaml type foo = BAR | BAZ; module S = struct type blargle_bar = ...xxx...; type blargle_baz = ...yyy...; type blargle__union = Bar of blargle_bar | Baz of blargle_baz; type t = { blargle : blargle__union; } end These type names are OK because they are already within the namespace associated with the struct "s". If the struct associated with bar is empty then we don't bother with blargle_bar of "of blargle_bar". No actually change in the generated code since we don't generate any KeyedUnions yet. The actual implementation was inspired by http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php#ref_constvrnt Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/libxl/idl.py | 3 + tools/ocaml/libs/xl/genwrap.py | 160 +++++++++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 17 deletions(-) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index 7d95e3f..f4908dd 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -216,6 +216,9 @@ class Struct(Aggregate): kwargs.setdefault('passby', PASS_BY_REFERENCE) Aggregate.__init__(self, "struct", name, fields, **kwargs) + def has_fields(self): + return len(self.fields) != 0 + class Union(Aggregate): def __init__(self, name, fields, **kwargs): # Generally speaking some intelligence is required to free a diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index bdac6e9..f98d686 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -65,6 +65,8 @@ def ocaml_type_of(ty): if not typename: raise NotImplementedError("No typename for Builtin %s (%s)" % (ty.typename, type(ty))) return typename + elif isinstance(ty,idl.KeyedUnion): + return ty.union_name elif isinstance(ty,idl.Aggregate): return ty.rawname.capitalize() + ".t" else: @@ -83,8 +85,67 @@ def munge_name(name): else: return name -def ocaml_instance_of(type, name): - return "%s : %s" % (munge_name(name), ocaml_type_of(type)) +def ocaml_instance_of_field(f): + if isinstance(f.type, idl.KeyedUnion): + name = f.type.keyvar.name + else: + name = f.name + return "%s : %s" % (munge_name(name), ocaml_type_of(f.type)) + +def gen_struct(ty): + s = "" + for f in ty.fields: + if f.type.private: + continue + x = ocaml_instance_of_field(f) + x = x.replace("\n", "\n\t\t") + s += "\t\t" + x + ";\n" + return s + +def gen_ocaml_keyedunions(ty, interface, indent, parent = None): + s = "" + + if ty.rawname is not None: + # Non-anonymous types need no special handling + pass + elif isinstance(ty, idl.KeyedUnion): + if parent is None: + nparent = ty.keyvar.name + else: + nparent = parent + "_" + ty.keyvar.name + + for f in ty.fields: + if f.type is None: continue + if f.type.rawname is not None: continue + if isinstance(f.type, idl.Struct) and not f.type.has_fields(): continue + s += "\ntype %s_%s =\n" % (nparent,f.name) + s += "{\n" + s += gen_struct(f.type) + s += "}\n" + + name = "%s__union" % ty.keyvar.name + s += "\n" + s += "type %s = " % name + u = [] + for f in ty.fields: + if f.type is None: + u.append("%s" % (f.name.capitalize())) + elif isinstance(f.type, idl.Struct): + if f.type.rawname is not None: + u.append("%s of %s" % (f.name.capitalize(), f.type.rawname.capitalize())) + elif f.type.has_fields(): + u.append("%s of %s_%s" % (f.name.capitalize(), nparent, f.name)) + else: + u.append("%s" % (f.name.capitalize())) + else: + raise NotImplementedError("Cannot handle KeyedUnion fields which are not Structs") + + s += " | ".join(u) + "\n" + ty.union_name = name + + if s == "": + return None + return s.replace("\n", "\n%s" % indent) def gen_ocaml_ml(ty, interface, indent=""): @@ -110,16 +171,17 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "module %s : sig\n" % module_name else: s += "module %s = struct\n" % module_name - s += "\ttype t =\n" - s += "\t{\n" - + + # Handle KeyedUnions... for f in ty.fields: - if f.type.private: - continue - x = ocaml_instance_of(f.type, f.name) - x = x.replace("\n", "\n\t\t") - s += "\t\t" + x + ";\n" - + ku = gen_ocaml_keyedunions(f.type, interface, "\t") + if ku is not None: + s += ku + s += "\n" + + s += "\ttype t =\n" + s += "\t{\n" + s += gen_struct(ty) s += "\t}\n" if functions.has_key(ty.rawname): @@ -172,12 +234,43 @@ def c_val(ty, c, o, indent="", parent = None): n += 1 s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty, idl.Aggregate) and (parent is None): + elif isinstance(ty, idl.KeyedUnion): + s += "{\n" + s += "\tif(Is_long(%s)) {\n" % o + n = 0 + s += "\t\tswitch(Int_val(%s)) {\n" % o + for f in ty.fields: + if f.type is None or not f.type.has_fields(): + s += "\t\t case %d: %s = %s; break;\n" % (n, + parent + ty.keyvar.name, + f.enumname) + n += 1 + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t}\n" + s += "\t} else {\n" + s += "\t\t/* Is block... */\n" + s += "\t\tswitch(Tag_val(%s)) {\n" % o + n = 0 + for f in ty.fields: + if f.type is not None and f.type.has_fields(): + if f.type.private: + continue + s += "\t\t case %d:\n" % (n) + s += "\t\t %s = %s;\n" % (parent + ty.keyvar.name, f.enumname) + (nparent,fexpr) = ty.member(c, f, False) + s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") + s += "break;\n" + n += 1 + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t}\n" + s += "\t}\n" + s += "}" + elif isinstance(ty, idl.Aggregate) and (parent is None or ty.rawname is None): n = 0 for f in ty.fields: if f.type.private: continue - (nparent,fexpr) = ty.member(c, f, parent is None) + (nparent,fexpr) = ty.member(c, f, ty.rawname is not None) s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: @@ -199,7 +292,7 @@ def gen_c_val(ty, indent=""): s += "}\n" return s.replace("\n", "\n%s" % indent) - + def ocaml_Val(ty, o, c, indent="", parent = None): s = indent if isinstance(ty,idl.UInt): @@ -239,9 +332,42 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n += 1 s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename s += "}" - elif isinstance(ty,idl.Aggregate) and (parent is None): + elif isinstance(ty, idl.KeyedUnion): + n = 0 + m = 0 + s += "switch(%s) {\n" % (parent + ty.keyvar.name) + for f in ty.fields: + s += "\t case %s:\n" % f.enumname + if f.type is None: + s += "\t /* %d: None */\n" % n + s += "\t %s = Val_long(%d);\n" % (o,n) + n += 1 + elif not f.type.has_fields(): + s += "\t /* %d: Long */\n" % n + s += "\t %s = Val_long(%d);\n" % (o,n) + n += 1 + else: + s += "\t /* %d: Block */\n" % m + (nparent,fexpr) = ty.member(c, f, parent is None) + s += "\t {\n" + s += "\t\t CAMLlocal1(tmp);\n" + s += "\t\t %s = caml_alloc(%d,%d);\n" % (o, 1, m) + s += ocaml_Val(f.type, 'tmp', fexpr, indent="\t\t ", parent=nparent) + s += "\n" + s += "\t\t Store_field(%s, 0, tmp);\n" % o + s += "\t }\n" + m += 1 + #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) + s += "\t break;\n" + s += "\t default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += "\t}" + elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" - s += "\tvalue %s_field;\n" % ty.rawname + if ty.rawname is None: + fn = "anon_field" + else: + fn = "%s_field" % ty.rawname + s += "\tvalue %s;\n" % fn s += "\n" s += "\t%s = caml_alloc_tuple(%d);\n" % (o, len(ty.fields)) @@ -253,8 +379,8 @@ def ocaml_Val(ty, o, c, indent="", parent = None): (nparent,fexpr) = ty.member(c, f, parent is None) s += "\n" - s += "\t%s\n" % ocaml_Val(f.type, "%s_field" % ty.rawname, ty.pass_arg(fexpr, c), parent=nparent) - s += "\tStore_field(%s, %d, %s);\n" % (o, n, "%s_field" % ty.rawname) + s += "\t%s\n" % ocaml_Val(f.type, fn, ty.pass_arg(fexpr, c), parent=nparent) + s += "\tStore_field(%s, %d, %s);\n" % (o, n, fn) n = n + 1 s += "}" 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 Tue Nov 12 11:13:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu2-0003kV-F9; Tue, 12 Nov 2013 11:13:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtz-0003jv-6k for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:59 +0000 Received: from [85.158.139.211:8318] by server-16.bemta-5.messagelabs.com id 1C/84-17144-A3D02825; Tue, 12 Nov 2013 11:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384254776!1471469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_18, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10605 invoked from network); 12 Nov 2013 11:12:57 -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; 12 Nov 2013 11:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtv-0000f8-Tc for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtv-0008Qu-Rj for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:55 +0000 Date: Tue, 12 Nov 2013 11:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add some more builtin types. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3832037494154babfe3523744e77c68fb8336ced Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:42 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: add some more builtin types. * bitmaps * string_list * key_value_list * cpuid_policy_list (left "empty" for now) None of these are used yet, so no change to the generated code. Bitmap_val requires a ctx, so leave it as an abort for now. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 6 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 127 ++++++++++++++++++++++++++++++---- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index f98d686..1e956ab 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -13,9 +13,13 @@ builtins = { "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), "libxl_uuid": ("int array", "Uuid_val(gc, lg, &%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), - "libxl_key_value_list": ("(string * string) list", None, None), + "libxl_bitmap": ("bool array", "Bitmap_val(gc, lg, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), + "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(gc, lg, &%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), + "libxl_string_list": ("string list", "libxl_string_list_val(gc, lg, &%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), "libxl_mac": ("int array", "Mac_val(gc, lg, &%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), + # The following needs to be sorted out later + "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } DEVICE_FUNCTIONS = [ ("add", ["t", "domid", "unit"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 5f19a82..a7bf6ba 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -27,6 +27,7 @@ #include #include +#include struct caml_logger { struct xentoollog_logger logger; @@ -96,7 +97,6 @@ static void failwith_xl(char *fname, struct caml_logger *lg) caml_raise_with_string(*caml_named_value("xl.error"), s); } -#if 0 /* TODO: wrap libxl_domain_create(), these functions will be needed then */ static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) { void *ptr; @@ -107,28 +107,103 @@ static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) return ptr; } -static int string_string_tuple_array_val (caml_gc *gc, char ***c_val, value v) +static int list_len(value v) +{ + int len = 0; + while ( v != Val_emptylist ) { + len++; + v = Field(v, 1); + } + return len; +} + +static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, + libxl_key_value_list *c_val, + value v) { CAMLparam1(v); - CAMLlocal1(a); - int i; - char **array; + CAMLlocal1(elem); + int nr, i; + libxl_key_value_list array; - for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1)) { i++; } + nr = list_len(v); - array = gc_calloc(gc, (i + 1) * 2, sizeof(char *)); + array = gc_calloc(gc, (nr + 1) * 2, sizeof(char *)); if (!array) - return 1; - for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1), i++) { - value b = Field(a, 0); - array[i * 2] = dup_String_val(gc, Field(b, 0)); - array[i * 2 + 1] = dup_String_val(gc, Field(b, 1)); + caml_raise_out_of_memory(); + + for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) { + elem = Field(v, 0); + + array[i * 2] = dup_String_val(gc, Field(elem, 0)); + array[i * 2 + 1] = dup_String_val(gc, Field(elem, 1)); } + *c_val = array; CAMLreturn(0); } -#endif +static value Val_key_value_list(libxl_key_value_list *c_val) +{ + CAMLparam0(); + CAMLlocal5(list, cons, key, val, kv); + int i; + + list = Val_emptylist; + for (i = libxl_string_list_length((libxl_string_list *) c_val) - 1; i >= 0; i -= 2) { + val = caml_copy_string((char *) c_val[i]); + key = caml_copy_string((char *) c_val[i - 1]); + kv = caml_alloc_tuple(2); + Store_field(kv, 0, key); + Store_field(kv, 1, val); + + cons = caml_alloc(2, 0); + Store_field(cons, 0, kv); // head + Store_field(cons, 1, list); // tail + list = cons; + } + + CAMLreturn(list); +} + +static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, + libxl_string_list *c_val, + value v) +{ + CAMLparam1(v); + int nr, i; + libxl_string_list array; + + nr = list_len(v); + + array = gc_calloc(gc, (nr + 1), sizeof(char *)); + if (!array) + caml_raise_out_of_memory(); + + for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) + array[i] = dup_String_val(gc, Field(v, 0)); + + *c_val = array; + CAMLreturn(0); +} + +static value Val_string_list(libxl_string_list *c_val) +{ + CAMLparam0(); + CAMLlocal3(list, cons, string); + int i; + + list = Val_emptylist; + for (i = libxl_string_list_length(c_val) - 1; i >= 0; i--) { + string = caml_copy_string((char *) c_val[i]); + cons = caml_alloc(2, 0); + Store_field(cons, 0, string); // head + Store_field(cons, 1, list); // tail + list = cons; + } + + CAMLreturn(list); +} /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ #define Val_none Val_int(0) @@ -168,6 +243,32 @@ static int Mac_val(caml_gc *gc, struct caml_logger *lg, libxl_mac *c_val, value CAMLreturn(0); } +static value Val_bitmap (libxl_bitmap *c_val) +{ + CAMLparam0(); + CAMLlocal1(v); + int i; + + if (c_val->size == 0) + v = Atom(0); + else { + v = caml_alloc(8 * (c_val->size), 0); + libxl_for_each_bit(i, *c_val) { + if (libxl_bitmap_test(c_val, i)) + Store_field(v, i, Val_true); + else + Store_field(v, i, Val_false); + } + } + CAMLreturn(v); +} + +static int Bitmap_val(caml_gc *gc, struct caml_logger *lg, + libxl_bitmap *c_val, value v) +{ + abort(); /* XXX */ +} + static value Val_uuid (libxl_uuid *c_val) { CAMLparam0(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:13:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu2-0003kV-F9; Tue, 12 Nov 2013 11:13:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtz-0003jv-6k for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:59 +0000 Received: from [85.158.139.211:8318] by server-16.bemta-5.messagelabs.com id 1C/84-17144-A3D02825; Tue, 12 Nov 2013 11:12:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384254776!1471469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_18, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10605 invoked from network); 12 Nov 2013 11:12:57 -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; 12 Nov 2013 11:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBtv-0000f8-Tc for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBtv-0008Qu-Rj for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:12:55 +0000 Date: Tue, 12 Nov 2013 11:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add some more builtin types. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3832037494154babfe3523744e77c68fb8336ced Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:42 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: add some more builtin types. * bitmaps * string_list * key_value_list * cpuid_policy_list (left "empty" for now) None of these are used yet, so no change to the generated code. Bitmap_val requires a ctx, so leave it as an abort for now. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 6 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 127 ++++++++++++++++++++++++++++++---- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index f98d686..1e956ab 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -13,9 +13,13 @@ builtins = { "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), "libxl_uuid": ("int array", "Uuid_val(gc, lg, &%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), - "libxl_key_value_list": ("(string * string) list", None, None), + "libxl_bitmap": ("bool array", "Bitmap_val(gc, lg, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), + "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(gc, lg, &%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), + "libxl_string_list": ("string list", "libxl_string_list_val(gc, lg, &%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), "libxl_mac": ("int array", "Mac_val(gc, lg, &%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), + # The following needs to be sorted out later + "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } DEVICE_FUNCTIONS = [ ("add", ["t", "domid", "unit"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 5f19a82..a7bf6ba 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -27,6 +27,7 @@ #include #include +#include struct caml_logger { struct xentoollog_logger logger; @@ -96,7 +97,6 @@ static void failwith_xl(char *fname, struct caml_logger *lg) caml_raise_with_string(*caml_named_value("xl.error"), s); } -#if 0 /* TODO: wrap libxl_domain_create(), these functions will be needed then */ static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) { void *ptr; @@ -107,28 +107,103 @@ static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) return ptr; } -static int string_string_tuple_array_val (caml_gc *gc, char ***c_val, value v) +static int list_len(value v) +{ + int len = 0; + while ( v != Val_emptylist ) { + len++; + v = Field(v, 1); + } + return len; +} + +static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, + libxl_key_value_list *c_val, + value v) { CAMLparam1(v); - CAMLlocal1(a); - int i; - char **array; + CAMLlocal1(elem); + int nr, i; + libxl_key_value_list array; - for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1)) { i++; } + nr = list_len(v); - array = gc_calloc(gc, (i + 1) * 2, sizeof(char *)); + array = gc_calloc(gc, (nr + 1) * 2, sizeof(char *)); if (!array) - return 1; - for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1), i++) { - value b = Field(a, 0); - array[i * 2] = dup_String_val(gc, Field(b, 0)); - array[i * 2 + 1] = dup_String_val(gc, Field(b, 1)); + caml_raise_out_of_memory(); + + for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) { + elem = Field(v, 0); + + array[i * 2] = dup_String_val(gc, Field(elem, 0)); + array[i * 2 + 1] = dup_String_val(gc, Field(elem, 1)); } + *c_val = array; CAMLreturn(0); } -#endif +static value Val_key_value_list(libxl_key_value_list *c_val) +{ + CAMLparam0(); + CAMLlocal5(list, cons, key, val, kv); + int i; + + list = Val_emptylist; + for (i = libxl_string_list_length((libxl_string_list *) c_val) - 1; i >= 0; i -= 2) { + val = caml_copy_string((char *) c_val[i]); + key = caml_copy_string((char *) c_val[i - 1]); + kv = caml_alloc_tuple(2); + Store_field(kv, 0, key); + Store_field(kv, 1, val); + + cons = caml_alloc(2, 0); + Store_field(cons, 0, kv); // head + Store_field(cons, 1, list); // tail + list = cons; + } + + CAMLreturn(list); +} + +static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, + libxl_string_list *c_val, + value v) +{ + CAMLparam1(v); + int nr, i; + libxl_string_list array; + + nr = list_len(v); + + array = gc_calloc(gc, (nr + 1), sizeof(char *)); + if (!array) + caml_raise_out_of_memory(); + + for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) + array[i] = dup_String_val(gc, Field(v, 0)); + + *c_val = array; + CAMLreturn(0); +} + +static value Val_string_list(libxl_string_list *c_val) +{ + CAMLparam0(); + CAMLlocal3(list, cons, string); + int i; + + list = Val_emptylist; + for (i = libxl_string_list_length(c_val) - 1; i >= 0; i--) { + string = caml_copy_string((char *) c_val[i]); + cons = caml_alloc(2, 0); + Store_field(cons, 0, string); // head + Store_field(cons, 1, list); // tail + list = cons; + } + + CAMLreturn(list); +} /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ #define Val_none Val_int(0) @@ -168,6 +243,32 @@ static int Mac_val(caml_gc *gc, struct caml_logger *lg, libxl_mac *c_val, value CAMLreturn(0); } +static value Val_bitmap (libxl_bitmap *c_val) +{ + CAMLparam0(); + CAMLlocal1(v); + int i; + + if (c_val->size == 0) + v = Atom(0); + else { + v = caml_alloc(8 * (c_val->size), 0); + libxl_for_each_bit(i, *c_val) { + if (libxl_bitmap_test(c_val, i)) + Store_field(v, i, Val_true); + else + Store_field(v, i, Val_false); + } + } + CAMLreturn(v); +} + +static int Bitmap_val(caml_gc *gc, struct caml_logger *lg, + libxl_bitmap *c_val, value v) +{ + abort(); /* XXX */ +} + static value Val_uuid (libxl_uuid *c_val) { CAMLparam0(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:13:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuB-0003nV-KN; Tue, 12 Nov 2013 11:13:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu9-0003ms-Sw for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:10 +0000 Received: from [85.158.137.68:8466] by server-16.bemta-3.messagelabs.com id 5B/35-18787-54D02825; Tue, 12 Nov 2013 11:13:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1384254786!963953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_18, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13766 invoked from network); 12 Nov 2013 11:13:07 -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 Nov 2013 11:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu6-0000fj-1p for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBu6-0008RU-02 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:06 +0000 Date: Tue, 12 Nov 2013 11:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: ocaml: add simple binding for xentoollog (output only). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e35eb12447eb0c7343a1286f5c80138b5e5c84 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:43 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxc: ocaml: add simple binding for xentoollog (output only). These bindings allow ocaml code to receive log message via xentoollog but do not support injecting messages into xentoollog from ocaml. Receiving log messages from libx{c,l} and forwarding them to ocaml is the use case which is needed by the following patches. Add a simple noddy test case (tools/ocaml/test). Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott [ ijc -- dropped the xtl test harness, it failed to link ] --- tools/ocaml/Makefile.rules | 2 +- tools/ocaml/libs/Makefile | 1 + tools/ocaml/libs/xentoollog/META.in | 4 + tools/ocaml/libs/xentoollog/Makefile | 61 ++++++++ tools/ocaml/libs/xentoollog/caml_xentoollog.h | 24 +++ tools/ocaml/libs/xentoollog/genlevels.py | 127 +++++++++++++++ tools/ocaml/libs/xentoollog/xentoollog.ml.in | 48 ++++++ tools/ocaml/libs/xentoollog/xentoollog.mli.in | 43 +++++ tools/ocaml/libs/xentoollog/xentoollog_stubs.c | 196 ++++++++++++++++++++++++ 9 files changed, 505 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules index 5e6d81e..0745e83 100644 --- a/tools/ocaml/Makefile.rules +++ b/tools/ocaml/Makefile.rules @@ -24,7 +24,7 @@ ALL_OCAML_OBJS ?= $(OBJS) %.cmi: %.mli $(call quiet-command, $(OCAMLC) $(OCAMLCFLAGS) -c -o $@ $<,MLI,$@) -%.cmx: %.ml +%.cmx %.o: %.ml $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -c -o $@ $<,MLOPT,$@) %.ml: %.mll diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile index bca0fa2..3afdc89 100644 --- a/tools/ocaml/libs/Makefile +++ b/tools/ocaml/libs/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS= \ mmap \ + xentoollog \ xc eventchn \ xb xs xl diff --git a/tools/ocaml/libs/xentoollog/META.in b/tools/ocaml/libs/xentoollog/META.in new file mode 100644 index 0000000..7b06683 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/META.in @@ -0,0 +1,4 @@ +version = "@VERSION@" +description = "Xen Tools Logger Interface" +archive(byte) = "xentoollog.cma" +archive(native) = "xentoollog.cmxa" diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile new file mode 100644 index 0000000..e535ba5 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -0,0 +1,61 @@ +TOPLEVEL=$(CURDIR)/../.. +XEN_ROOT=$(TOPLEVEL)/../.. +include $(TOPLEVEL)/common.make + +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +OCAMLINCLUDE += + +OBJS = xentoollog +INTF = xentoollog.cmi +LIBS = xentoollog.cma xentoollog.cmxa + +LIBS_xentoollog = $(LDLIBS_libxenctrl) + +xentoollog_OBJS = $(OBJS) +xentoollog_C_OBJS = xentoollog_stubs + +OCAML_LIBRARY = xentoollog + +GENERATED_FILES += xentoollog.ml xentoollog.ml.tmp xentoollog.mli xentoollog.mli.tmp +GENERATED_FILES += _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc META + +all: $(INTF) $(LIBS) + +xentoollog.ml: xentoollog.ml.in _xtl_levels.ml.in + $(Q)sed -e '1i\ +(*\ + * AUTO-GENERATED FILE DO NOT EDIT\ + * Generated from xentoollog.ml.in and _xtl_levels.ml.in\ + *)\ +' \ + -e '/^(\* @@XTL_LEVELS@@ \*)$$/r_xtl_levels.ml.in' \ + < xentoollog.ml.in > xentoollog.ml.tmp + $(Q)mv xentoollog.ml.tmp xentoollog.ml + +xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in + $(Q)sed -e '1i\ +(*\ + * AUTO-GENERATED FILE DO NOT EDIT\ + * Generated from xentoollog.mli.in and _xtl_levels.mli.in\ + *)\ +' \ + -e '/^(\* @@XTL_LEVELS@@ \*)$$/r_xtl_levels.mli.in' \ + < xentoollog.mli.in > xentoollog.mli.tmp + $(Q)mv xentoollog.mli.tmp xentoollog.mli + +libs: $(LIBS) + +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/xentoollog.h + $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc + +.PHONY: install +install: $(LIBS) META + mkdir -p $(OCAMLDESTDIR) + ocamlfind remove -destdir $(OCAMLDESTDIR) xentoollog + ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xentoollog META $(INTF) $(LIBS) *.a *.so *.cmx + +.PHONY: uninstall +uninstall: + ocamlfind remove -destdir $(OCAMLDESTDIR) xentoollog + +include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xentoollog/caml_xentoollog.h b/tools/ocaml/libs/xentoollog/caml_xentoollog.h new file mode 100644 index 0000000..0eb7618 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/caml_xentoollog.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2013 Citrix Ltd. + * Author Ian Campbell + * Author Rob Hoes + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +struct caml_xtl { + xentoollog_logger vtable; + char *vmessage_cb; + char *progress_cb; +}; + +#define Xtl_val(x)(*((struct caml_xtl **) Data_custom_val(x))) + diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py new file mode 100755 index 0000000..6b42f21 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -0,0 +1,127 @@ +#!/usr/bin/python + +import sys + +def read_levels(): + f = open('../../../libxc/xentoollog.h', 'r') + + levels = [] + record = False + for l in f.readlines(): + if 'XTL_NUM_LEVELS' in l: + break + if record == True: + levels.append(l.split(',')[0].strip()) + if 'XTL_NONE' in l: + record = True + + f.close() + + olevels = [level[4:].capitalize() for level in levels] + + return levels, olevels + +# .ml + +def gen_ml(olevels): + s = "" + + s += "type level = \n" + for level in olevels: + s += '\t| %s\n' % level + + s += "\nlet level_to_string level =\n" + s += "\tmatch level with\n" + for level in olevels: + s += '\t| %s -> "%s"\n' % (level, level) + + s += "\nlet level_to_prio level =\n" + s += "\tmatch level with\n" + for index,level in enumerate(olevels): + s += '\t| %s -> %d\n' % (level, index) + + return s + +# .mli + +def gen_mli(olevels): + s = "" + + s += "type level = \n" + for level in olevels: + s += '\t| %s\n' % level + + return s + +# .c + +def gen_c(level): + s = "" + + s += "static value Val_level(xentoollog_level c_level)\n" + s += "{\n" + s += "\tswitch (c_level) {\n" + s += "\tcase XTL_NONE: /* Not a real value */\n" + s += '\t\tcaml_raise_sys_error(caml_copy_string("Val_level XTL_NONE"));\n' + s += "\t\tbreak;\n" + + for index,level in enumerate(levels): + s += "\tcase %s:\n\t\treturn Val_int(%d);\n" % (level, index) + + s += """\tcase XTL_NUM_LEVELS: /* Not a real value! */ + \t\tcaml_raise_sys_error( + \t\t\tcaml_copy_string("Val_level XTL_NUM_LEVELS")); + #if 0 /* Let the compiler catch this */ + \tdefault: + \t\tcaml_raise_sys_error(caml_copy_string("Val_level Unknown")); + \t\tbreak; + #endif + \t} + \tabort(); + } + """ + + return s + +def autogen_header(open_comment, close_comment): + s = open_comment + " AUTO-GENERATED FILE DO NOT EDIT " + close_comment + "\n" + s += open_comment + " autogenerated by \n" + s += reduce(lambda x,y: x + " ", range(len(open_comment + " ")), "") + s += "%s" % " ".join(sys.argv) + s += "\n " + close_comment + "\n\n" + return s + +if __name__ == '__main__': + if len(sys.argv) < 3: + print >>sys.stderr, "Usage: genlevels.py " + sys.exit(1) + + levels, olevels = read_levels() + + _mli = sys.argv[1] + mli = open(_mli, 'w') + mli.write(autogen_header("(*", "*)")) + + _ml = sys.argv[2] + ml = open(_ml, 'w') + ml.write(autogen_header("(*", "*)")) + + _cinc = sys.argv[3] + cinc = open(_cinc, 'w') + cinc.write(autogen_header("/*", "*/")) + + mli.write(gen_mli(olevels)) + mli.write("\n") + + ml.write(gen_ml(olevels)) + ml.write("\n") + + cinc.write(gen_c(levels)) + cinc.write("\n") + + ml.write("(* END OF AUTO-GENERATED CODE *)\n") + ml.close() + mli.write("(* END OF AUTO-GENERATED CODE *)\n") + mli.close() + cinc.close() + diff --git a/tools/ocaml/libs/xentoollog/xentoollog.ml.in b/tools/ocaml/libs/xentoollog/xentoollog.ml.in new file mode 100644 index 0000000..ce9ea1d --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog.ml.in @@ -0,0 +1,48 @@ +(* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +open Printf +open Random +open Callback + +(* @@XTL_LEVELS@@ *) + +let compare_level x y = + compare (level_to_prio x) (level_to_prio y) + +type handle + +type logger_cbs = { + vmessage : level -> int option -> string option -> string -> unit; + progress : string option -> string -> int -> int64 -> int64 -> unit; + (*destroy : unit -> unit*) +} + +external _create_logger: (string * string) -> handle = "stub_xtl_create_logger" +external test: handle -> unit = "stub_xtl_test" + +let counter = ref 0L + +let create name cbs : handle = + (* Callback names are supposed to be unique *) + let suffix = Int64.to_string !counter in + counter := Int64.succ !counter; + let vmessage_name = sprintf "%s_vmessage_%s" name suffix in + let progress_name = sprintf "%s_progress_%s" name suffix in + (*let destroy_name = sprintf "%s_destroy" name in*) + Callback.register vmessage_name cbs.vmessage; + Callback.register progress_name cbs.progress; + _create_logger (vmessage_name, progress_name) + diff --git a/tools/ocaml/libs/xentoollog/xentoollog.mli.in b/tools/ocaml/libs/xentoollog/xentoollog.mli.in new file mode 100644 index 0000000..05c098a --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog.mli.in @@ -0,0 +1,43 @@ +(* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +(* @@XTL_LEVELS@@ *) + +val level_to_string : level -> string +val compare_level : level -> level -> int + +type handle + +(** call back arguments. See xentoollog.h for more info. + vmessage: + level: level as above + errno: Some or None + context: Some or None + message: The log message (already formatted) + progress: + context: Some or None + doing_what: string + percent, done, total. +*) +type logger_cbs = { + vmessage : level -> int option -> string option -> string -> unit; + progress : string option -> string -> int -> int64 -> int64 -> unit; + (*destroy : handle -> unit*) +} + +external test: handle -> unit = "stub_xtl_test" + +val create : string -> logger_cbs -> handle + diff --git a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c new file mode 100644 index 0000000..3b2f91b --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c @@ -0,0 +1,196 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include + +#define CAML_NAME_SPACE +#include +#include +#include +#include +#include +#include + +#include + +#include "caml_xentoollog.h" + +#define XTL ((xentoollog_logger *) Xtl_val(handle)) + +static char * dup_String_val(value s) +{ + int len; + char *c; + len = caml_string_length(s); + c = calloc(len + 1, sizeof(char)); + if (!c) + caml_raise_out_of_memory(); + memcpy(c, String_val(s), len); + return c; +} + +#include "_xtl_levels.inc" + +/* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ +#define Val_none Val_int(0) +#define Some_val(v) Field(v,0) + +static value Val_some(value v) +{ + CAMLparam1(v); + CAMLlocal1(some); + some = caml_alloc(1, 0); + Store_field(some, 0, v); + CAMLreturn(some); +} + +static value Val_errno(int errnoval) +{ + if (errnoval == -1) + return Val_none; + return Val_some(Val_int(errnoval)); +} + +static value Val_context(const char *context) +{ + if (context == NULL) + return Val_none; + return Val_some(caml_copy_string(context)); +} + +static void stub_xtl_ocaml_vmessage(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) +{ + CAMLparam0(); + CAMLlocalN(args, 4); + struct caml_xtl *xtl = (struct caml_xtl*)logger; + value *func = caml_named_value(xtl->vmessage_cb) ; + char *msg; + + if (args == NULL) + caml_raise_out_of_memory(); + if (func == NULL) + caml_raise_sys_error(caml_copy_string("Unable to find callback")); + if (vasprintf(&msg, format, al) < 0) + caml_raise_out_of_memory(); + + /* vmessage : level -> int option -> string option -> string -> unit; */ + args[0] = Val_level(level); + args[1] = Val_errno(errnoval); + args[2] = Val_context(context); + args[3] = caml_copy_string(msg); + + free(msg); + + caml_callbackN(*func, 4, args); + CAMLreturn0; +} + +static void stub_xtl_ocaml_progress(struct xentoollog_logger *logger, + const char *context, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) +{ + CAMLparam0(); + CAMLlocalN(args, 5); + struct caml_xtl *xtl = (struct caml_xtl*)logger; + value *func = caml_named_value(xtl->progress_cb) ; + + if (args == NULL) + caml_raise_out_of_memory(); + if (func == NULL) + caml_raise_sys_error(caml_copy_string("Unable to find callback")); + + /* progress : string option -> string -> int -> int64 -> int64 -> unit; */ + args[0] = Val_context(context); + args[1] = caml_copy_string(doing_what); + args[2] = Val_int(percent); + args[3] = caml_copy_int64(done); + args[4] = caml_copy_int64(total); + + caml_callbackN(*func, 5, args); + CAMLreturn0; +} + +static void xtl_destroy(struct xentoollog_logger *logger) +{ + struct caml_xtl *xtl = (struct caml_xtl*)logger; + free(xtl->vmessage_cb); + free(xtl->progress_cb); + free(xtl); +} + +void xtl_finalize(value handle) +{ + xtl_destroy(XTL); +} + +static struct custom_operations xentoollogger_custom_operations = { + "xentoollogger_custom_operations", + xtl_finalize /* custom_finalize_default */, + custom_compare_default, + custom_hash_default, + custom_serialize_default, + custom_deserialize_default +}; + +/* external _create_logger: (string * string) -> handle = "stub_xtl_create_logger" */ +CAMLprim value stub_xtl_create_logger(value cbs) +{ + CAMLparam1(cbs); + CAMLlocal1(handle); + struct caml_xtl *xtl = malloc(sizeof(*xtl)); + if (xtl == NULL) + caml_raise_out_of_memory(); + + memset(xtl, 0, sizeof(*xtl)); + + xtl->vtable.vmessage = &stub_xtl_ocaml_vmessage; + xtl->vtable.progress = &stub_xtl_ocaml_progress; + xtl->vtable.destroy = &xtl_destroy; + + xtl->vmessage_cb = dup_String_val(Field(cbs, 0)); + xtl->progress_cb = dup_String_val(Field(cbs, 1)); + + handle = caml_alloc_custom(&xentoollogger_custom_operations, sizeof(xtl), 0, 1); + Xtl_val(handle) = xtl; + + CAMLreturn(handle); +} + +/* external test: handle -> unit = "stub_xtl_test" */ +CAMLprim value stub_xtl_test(value handle) +{ + unsigned long l; + CAMLparam1(handle); + xtl_log(XTL, XTL_DEBUG, -1, "debug", "%s -- debug", __func__); + xtl_log(XTL, XTL_INFO, -1, "test", "%s -- test 1", __func__); + xtl_log(XTL, XTL_INFO, ENOSYS, "test errno", "%s -- test 2", __func__); + xtl_log(XTL, XTL_CRITICAL, -1, "critical", "%s -- critical", __func__); + for (l = 0UL; l<=100UL; l += 10UL) { + xtl_progress(XTL, "progress", "testing", l, 100UL); + usleep(10000); + } + CAMLreturn(Val_unit); +} + -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:13:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuB-0003nV-KN; Tue, 12 Nov 2013 11:13:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu9-0003ms-Sw for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:10 +0000 Received: from [85.158.137.68:8466] by server-16.bemta-3.messagelabs.com id 5B/35-18787-54D02825; Tue, 12 Nov 2013 11:13:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1384254786!963953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_18, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13766 invoked from network); 12 Nov 2013 11:13:07 -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 Nov 2013 11:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBu6-0000fj-1p for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBu6-0008RU-02 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:06 +0000 Date: Tue, 12 Nov 2013 11:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: ocaml: add simple binding for xentoollog (output only). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e35eb12447eb0c7343a1286f5c80138b5e5c84 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:43 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxc: ocaml: add simple binding for xentoollog (output only). These bindings allow ocaml code to receive log message via xentoollog but do not support injecting messages into xentoollog from ocaml. Receiving log messages from libx{c,l} and forwarding them to ocaml is the use case which is needed by the following patches. Add a simple noddy test case (tools/ocaml/test). Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott [ ijc -- dropped the xtl test harness, it failed to link ] --- tools/ocaml/Makefile.rules | 2 +- tools/ocaml/libs/Makefile | 1 + tools/ocaml/libs/xentoollog/META.in | 4 + tools/ocaml/libs/xentoollog/Makefile | 61 ++++++++ tools/ocaml/libs/xentoollog/caml_xentoollog.h | 24 +++ tools/ocaml/libs/xentoollog/genlevels.py | 127 +++++++++++++++ tools/ocaml/libs/xentoollog/xentoollog.ml.in | 48 ++++++ tools/ocaml/libs/xentoollog/xentoollog.mli.in | 43 +++++ tools/ocaml/libs/xentoollog/xentoollog_stubs.c | 196 ++++++++++++++++++++++++ 9 files changed, 505 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules index 5e6d81e..0745e83 100644 --- a/tools/ocaml/Makefile.rules +++ b/tools/ocaml/Makefile.rules @@ -24,7 +24,7 @@ ALL_OCAML_OBJS ?= $(OBJS) %.cmi: %.mli $(call quiet-command, $(OCAMLC) $(OCAMLCFLAGS) -c -o $@ $<,MLI,$@) -%.cmx: %.ml +%.cmx %.o: %.ml $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -c -o $@ $<,MLOPT,$@) %.ml: %.mll diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile index bca0fa2..3afdc89 100644 --- a/tools/ocaml/libs/Makefile +++ b/tools/ocaml/libs/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS= \ mmap \ + xentoollog \ xc eventchn \ xb xs xl diff --git a/tools/ocaml/libs/xentoollog/META.in b/tools/ocaml/libs/xentoollog/META.in new file mode 100644 index 0000000..7b06683 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/META.in @@ -0,0 +1,4 @@ +version = "@VERSION@" +description = "Xen Tools Logger Interface" +archive(byte) = "xentoollog.cma" +archive(native) = "xentoollog.cmxa" diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile new file mode 100644 index 0000000..e535ba5 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -0,0 +1,61 @@ +TOPLEVEL=$(CURDIR)/../.. +XEN_ROOT=$(TOPLEVEL)/../.. +include $(TOPLEVEL)/common.make + +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +OCAMLINCLUDE += + +OBJS = xentoollog +INTF = xentoollog.cmi +LIBS = xentoollog.cma xentoollog.cmxa + +LIBS_xentoollog = $(LDLIBS_libxenctrl) + +xentoollog_OBJS = $(OBJS) +xentoollog_C_OBJS = xentoollog_stubs + +OCAML_LIBRARY = xentoollog + +GENERATED_FILES += xentoollog.ml xentoollog.ml.tmp xentoollog.mli xentoollog.mli.tmp +GENERATED_FILES += _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc META + +all: $(INTF) $(LIBS) + +xentoollog.ml: xentoollog.ml.in _xtl_levels.ml.in + $(Q)sed -e '1i\ +(*\ + * AUTO-GENERATED FILE DO NOT EDIT\ + * Generated from xentoollog.ml.in and _xtl_levels.ml.in\ + *)\ +' \ + -e '/^(\* @@XTL_LEVELS@@ \*)$$/r_xtl_levels.ml.in' \ + < xentoollog.ml.in > xentoollog.ml.tmp + $(Q)mv xentoollog.ml.tmp xentoollog.ml + +xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in + $(Q)sed -e '1i\ +(*\ + * AUTO-GENERATED FILE DO NOT EDIT\ + * Generated from xentoollog.mli.in and _xtl_levels.mli.in\ + *)\ +' \ + -e '/^(\* @@XTL_LEVELS@@ \*)$$/r_xtl_levels.mli.in' \ + < xentoollog.mli.in > xentoollog.mli.tmp + $(Q)mv xentoollog.mli.tmp xentoollog.mli + +libs: $(LIBS) + +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/xentoollog.h + $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc + +.PHONY: install +install: $(LIBS) META + mkdir -p $(OCAMLDESTDIR) + ocamlfind remove -destdir $(OCAMLDESTDIR) xentoollog + ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xentoollog META $(INTF) $(LIBS) *.a *.so *.cmx + +.PHONY: uninstall +uninstall: + ocamlfind remove -destdir $(OCAMLDESTDIR) xentoollog + +include $(TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xentoollog/caml_xentoollog.h b/tools/ocaml/libs/xentoollog/caml_xentoollog.h new file mode 100644 index 0000000..0eb7618 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/caml_xentoollog.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2013 Citrix Ltd. + * Author Ian Campbell + * Author Rob Hoes + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +struct caml_xtl { + xentoollog_logger vtable; + char *vmessage_cb; + char *progress_cb; +}; + +#define Xtl_val(x)(*((struct caml_xtl **) Data_custom_val(x))) + diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py new file mode 100755 index 0000000..6b42f21 --- /dev/null +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -0,0 +1,127 @@ +#!/usr/bin/python + +import sys + +def read_levels(): + f = open('../../../libxc/xentoollog.h', 'r') + + levels = [] + record = False + for l in f.readlines(): + if 'XTL_NUM_LEVELS' in l: + break + if record == True: + levels.append(l.split(',')[0].strip()) + if 'XTL_NONE' in l: + record = True + + f.close() + + olevels = [level[4:].capitalize() for level in levels] + + return levels, olevels + +# .ml + +def gen_ml(olevels): + s = "" + + s += "type level = \n" + for level in olevels: + s += '\t| %s\n' % level + + s += "\nlet level_to_string level =\n" + s += "\tmatch level with\n" + for level in olevels: + s += '\t| %s -> "%s"\n' % (level, level) + + s += "\nlet level_to_prio level =\n" + s += "\tmatch level with\n" + for index,level in enumerate(olevels): + s += '\t| %s -> %d\n' % (level, index) + + return s + +# .mli + +def gen_mli(olevels): + s = "" + + s += "type level = \n" + for level in olevels: + s += '\t| %s\n' % level + + return s + +# .c + +def gen_c(level): + s = "" + + s += "static value Val_level(xentoollog_level c_level)\n" + s += "{\n" + s += "\tswitch (c_level) {\n" + s += "\tcase XTL_NONE: /* Not a real value */\n" + s += '\t\tcaml_raise_sys_error(caml_copy_string("Val_level XTL_NONE"));\n' + s += "\t\tbreak;\n" + + for index,level in enumerate(levels): + s += "\tcase %s:\n\t\treturn Val_int(%d);\n" % (level, index) + + s += """\tcase XTL_NUM_LEVELS: /* Not a real value! */ + \t\tcaml_raise_sys_error( + \t\t\tcaml_copy_string("Val_level XTL_NUM_LEVELS")); + #if 0 /* Let the compiler catch this */ + \tdefault: + \t\tcaml_raise_sys_error(caml_copy_string("Val_level Unknown")); + \t\tbreak; + #endif + \t} + \tabort(); + } + """ + + return s + +def autogen_header(open_comment, close_comment): + s = open_comment + " AUTO-GENERATED FILE DO NOT EDIT " + close_comment + "\n" + s += open_comment + " autogenerated by \n" + s += reduce(lambda x,y: x + " ", range(len(open_comment + " ")), "") + s += "%s" % " ".join(sys.argv) + s += "\n " + close_comment + "\n\n" + return s + +if __name__ == '__main__': + if len(sys.argv) < 3: + print >>sys.stderr, "Usage: genlevels.py " + sys.exit(1) + + levels, olevels = read_levels() + + _mli = sys.argv[1] + mli = open(_mli, 'w') + mli.write(autogen_header("(*", "*)")) + + _ml = sys.argv[2] + ml = open(_ml, 'w') + ml.write(autogen_header("(*", "*)")) + + _cinc = sys.argv[3] + cinc = open(_cinc, 'w') + cinc.write(autogen_header("/*", "*/")) + + mli.write(gen_mli(olevels)) + mli.write("\n") + + ml.write(gen_ml(olevels)) + ml.write("\n") + + cinc.write(gen_c(levels)) + cinc.write("\n") + + ml.write("(* END OF AUTO-GENERATED CODE *)\n") + ml.close() + mli.write("(* END OF AUTO-GENERATED CODE *)\n") + mli.close() + cinc.close() + diff --git a/tools/ocaml/libs/xentoollog/xentoollog.ml.in b/tools/ocaml/libs/xentoollog/xentoollog.ml.in new file mode 100644 index 0000000..ce9ea1d --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog.ml.in @@ -0,0 +1,48 @@ +(* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +open Printf +open Random +open Callback + +(* @@XTL_LEVELS@@ *) + +let compare_level x y = + compare (level_to_prio x) (level_to_prio y) + +type handle + +type logger_cbs = { + vmessage : level -> int option -> string option -> string -> unit; + progress : string option -> string -> int -> int64 -> int64 -> unit; + (*destroy : unit -> unit*) +} + +external _create_logger: (string * string) -> handle = "stub_xtl_create_logger" +external test: handle -> unit = "stub_xtl_test" + +let counter = ref 0L + +let create name cbs : handle = + (* Callback names are supposed to be unique *) + let suffix = Int64.to_string !counter in + counter := Int64.succ !counter; + let vmessage_name = sprintf "%s_vmessage_%s" name suffix in + let progress_name = sprintf "%s_progress_%s" name suffix in + (*let destroy_name = sprintf "%s_destroy" name in*) + Callback.register vmessage_name cbs.vmessage; + Callback.register progress_name cbs.progress; + _create_logger (vmessage_name, progress_name) + diff --git a/tools/ocaml/libs/xentoollog/xentoollog.mli.in b/tools/ocaml/libs/xentoollog/xentoollog.mli.in new file mode 100644 index 0000000..05c098a --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog.mli.in @@ -0,0 +1,43 @@ +(* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + *) + +(* @@XTL_LEVELS@@ *) + +val level_to_string : level -> string +val compare_level : level -> level -> int + +type handle + +(** call back arguments. See xentoollog.h for more info. + vmessage: + level: level as above + errno: Some or None + context: Some or None + message: The log message (already formatted) + progress: + context: Some or None + doing_what: string + percent, done, total. +*) +type logger_cbs = { + vmessage : level -> int option -> string option -> string -> unit; + progress : string option -> string -> int -> int64 -> int64 -> unit; + (*destroy : handle -> unit*) +} + +external test: handle -> unit = "stub_xtl_test" + +val create : string -> logger_cbs -> handle + diff --git a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c new file mode 100644 index 0000000..3b2f91b --- /dev/null +++ b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c @@ -0,0 +1,196 @@ +/* + * Copyright (C) 2012 Citrix Ltd. + * Author Ian Campbell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include + +#define CAML_NAME_SPACE +#include +#include +#include +#include +#include +#include + +#include + +#include "caml_xentoollog.h" + +#define XTL ((xentoollog_logger *) Xtl_val(handle)) + +static char * dup_String_val(value s) +{ + int len; + char *c; + len = caml_string_length(s); + c = calloc(len + 1, sizeof(char)); + if (!c) + caml_raise_out_of_memory(); + memcpy(c, String_val(s), len); + return c; +} + +#include "_xtl_levels.inc" + +/* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ +#define Val_none Val_int(0) +#define Some_val(v) Field(v,0) + +static value Val_some(value v) +{ + CAMLparam1(v); + CAMLlocal1(some); + some = caml_alloc(1, 0); + Store_field(some, 0, v); + CAMLreturn(some); +} + +static value Val_errno(int errnoval) +{ + if (errnoval == -1) + return Val_none; + return Val_some(Val_int(errnoval)); +} + +static value Val_context(const char *context) +{ + if (context == NULL) + return Val_none; + return Val_some(caml_copy_string(context)); +} + +static void stub_xtl_ocaml_vmessage(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) +{ + CAMLparam0(); + CAMLlocalN(args, 4); + struct caml_xtl *xtl = (struct caml_xtl*)logger; + value *func = caml_named_value(xtl->vmessage_cb) ; + char *msg; + + if (args == NULL) + caml_raise_out_of_memory(); + if (func == NULL) + caml_raise_sys_error(caml_copy_string("Unable to find callback")); + if (vasprintf(&msg, format, al) < 0) + caml_raise_out_of_memory(); + + /* vmessage : level -> int option -> string option -> string -> unit; */ + args[0] = Val_level(level); + args[1] = Val_errno(errnoval); + args[2] = Val_context(context); + args[3] = caml_copy_string(msg); + + free(msg); + + caml_callbackN(*func, 4, args); + CAMLreturn0; +} + +static void stub_xtl_ocaml_progress(struct xentoollog_logger *logger, + const char *context, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) +{ + CAMLparam0(); + CAMLlocalN(args, 5); + struct caml_xtl *xtl = (struct caml_xtl*)logger; + value *func = caml_named_value(xtl->progress_cb) ; + + if (args == NULL) + caml_raise_out_of_memory(); + if (func == NULL) + caml_raise_sys_error(caml_copy_string("Unable to find callback")); + + /* progress : string option -> string -> int -> int64 -> int64 -> unit; */ + args[0] = Val_context(context); + args[1] = caml_copy_string(doing_what); + args[2] = Val_int(percent); + args[3] = caml_copy_int64(done); + args[4] = caml_copy_int64(total); + + caml_callbackN(*func, 5, args); + CAMLreturn0; +} + +static void xtl_destroy(struct xentoollog_logger *logger) +{ + struct caml_xtl *xtl = (struct caml_xtl*)logger; + free(xtl->vmessage_cb); + free(xtl->progress_cb); + free(xtl); +} + +void xtl_finalize(value handle) +{ + xtl_destroy(XTL); +} + +static struct custom_operations xentoollogger_custom_operations = { + "xentoollogger_custom_operations", + xtl_finalize /* custom_finalize_default */, + custom_compare_default, + custom_hash_default, + custom_serialize_default, + custom_deserialize_default +}; + +/* external _create_logger: (string * string) -> handle = "stub_xtl_create_logger" */ +CAMLprim value stub_xtl_create_logger(value cbs) +{ + CAMLparam1(cbs); + CAMLlocal1(handle); + struct caml_xtl *xtl = malloc(sizeof(*xtl)); + if (xtl == NULL) + caml_raise_out_of_memory(); + + memset(xtl, 0, sizeof(*xtl)); + + xtl->vtable.vmessage = &stub_xtl_ocaml_vmessage; + xtl->vtable.progress = &stub_xtl_ocaml_progress; + xtl->vtable.destroy = &xtl_destroy; + + xtl->vmessage_cb = dup_String_val(Field(cbs, 0)); + xtl->progress_cb = dup_String_val(Field(cbs, 1)); + + handle = caml_alloc_custom(&xentoollogger_custom_operations, sizeof(xtl), 0, 1); + Xtl_val(handle) = xtl; + + CAMLreturn(handle); +} + +/* external test: handle -> unit = "stub_xtl_test" */ +CAMLprim value stub_xtl_test(value handle) +{ + unsigned long l; + CAMLparam1(handle); + xtl_log(XTL, XTL_DEBUG, -1, "debug", "%s -- debug", __func__); + xtl_log(XTL, XTL_INFO, -1, "test", "%s -- test 1", __func__); + xtl_log(XTL, XTL_INFO, ENOSYS, "test errno", "%s -- test 2", __func__); + xtl_log(XTL, XTL_CRITICAL, -1, "critical", "%s -- critical", __func__); + for (l = 0UL; l<=100UL; l += 10UL) { + xtl_progress(XTL, "progress", "testing", l, 100UL); + usleep(10000); + } + CAMLreturn(Val_unit); +} + -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:13:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuJ-0003pS-Oo; Tue, 12 Nov 2013 11:13:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuI-0003pA-RT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:19 +0000 Received: from [85.158.143.35:59732] by server-3.bemta-4.messagelabs.com id 7D/51-19578-E4D02825; Tue, 12 Nov 2013 11:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1384254796!2605363!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32152 invoked from network); 12 Nov 2013 11:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuG-0000fm-8A for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuG-0008SO-4d for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:16 +0000 Date: Tue, 12 Nov 2013 11:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: allocate a long lived libxl context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a45685daa13d0dc6555200f9beb038fbabf211ec Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:44 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: allocate a long lived libxl context. Rather than allocating a new context for every libxl call begin to switch to a model where a context is allocated by the caller and may then be used for multiple calls down into the library. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/META.in | 1 + tools/ocaml/libs/xl/Makefile | 3 ++ tools/ocaml/libs/xl/xenlight.ml.in | 4 +++ tools/ocaml/libs/xl/xenlight.mli.in | 4 +++ tools/ocaml/libs/xl/xenlight_stubs.c | 37 ++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/META.in b/tools/ocaml/libs/xl/META.in index fe2c60b..3f0c552 100644 --- a/tools/ocaml/libs/xl/META.in +++ b/tools/ocaml/libs/xl/META.in @@ -1,4 +1,5 @@ version = "@VERSION@" description = "Xen Toolstack Library" +requires = "xentoollog" archive(byte) = "xenlight.cma" archive(native) = "xenlight.cmxa" diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index 4195bfc..0408cc2 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -5,11 +5,14 @@ include $(TOPLEVEL)/common.make # ignore unused generated functions CFLAGS += -Wno-unused CFLAGS += $(CFLAGS_libxenlight) +CFLAGS += -I ../xentoollog OBJS = xenlight INTF = xenlight.cmi LIBS = xenlight.cma xenlight.cmxa +OCAMLINCLUDE += -I ../xentoollog + LIBS_xenlight = $(LDLIBS_libxenlight) xenlight_OBJS = $(OBJS) diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index dcc1a38..3d663d8 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -20,6 +20,10 @@ type devid = int (* @@LIBXL_TYPES@@ *) +type ctx + +external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" + external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index 3fd0165..96d859c 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -20,6 +20,10 @@ type devid = int (* @@LIBXL_TYPES@@ *) +type ctx + +external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" + external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index a7bf6ba..c26226f 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,11 @@ #include #include +#include "caml_xentoollog.h" + +#define Ctx_val(x)(*((libxl_ctx **) Data_custom_val(x))) +#define CTX ((libxl_ctx *) Ctx_val(ctx)) + struct caml_logger { struct xentoollog_logger logger; int log_offset; @@ -97,6 +103,37 @@ static void failwith_xl(char *fname, struct caml_logger *lg) caml_raise_with_string(*caml_named_value("xl.error"), s); } +void ctx_finalize(value ctx) +{ + libxl_ctx_free(CTX); +} + +static struct custom_operations libxl_ctx_custom_operations = { + "libxl_ctx_custom_operations", + ctx_finalize /* custom_finalize_default */, + custom_compare_default, + custom_hash_default, + custom_serialize_default, + custom_deserialize_default +}; + +CAMLprim value stub_libxl_ctx_alloc(value logger) +{ + CAMLparam1(logger); + CAMLlocal1(handle); + libxl_ctx *ctx; + int ret; + + ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); + if (ret != 0) \ + failwith_xl("cannot init context", NULL); + + handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); + Ctx_val(handle) = ctx; + + CAMLreturn(handle); +} + static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) { void *ptr; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:13:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuJ-0003pS-Oo; Tue, 12 Nov 2013 11:13:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuI-0003pA-RT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:19 +0000 Received: from [85.158.143.35:59732] by server-3.bemta-4.messagelabs.com id 7D/51-19578-E4D02825; Tue, 12 Nov 2013 11:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1384254796!2605363!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32152 invoked from network); 12 Nov 2013 11:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuG-0000fm-8A for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuG-0008SO-4d for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:16 +0000 Date: Tue, 12 Nov 2013 11:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: allocate a long lived libxl context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a45685daa13d0dc6555200f9beb038fbabf211ec Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:44 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: allocate a long lived libxl context. Rather than allocating a new context for every libxl call begin to switch to a model where a context is allocated by the caller and may then be used for multiple calls down into the library. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/META.in | 1 + tools/ocaml/libs/xl/Makefile | 3 ++ tools/ocaml/libs/xl/xenlight.ml.in | 4 +++ tools/ocaml/libs/xl/xenlight.mli.in | 4 +++ tools/ocaml/libs/xl/xenlight_stubs.c | 37 ++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/META.in b/tools/ocaml/libs/xl/META.in index fe2c60b..3f0c552 100644 --- a/tools/ocaml/libs/xl/META.in +++ b/tools/ocaml/libs/xl/META.in @@ -1,4 +1,5 @@ version = "@VERSION@" description = "Xen Toolstack Library" +requires = "xentoollog" archive(byte) = "xenlight.cma" archive(native) = "xenlight.cmxa" diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index 4195bfc..0408cc2 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -5,11 +5,14 @@ include $(TOPLEVEL)/common.make # ignore unused generated functions CFLAGS += -Wno-unused CFLAGS += $(CFLAGS_libxenlight) +CFLAGS += -I ../xentoollog OBJS = xenlight INTF = xenlight.cmi LIBS = xenlight.cma xenlight.cmxa +OCAMLINCLUDE += -I ../xentoollog + LIBS_xenlight = $(LDLIBS_libxenlight) xenlight_OBJS = $(OBJS) diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index dcc1a38..3d663d8 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -20,6 +20,10 @@ type devid = int (* @@LIBXL_TYPES@@ *) +type ctx + +external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" + external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index 3fd0165..96d859c 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -20,6 +20,10 @@ type devid = int (* @@LIBXL_TYPES@@ *) +type ctx + +external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" + external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index a7bf6ba..c26226f 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,11 @@ #include #include +#include "caml_xentoollog.h" + +#define Ctx_val(x)(*((libxl_ctx **) Data_custom_val(x))) +#define CTX ((libxl_ctx *) Ctx_val(ctx)) + struct caml_logger { struct xentoollog_logger logger; int log_offset; @@ -97,6 +103,37 @@ static void failwith_xl(char *fname, struct caml_logger *lg) caml_raise_with_string(*caml_named_value("xl.error"), s); } +void ctx_finalize(value ctx) +{ + libxl_ctx_free(CTX); +} + +static struct custom_operations libxl_ctx_custom_operations = { + "libxl_ctx_custom_operations", + ctx_finalize /* custom_finalize_default */, + custom_compare_default, + custom_hash_default, + custom_serialize_default, + custom_deserialize_default +}; + +CAMLprim value stub_libxl_ctx_alloc(value logger) +{ + CAMLparam1(logger); + CAMLlocal1(handle); + libxl_ctx *ctx; + int ret; + + ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); + if (ret != 0) \ + failwith_xl("cannot init context", NULL); + + handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); + Ctx_val(handle) = ctx; + + CAMLreturn(handle); +} + static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) { void *ptr; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:13:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuV-0003sc-S5; Tue, 12 Nov 2013 11:13:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuU-0003s8-5b for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:30 +0000 Received: from [85.158.139.211:10653] by server-16.bemta-5.messagelabs.com id 13/F5-17144-95D02825; Tue, 12 Nov 2013 11:13:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384254806!1467948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 438 invoked from network); 12 Nov 2013 11:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuQ-0000fv-DP for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuQ-0008Sn-B3 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:26 +0000 Date: Tue, 12 Nov 2013 11:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: switch all functions over to take a context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7113e0c3affdadbb79e9bd95a39f436c2e4d6e44 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:45 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: switch all functions over to take a context. Since the context has a logger we can get rid of the logger built into these bindings and use the xentoollog bindings instead. The gc is of limited use when most things are freed with libxl_FOO_dispose, so get rid of that too. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 44 ++-- tools/ocaml/libs/xl/xenlight.ml.in | 11 +- tools/ocaml/libs/xl/xenlight.mli.in | 9 +- tools/ocaml/libs/xl/xenlight_stubs.c | 474 +++++++++------------------------- 4 files changed, 153 insertions(+), 385 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 1e956ab..bdae886 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -8,23 +8,23 @@ import idl builtins = { "bool": ("bool", "%(c)s = Bool_val(%(o)s)", "Val_bool(%(c)s)" ), "int": ("int", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), - "char *": ("string", "%(c)s = dup_String_val(gc, %(o)s)", "caml_copy_string(%(c)s)"), + "char *": ("string", "%(c)s = dup_String_val(%(o)s)", "caml_copy_string(%(c)s)"), "libxl_domid": ("domid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), - "libxl_uuid": ("int array", "Uuid_val(gc, lg, &%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), - "libxl_bitmap": ("bool array", "Bitmap_val(gc, lg, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), - "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(gc, lg, &%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), - "libxl_string_list": ("string list", "libxl_string_list_val(gc, lg, &%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), - "libxl_mac": ("int array", "Mac_val(gc, lg, &%(c)s, %(o)s)", "Val_mac(&%(c)s)"), + "libxl_uuid": ("int array", "Uuid_val(&%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), + "libxl_bitmap": ("bool array", "Bitmap_val(ctx, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), + "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(&%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), + "libxl_string_list": ("string list", "libxl_string_list_val(&%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), + "libxl_mac": ("int array", "Mac_val(&%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), # The following needs to be sorted out later "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } -DEVICE_FUNCTIONS = [ ("add", ["t", "domid", "unit"]), - ("remove", ["t", "domid", "unit"]), - ("destroy", ["t", "domid", "unit"]), +DEVICE_FUNCTIONS = [ ("add", ["ctx", "t", "domid", "unit"]), + ("remove", ["ctx", "t", "domid", "unit"]), + ("destroy", ["ctx", "t", "domid", "unit"]), ] functions = { # ( name , [type1,type2,....] ) @@ -33,13 +33,13 @@ functions = { # ( name , [type1,type2,....] ) "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": DEVICE_FUNCTIONS, - "physinfo": [ ("get", ["unit", "t"]), + "physinfo": [ ("get", ["ctx", "t"]), ], - "cputopology": [ ("get", ["unit", "t array"]), + "cputopology": [ ("get", ["ctx", "t array"]), ], "domain_sched_params": - [ ("get", ["domid", "t"]), - ("set", ["domid", "t", "unit"]), + [ ("get", ["ctx", "domid", "t"]), + ("set", ["ctx", "domid", "t", "unit"]), ], } def stub_fn_name(ty, name): @@ -236,7 +236,7 @@ def c_val(ty, c, o, indent="", parent = None): for e in ty.values: s += " case %d: *%s = %s; break;\n" % (n, c, e.name) n += 1 - s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename + s += " default: failwith_xl(\"cannot convert value to %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): s += "{\n" @@ -249,7 +249,7 @@ def c_val(ty, c, o, indent="", parent = None): parent + ty.keyvar.name, f.enumname) n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t} else {\n" s += "\t\t/* Is block... */\n" @@ -265,7 +265,7 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") s += "break;\n" n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t}\n" s += "}" @@ -278,14 +278,14 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) + s += "%s_val(ctx, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) + s += "static int %s_val (libxl_ctx *ctx, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -334,7 +334,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 - s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += " default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): n = 0 @@ -363,7 +363,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): m += 1 #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) s += "\t break;\n" - s += "\t default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += "\t default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename s += "\t}" elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" @@ -388,14 +388,14 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n = n + 1 s += "}" else: - s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) + s += "%s = Val_%s(%s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) return s.replace("\n", "\n%s" % indent).rstrip(indent) def gen_Val_ocaml(ty, indent=""): s = "/* Convert %s to a caml value */\n" % ty.rawname - s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) + s += "static value Val_%s (%s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) s += "{\n" s += "\tCAMLparam0();\n" s += "\tCAMLlocal1(%s_ocaml);\n" % ty.rawname diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index 3d663d8..dffba72 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -15,17 +15,16 @@ exception Error of string +type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) -type ctx - external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" -external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" -external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" -external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" +external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" +external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" +external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" -let _ = Callback.register_exception "xl.error" (Error "register_callback") +let _ = Callback.register_exception "Xenlight.Error" (Error("")) diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index 96d859c..e2686bb 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -15,15 +15,14 @@ exception Error of string +type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) -type ctx - external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" -external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" -external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" -external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" +external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" +external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" +external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index c26226f..dd6c781 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -35,47 +35,7 @@ #define Ctx_val(x)(*((libxl_ctx **) Data_custom_val(x))) #define CTX ((libxl_ctx *) Ctx_val(ctx)) -struct caml_logger { - struct xentoollog_logger logger; - int log_offset; - char log_buf[2048]; -}; - -typedef struct caml_gc { - int offset; - void *ptrs[64]; -} caml_gc; - -static void log_vmessage(struct xentoollog_logger *logger, xentoollog_level level, - int errnoval, const char *context, const char *format, va_list al) -{ - struct caml_logger *ologger = (struct caml_logger *) logger; - - ologger->log_offset += vsnprintf(ologger->log_buf + ologger->log_offset, - 2048 - ologger->log_offset, format, al); -} - -static void log_destroy(struct xentoollog_logger *logger) -{ -} - -#define INIT_STRUCT() libxl_ctx *ctx; struct caml_logger lg; struct caml_gc gc; gc.offset = 0; - -#define INIT_CTX() \ - lg.logger.vmessage = log_vmessage; \ - lg.logger.destroy = log_destroy; \ - lg.logger.progress = NULL; \ - caml_enter_blocking_section(); \ - ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (struct xentoollog_logger *) &lg); \ - if (ret != 0) \ - failwith_xl("cannot init context", &lg); - -#define FREE_CTX() \ - gc_free(&gc); \ - caml_leave_blocking_section(); \ - libxl_ctx_free(ctx) - -static char * dup_String_val(caml_gc *gc, value s) +static char * dup_String_val(value s) { int len; char *c; @@ -83,24 +43,16 @@ static char * dup_String_val(caml_gc *gc, value s) c = calloc(len + 1, sizeof(char)); if (!c) caml_raise_out_of_memory(); - gc->ptrs[gc->offset++] = c; memcpy(c, String_val(s), len); return c; } -static void gc_free(caml_gc *gc) -{ - int i; - for (i = 0; i < gc->offset; i++) { - free(gc->ptrs[i]); - } -} - -static void failwith_xl(char *fname, struct caml_logger *lg) +static void failwith_xl(char *fname) { - char *s; - s = (lg) ? lg->log_buf : fname; - caml_raise_with_string(*caml_named_value("xl.error"), s); + value *exc = caml_named_value("Xenlight.Error"); + if (!exc) + caml_invalid_argument("Exception Xenlight.Error not initialized, please link xl.cma"); + caml_raise_with_string(*exc, fname); } void ctx_finalize(value ctx) @@ -126,7 +78,7 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); if (ret != 0) \ - failwith_xl("cannot init context", NULL); + failwith_xl("cannot init context"); handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); Ctx_val(handle) = ctx; @@ -134,16 +86,6 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) CAMLreturn(handle); } -static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) -{ - void *ptr; - ptr = calloc(nmemb, size); - if (!ptr) - caml_raise_out_of_memory(); - gc->ptrs[gc->offset++] = ptr; - return ptr; -} - static int list_len(value v) { int len = 0; @@ -154,9 +96,8 @@ static int list_len(value v) return len; } -static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, - libxl_key_value_list *c_val, - value v) +static int libxl_key_value_list_val(libxl_key_value_list *c_val, + value v) { CAMLparam1(v); CAMLlocal1(elem); @@ -165,15 +106,15 @@ static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, nr = list_len(v); - array = gc_calloc(gc, (nr + 1) * 2, sizeof(char *)); + array = calloc((nr + 1) * 2, sizeof(char *)); if (!array) caml_raise_out_of_memory(); for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) { elem = Field(v, 0); - array[i * 2] = dup_String_val(gc, Field(elem, 0)); - array[i * 2 + 1] = dup_String_val(gc, Field(elem, 1)); + array[i * 2] = dup_String_val(Field(elem, 0)); + array[i * 2 + 1] = dup_String_val(Field(elem, 1)); } *c_val = array; @@ -203,9 +144,7 @@ static value Val_key_value_list(libxl_key_value_list *c_val) CAMLreturn(list); } -static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, - libxl_string_list *c_val, - value v) +static int libxl_string_list_val(libxl_string_list *c_val, value v) { CAMLparam1(v); int nr, i; @@ -213,12 +152,12 @@ static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, nr = list_len(v); - array = gc_calloc(gc, (nr + 1), sizeof(char *)); + array = calloc(nr + 1, sizeof(char *)); if (!array) caml_raise_out_of_memory(); for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) - array[i] = dup_String_val(gc, Field(v, 0)); + array[i] = dup_String_val(Field(v, 0)); *c_val = array; CAMLreturn(0); @@ -269,7 +208,7 @@ static value Val_mac (libxl_mac *c_val) CAMLreturn(v); } -static int Mac_val(caml_gc *gc, struct caml_logger *lg, libxl_mac *c_val, value v) +static int Mac_val(libxl_mac *c_val, value v) { CAMLparam1(v); int i; @@ -300,10 +239,21 @@ static value Val_bitmap (libxl_bitmap *c_val) CAMLreturn(v); } -static int Bitmap_val(caml_gc *gc, struct caml_logger *lg, - libxl_bitmap *c_val, value v) +static int Bitmap_val(libxl_ctx *ctx, libxl_bitmap *c_val, value v) { - abort(); /* XXX */ + CAMLparam1(v); + int i, len = Wosize_val(v); + + c_val->size = 0; + if (len > 0 && libxl_bitmap_alloc(ctx, c_val, len)) + failwith_xl("cannot allocate bitmap"); + for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBuV-0003sc-S5; Tue, 12 Nov 2013 11:13:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuU-0003s8-5b for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:30 +0000 Received: from [85.158.139.211:10653] by server-16.bemta-5.messagelabs.com id 13/F5-17144-95D02825; Tue, 12 Nov 2013 11:13:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384254806!1467948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 438 invoked from network); 12 Nov 2013 11:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuQ-0000fv-DP for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuQ-0008Sn-B3 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:26 +0000 Date: Tue, 12 Nov 2013 11:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: switch all functions over to take a context. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7113e0c3affdadbb79e9bd95a39f436c2e4d6e44 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:45 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:26 2013 +0000 libxl: ocaml: switch all functions over to take a context. Since the context has a logger we can get rid of the logger built into these bindings and use the xentoollog bindings instead. The gc is of limited use when most things are freed with libxl_FOO_dispose, so get rid of that too. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 44 ++-- tools/ocaml/libs/xl/xenlight.ml.in | 11 +- tools/ocaml/libs/xl/xenlight.mli.in | 9 +- tools/ocaml/libs/xl/xenlight_stubs.c | 474 +++++++++------------------------- 4 files changed, 153 insertions(+), 385 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 1e956ab..bdae886 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -8,23 +8,23 @@ import idl builtins = { "bool": ("bool", "%(c)s = Bool_val(%(o)s)", "Val_bool(%(c)s)" ), "int": ("int", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), - "char *": ("string", "%(c)s = dup_String_val(gc, %(o)s)", "caml_copy_string(%(c)s)"), + "char *": ("string", "%(c)s = dup_String_val(%(o)s)", "caml_copy_string(%(c)s)"), "libxl_domid": ("domid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), - "libxl_uuid": ("int array", "Uuid_val(gc, lg, &%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), - "libxl_bitmap": ("bool array", "Bitmap_val(gc, lg, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), - "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(gc, lg, &%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), - "libxl_string_list": ("string list", "libxl_string_list_val(gc, lg, &%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), - "libxl_mac": ("int array", "Mac_val(gc, lg, &%(c)s, %(o)s)", "Val_mac(&%(c)s)"), + "libxl_uuid": ("int array", "Uuid_val(&%(c)s, %(o)s)", "Val_uuid(&%(c)s)"), + "libxl_bitmap": ("bool array", "Bitmap_val(ctx, &%(c)s, %(o)s)", "Val_bitmap(&%(c)s)"), + "libxl_key_value_list": ("(string * string) list", "libxl_key_value_list_val(&%(c)s, %(o)s)", "Val_key_value_list(&%(c)s)"), + "libxl_string_list": ("string list", "libxl_string_list_val(&%(c)s, %(o)s)", "Val_string_list(&%(c)s)"), + "libxl_mac": ("int array", "Mac_val(&%(c)s, %(o)s)", "Val_mac(&%(c)s)"), "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), # The following needs to be sorted out later "libxl_cpuid_policy_list": ("unit", "%(c)s = 0", "Val_unit"), } -DEVICE_FUNCTIONS = [ ("add", ["t", "domid", "unit"]), - ("remove", ["t", "domid", "unit"]), - ("destroy", ["t", "domid", "unit"]), +DEVICE_FUNCTIONS = [ ("add", ["ctx", "t", "domid", "unit"]), + ("remove", ["ctx", "t", "domid", "unit"]), + ("destroy", ["ctx", "t", "domid", "unit"]), ] functions = { # ( name , [type1,type2,....] ) @@ -33,13 +33,13 @@ functions = { # ( name , [type1,type2,....] ) "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": DEVICE_FUNCTIONS, - "physinfo": [ ("get", ["unit", "t"]), + "physinfo": [ ("get", ["ctx", "t"]), ], - "cputopology": [ ("get", ["unit", "t array"]), + "cputopology": [ ("get", ["ctx", "t array"]), ], "domain_sched_params": - [ ("get", ["domid", "t"]), - ("set", ["domid", "t", "unit"]), + [ ("get", ["ctx", "domid", "t"]), + ("set", ["ctx", "domid", "t", "unit"]), ], } def stub_fn_name(ty, name): @@ -236,7 +236,7 @@ def c_val(ty, c, o, indent="", parent = None): for e in ty.values: s += " case %d: *%s = %s; break;\n" % (n, c, e.name) n += 1 - s += " default: failwith_xl(\"cannot convert value to %s\", lg); break;\n" % ty.typename + s += " default: failwith_xl(\"cannot convert value to %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): s += "{\n" @@ -249,7 +249,7 @@ def c_val(ty, c, o, indent="", parent = None): parent + ty.keyvar.name, f.enumname) n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t} else {\n" s += "\t\t/* Is block... */\n" @@ -265,7 +265,7 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") s += "break;\n" n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\", lg); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t}\n" s += "}" @@ -278,14 +278,14 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s\n" % c_val(f.type, fexpr, "Field(%s, %d)" % (o,n), parent=nparent) n = n + 1 else: - s += "%s_val(gc, lg, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) + s += "%s_val(ctx, %s, %s);" % (ty.rawname, ty.pass_arg(c, parent is None, passby=idl.PASS_BY_REFERENCE), o) return s.replace("\n", "\n%s" % indent) def gen_c_val(ty, indent=""): s = "/* Convert caml value to %s */\n" % ty.rawname - s += "static int %s_val (caml_gc *gc, struct caml_logger *lg, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) + s += "static int %s_val (libxl_ctx *ctx, %s, value v)\n" % (ty.rawname, ty.make_arg("c_val", passby=idl.PASS_BY_REFERENCE)) s += "{\n" s += "\tCAMLparam1(v);\n" s += "\n" @@ -334,7 +334,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 - s += " default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += " default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): n = 0 @@ -363,7 +363,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): m += 1 #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) s += "\t break;\n" - s += "\t default: failwith_xl(\"cannot convert value from %s\", lg); break;\n" % ty.typename + s += "\t default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename s += "\t}" elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" @@ -388,14 +388,14 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n = n + 1 s += "}" else: - s += "%s = Val_%s(gc, lg, %s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) + s += "%s = Val_%s(%s);" % (o, ty.rawname, ty.pass_arg(c, parent is None)) return s.replace("\n", "\n%s" % indent).rstrip(indent) def gen_Val_ocaml(ty, indent=""): s = "/* Convert %s to a caml value */\n" % ty.rawname - s += "static value Val_%s (caml_gc *gc, struct caml_logger *lg, %s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) + s += "static value Val_%s (%s)\n" % (ty.rawname, ty.make_arg(ty.rawname+"_c")) s += "{\n" s += "\tCAMLparam0();\n" s += "\tCAMLlocal1(%s_ocaml);\n" % ty.rawname diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index 3d663d8..dffba72 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -15,17 +15,16 @@ exception Error of string +type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) -type ctx - external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" -external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" -external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" -external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" +external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" +external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" +external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" -let _ = Callback.register_exception "xl.error" (Error "register_callback") +let _ = Callback.register_exception "Xenlight.Error" (Error("")) diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index 96d859c..e2686bb 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -15,15 +15,14 @@ exception Error of string +type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) -type ctx - external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" -external send_trigger : domid -> trigger -> int -> unit = "stub_xl_send_trigger" -external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq" -external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys" +external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" +external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" +external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index c26226f..dd6c781 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -35,47 +35,7 @@ #define Ctx_val(x)(*((libxl_ctx **) Data_custom_val(x))) #define CTX ((libxl_ctx *) Ctx_val(ctx)) -struct caml_logger { - struct xentoollog_logger logger; - int log_offset; - char log_buf[2048]; -}; - -typedef struct caml_gc { - int offset; - void *ptrs[64]; -} caml_gc; - -static void log_vmessage(struct xentoollog_logger *logger, xentoollog_level level, - int errnoval, const char *context, const char *format, va_list al) -{ - struct caml_logger *ologger = (struct caml_logger *) logger; - - ologger->log_offset += vsnprintf(ologger->log_buf + ologger->log_offset, - 2048 - ologger->log_offset, format, al); -} - -static void log_destroy(struct xentoollog_logger *logger) -{ -} - -#define INIT_STRUCT() libxl_ctx *ctx; struct caml_logger lg; struct caml_gc gc; gc.offset = 0; - -#define INIT_CTX() \ - lg.logger.vmessage = log_vmessage; \ - lg.logger.destroy = log_destroy; \ - lg.logger.progress = NULL; \ - caml_enter_blocking_section(); \ - ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (struct xentoollog_logger *) &lg); \ - if (ret != 0) \ - failwith_xl("cannot init context", &lg); - -#define FREE_CTX() \ - gc_free(&gc); \ - caml_leave_blocking_section(); \ - libxl_ctx_free(ctx) - -static char * dup_String_val(caml_gc *gc, value s) +static char * dup_String_val(value s) { int len; char *c; @@ -83,24 +43,16 @@ static char * dup_String_val(caml_gc *gc, value s) c = calloc(len + 1, sizeof(char)); if (!c) caml_raise_out_of_memory(); - gc->ptrs[gc->offset++] = c; memcpy(c, String_val(s), len); return c; } -static void gc_free(caml_gc *gc) -{ - int i; - for (i = 0; i < gc->offset; i++) { - free(gc->ptrs[i]); - } -} - -static void failwith_xl(char *fname, struct caml_logger *lg) +static void failwith_xl(char *fname) { - char *s; - s = (lg) ? lg->log_buf : fname; - caml_raise_with_string(*caml_named_value("xl.error"), s); + value *exc = caml_named_value("Xenlight.Error"); + if (!exc) + caml_invalid_argument("Exception Xenlight.Error not initialized, please link xl.cma"); + caml_raise_with_string(*exc, fname); } void ctx_finalize(value ctx) @@ -126,7 +78,7 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); if (ret != 0) \ - failwith_xl("cannot init context", NULL); + failwith_xl("cannot init context"); handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); Ctx_val(handle) = ctx; @@ -134,16 +86,6 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) CAMLreturn(handle); } -static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size) -{ - void *ptr; - ptr = calloc(nmemb, size); - if (!ptr) - caml_raise_out_of_memory(); - gc->ptrs[gc->offset++] = ptr; - return ptr; -} - static int list_len(value v) { int len = 0; @@ -154,9 +96,8 @@ static int list_len(value v) return len; } -static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, - libxl_key_value_list *c_val, - value v) +static int libxl_key_value_list_val(libxl_key_value_list *c_val, + value v) { CAMLparam1(v); CAMLlocal1(elem); @@ -165,15 +106,15 @@ static int libxl_key_value_list_val(caml_gc *gc, struct caml_logger *lg, nr = list_len(v); - array = gc_calloc(gc, (nr + 1) * 2, sizeof(char *)); + array = calloc((nr + 1) * 2, sizeof(char *)); if (!array) caml_raise_out_of_memory(); for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) { elem = Field(v, 0); - array[i * 2] = dup_String_val(gc, Field(elem, 0)); - array[i * 2 + 1] = dup_String_val(gc, Field(elem, 1)); + array[i * 2] = dup_String_val(Field(elem, 0)); + array[i * 2 + 1] = dup_String_val(Field(elem, 1)); } *c_val = array; @@ -203,9 +144,7 @@ static value Val_key_value_list(libxl_key_value_list *c_val) CAMLreturn(list); } -static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, - libxl_string_list *c_val, - value v) +static int libxl_string_list_val(libxl_string_list *c_val, value v) { CAMLparam1(v); int nr, i; @@ -213,12 +152,12 @@ static int libxl_string_list_val(caml_gc *gc, struct caml_logger *lg, nr = list_len(v); - array = gc_calloc(gc, (nr + 1), sizeof(char *)); + array = calloc(nr + 1, sizeof(char *)); if (!array) caml_raise_out_of_memory(); for (i=0; v != Val_emptylist; i++, v = Field(v, 1) ) - array[i] = dup_String_val(gc, Field(v, 0)); + array[i] = dup_String_val(Field(v, 0)); *c_val = array; CAMLreturn(0); @@ -269,7 +208,7 @@ static value Val_mac (libxl_mac *c_val) CAMLreturn(v); } -static int Mac_val(caml_gc *gc, struct caml_logger *lg, libxl_mac *c_val, value v) +static int Mac_val(libxl_mac *c_val, value v) { CAMLparam1(v); int i; @@ -300,10 +239,21 @@ static value Val_bitmap (libxl_bitmap *c_val) CAMLreturn(v); } -static int Bitmap_val(caml_gc *gc, struct caml_logger *lg, - libxl_bitmap *c_val, value v) +static int Bitmap_val(libxl_ctx *ctx, libxl_bitmap *c_val, value v) { - abort(); /* XXX */ + CAMLparam1(v); + int i, len = Wosize_val(v); + + c_val->size = 0; + if (len > 0 && libxl_bitmap_alloc(ctx, c_val, len)) + failwith_xl("cannot allocate bitmap"); + for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBue-0003vA-1L; Tue, 12 Nov 2013 11:13:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuc-0003uf-W2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:39 +0000 Received: from [193.109.254.147:59013] by server-10.bemta-14.messagelabs.com id E2/EA-07477-26D02825; Tue, 12 Nov 2013 11:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384254816!2205134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29280 invoked from network); 12 Nov 2013 11:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBua-0000g0-HK for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBua-0008TD-G5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:36 +0000 Date: Tue, 12 Nov 2013 11:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: add Enumeration.value_namespace property X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a99d55edd4044a3c2f34067046f1a81c9415274b Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:46 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:27 2013 +0000 libxl: idl: add Enumeration.value_namespace property This allows setting the namespace for values of an Enumeration to be different from the namespace of the Enumeration itself. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/libxl/idl.py | 5 ++++- tools/libxl/idl.txt | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index f4908dd..e4dc79b 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -136,7 +136,7 @@ class EnumerationValue(object): self.valuename = str.upper(name) self.rawname = str.upper(enum.rawname) + "_" + self.valuename - self.name = str.upper(enum.namespace) + self.rawname + self.name = str.upper(enum.value_namespace) + self.rawname self.value = value class Enumeration(Type): @@ -144,6 +144,9 @@ class Enumeration(Type): kwargs.setdefault('dispose_fn', None) Type.__init__(self, typename, **kwargs) + self.value_namespace = kwargs.setdefault('value_namespace', + self.namespace) + self.values = [] for v in values: # (value, name) diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 019acbe..439aede 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -90,6 +90,13 @@ Complex type-Classes idl.Enumeration A class representing an enumeration (named integer values). + This class has one property besides the ones defined for the Type + class: + + Enumeration.value_namespace: (default: namespace) + + The namespace in which the values of the Enumeration (see below) reside. + This prefix is prepended to the name of the value. The values are available in the list Enumeration.values. Each element in the list is of type idl.EnumerationValue. -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:13:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBue-0003vA-1L; Tue, 12 Nov 2013 11:13:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuc-0003uf-W2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:39 +0000 Received: from [193.109.254.147:59013] by server-10.bemta-14.messagelabs.com id E2/EA-07477-26D02825; Tue, 12 Nov 2013 11:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384254816!2205134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29280 invoked from network); 12 Nov 2013 11:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBua-0000g0-HK for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBua-0008TD-G5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:36 +0000 Date: Tue, 12 Nov 2013 11:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: idl: add Enumeration.value_namespace property X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a99d55edd4044a3c2f34067046f1a81c9415274b Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:46 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:27 2013 +0000 libxl: idl: add Enumeration.value_namespace property This allows setting the namespace for values of an Enumeration to be different from the namespace of the Enumeration itself. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/libxl/idl.py | 5 ++++- tools/libxl/idl.txt | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxl/idl.py b/tools/libxl/idl.py index f4908dd..e4dc79b 100644 --- a/tools/libxl/idl.py +++ b/tools/libxl/idl.py @@ -136,7 +136,7 @@ class EnumerationValue(object): self.valuename = str.upper(name) self.rawname = str.upper(enum.rawname) + "_" + self.valuename - self.name = str.upper(enum.namespace) + self.rawname + self.name = str.upper(enum.value_namespace) + self.rawname self.value = value class Enumeration(Type): @@ -144,6 +144,9 @@ class Enumeration(Type): kwargs.setdefault('dispose_fn', None) Type.__init__(self, typename, **kwargs) + self.value_namespace = kwargs.setdefault('value_namespace', + self.namespace) + self.values = [] for v in values: # (value, name) diff --git a/tools/libxl/idl.txt b/tools/libxl/idl.txt index 019acbe..439aede 100644 --- a/tools/libxl/idl.txt +++ b/tools/libxl/idl.txt @@ -90,6 +90,13 @@ Complex type-Classes idl.Enumeration A class representing an enumeration (named integer values). + This class has one property besides the ones defined for the Type + class: + + Enumeration.value_namespace: (default: namespace) + + The namespace in which the values of the Enumeration (see below) reside. + This prefix is prepended to the name of the value. The values are available in the list Enumeration.values. Each element in the list is of type idl.EnumerationValue. -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:13:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBup-00040I-5O; Tue, 12 Nov 2013 11:13:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBun-0003xc-E3 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:49 +0000 Received: from [85.158.139.211:36348] by server-16.bemta-5.messagelabs.com id E7/D6-17144-C6D02825; Tue, 12 Nov 2013 11:13:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1384254826!1455298!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32079 invoked from network); 12 Nov 2013 11:13:47 -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 Nov 2013 11:13:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuk-0000gA-Lb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuk-0008TZ-KO for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:46 +0000 Date: Tue, 12 Nov 2013 11:13:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make the libxl error type an IDL enum X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc642731058765d8bdd5b3e2f5d945e1b9c2efb2 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:47 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:34 2013 +0000 libxl: make the libxl error type an IDL enum This makes it easier to use in language bindings. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/libxl/libxl.h | 18 ------------------ tools/libxl/libxl_types.idl | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1c6675d..9379694 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -459,24 +459,6 @@ typedef struct libxl__ctx libxl_ctx; const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); -enum { - ERROR_NONSPECIFIC = -1, - ERROR_VERSION = -2, - ERROR_FAIL = -3, - ERROR_NI = -4, - ERROR_NOMEM = -5, - ERROR_INVAL = -6, - ERROR_BADFAIL = -7, - ERROR_GUEST_TIMEDOUT = -8, - ERROR_TIMEDOUT = -9, - ERROR_NOPARAVIRT = -10, - ERROR_NOT_READY = -11, - ERROR_OSEVENT_REG_FAIL = -12, - ERROR_BUFFERFULL = -13, - ERROR_UNKNOWN_CHILD = -14, -}; - - /* * Some libxl operations can take a long time. These functions take a * parameter to control their concurrency: diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5c43d6f..c43c5b1 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -28,6 +28,23 @@ MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") # Constants / Enumerations # +libxl_error = Enumeration("error", [ + (-1, "NONSPECIFIC"), + (-2, "VERSION"), + (-3, "FAIL"), + (-4, "NI"), + (-5, "NOMEM"), + (-6, "INVAL"), + (-7, "BADFAIL"), + (-8, "GUEST_TIMEDOUT"), + (-9, "TIMEDOUT"), + (-10, "NOPARAVIRT"), + (-11, "NOT_READY"), + (-12, "OSEVENT_REG_FAIL"), + (-13, "BUFFERFULL"), + (-14, "UNKNOWN_CHILD"), + ], value_namespace = "") + libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:13:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:13: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 1VgBup-00040I-5O; Tue, 12 Nov 2013 11:13:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBun-0003xc-E3 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:49 +0000 Received: from [85.158.139.211:36348] by server-16.bemta-5.messagelabs.com id E7/D6-17144-C6D02825; Tue, 12 Nov 2013 11:13:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1384254826!1455298!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32079 invoked from network); 12 Nov 2013 11:13:47 -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 Nov 2013 11:13:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuk-0000gA-Lb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuk-0008TZ-KO for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:46 +0000 Date: Tue, 12 Nov 2013 11:13:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make the libxl error type an IDL enum X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc642731058765d8bdd5b3e2f5d945e1b9c2efb2 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:47 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:34 2013 +0000 libxl: make the libxl error type an IDL enum This makes it easier to use in language bindings. Signed-off-by: Rob Hoes Acked-by: Ian Campbell --- tools/libxl/libxl.h | 18 ------------------ tools/libxl/libxl_types.idl | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1c6675d..9379694 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -459,24 +459,6 @@ typedef struct libxl__ctx libxl_ctx; const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx); -enum { - ERROR_NONSPECIFIC = -1, - ERROR_VERSION = -2, - ERROR_FAIL = -3, - ERROR_NI = -4, - ERROR_NOMEM = -5, - ERROR_INVAL = -6, - ERROR_BADFAIL = -7, - ERROR_GUEST_TIMEDOUT = -8, - ERROR_TIMEDOUT = -9, - ERROR_NOPARAVIRT = -10, - ERROR_NOT_READY = -11, - ERROR_OSEVENT_REG_FAIL = -12, - ERROR_BUFFERFULL = -13, - ERROR_UNKNOWN_CHILD = -14, -}; - - /* * Some libxl operations can take a long time. These functions take a * parameter to control their concurrency: diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5c43d6f..c43c5b1 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -28,6 +28,23 @@ MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") # Constants / Enumerations # +libxl_error = Enumeration("error", [ + (-1, "NONSPECIFIC"), + (-2, "VERSION"), + (-3, "FAIL"), + (-4, "NI"), + (-5, "NOMEM"), + (-6, "INVAL"), + (-7, "BADFAIL"), + (-8, "GUEST_TIMEDOUT"), + (-9, "TIMEDOUT"), + (-10, "NOPARAVIRT"), + (-11, "NOT_READY"), + (-12, "OSEVENT_REG_FAIL"), + (-13, "BUFFERFULL"), + (-14, "UNKNOWN_CHILD"), + ], value_namespace = "") + libxl_domain_type = Enumeration("domain_type", [ (-1, "INVALID"), (1, "HVM"), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBuy-000429-9E; Tue, 12 Nov 2013 11:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBux-00041s-7A for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:59 +0000 Received: from [193.109.254.147:62590] by server-6.bemta-14.messagelabs.com id E0/1C-19621-67D02825; Tue, 12 Nov 2013 11:13:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1384254836!2218373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12990 invoked from network); 12 Nov 2013 11:13:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuu-0000gJ-QV for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuu-0008Ty-Ol for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:56 +0000 Date: Tue, 12 Nov 2013 11:13:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: generate string_of_* functions for enums X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40d0e13db68ecfa382144da10b281906af570e4f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:48 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:45 2013 +0000 libxl: ocaml: generate string_of_* functions for enums Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by:Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index bdae886..0f73e26 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -162,6 +162,14 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname + + if interface: + s += "\nval string_of_%s : %s -> string\n" % (ty.rawname, ty.rawname) + else: + s += "\nlet string_of_%s = function\n" % ty.rawname + for v in ty.values: + s += '\t| %s -> "%s"\n' % (v.rawname, v.valuename) + elif isinstance(ty, idl.Aggregate): s += "" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBuy-000429-9E; Tue, 12 Nov 2013 11:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBux-00041s-7A for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:59 +0000 Received: from [193.109.254.147:62590] by server-6.bemta-14.messagelabs.com id E0/1C-19621-67D02825; Tue, 12 Nov 2013 11:13:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1384254836!2218373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12990 invoked from network); 12 Nov 2013 11:13:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:13:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBuu-0000gJ-QV for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBuu-0008Ty-Ol for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:13:56 +0000 Date: Tue, 12 Nov 2013 11:13:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: generate string_of_* functions for enums X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40d0e13db68ecfa382144da10b281906af570e4f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:48 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:38:45 2013 +0000 libxl: ocaml: generate string_of_* functions for enums Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by:Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index bdae886..0f73e26 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -162,6 +162,14 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "type %s = \n" % ty.rawname for v in ty.values: s += "\t | %s\n" % v.rawname + + if interface: + s += "\nval string_of_%s : %s -> string\n" % (ty.rawname, ty.rawname) + else: + s += "\nlet string_of_%s = function\n" % ty.rawname + for v in ty.values: + s += '\t| %s -> "%s"\n' % (v.rawname, v.valuename) + elif isinstance(ty, idl.Aggregate): s += "" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBv9-000452-CA; Tue, 12 Nov 2013 11:14:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBv7-00044d-Qs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:10 +0000 Received: from [193.109.254.147:7680] by server-16.bemta-14.messagelabs.com id C6/79-03396-18D02825; Tue, 12 Nov 2013 11:14:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1384254847!1501906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17561 invoked from network); 12 Nov 2013 11:14:08 -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; 12 Nov 2013 11:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBv4-0000gv-UM for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBv4-0008UU-T6 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:06 +0000 Date: Tue, 12 Nov 2013 11:14:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: propagate the libxl return error code in exceptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38d5aaff4c495eae2d06999a6a18a07eaf719833 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:49 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:38 2013 +0000 libxl: ocaml: propagate the libxl return error code in exceptions Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 10 +++--- tools/ocaml/libs/xl/xenlight.ml.in | 10 +++++-- tools/ocaml/libs/xl/xenlight.mli.in | 9 +++++- tools/ocaml/libs/xl/xenlight_stubs.c | 50 ++++++++++++++++++++++++--------- 4 files changed, 55 insertions(+), 24 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 0f73e26..e072386 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -244,7 +244,7 @@ def c_val(ty, c, o, indent="", parent = None): for e in ty.values: s += " case %d: *%s = %s; break;\n" % (n, c, e.name) n += 1 - s += " default: failwith_xl(\"cannot convert value to %s\"); break;\n" % ty.typename + s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value to %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): s += "{\n" @@ -257,7 +257,7 @@ def c_val(ty, c, o, indent="", parent = None): parent + ty.keyvar.name, f.enumname) n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(ERROR_FAIL, \"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t} else {\n" s += "\t\t/* Is block... */\n" @@ -273,7 +273,7 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") s += "break;\n" n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(ERROR_FAIL, \"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t}\n" s += "}" @@ -342,7 +342,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 - s += " default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename + s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): n = 0 @@ -371,7 +371,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): m += 1 #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) s += "\t break;\n" - s += "\t default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename + s += "\t default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "\t}" elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index dffba72..a281425 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -13,18 +13,22 @@ * GNU Lesser General Public License for more details. *) -exception Error of string - type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) +exception Error of (error * string) + external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" +external test_raise_exception: unit -> unit = "stub_raise_exception" + external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" -let _ = Callback.register_exception "Xenlight.Error" (Error("")) +let register_exceptions () = + Callback.register_exception "Xenlight.Error" (Error(ERROR_FAIL, "")) + diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index e2686bb..d663196 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -13,16 +13,21 @@ * GNU Lesser General Public License for more details. *) -exception Error of string - type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) +exception Error of (error * string) + +val register_exceptions: unit -> unit + external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" +external test_raise_exception: unit -> unit = "stub_raise_exception" + external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" + diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index dd6c781..67612f4 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -47,12 +47,34 @@ static char * dup_String_val(value s) return c; } -static void failwith_xl(char *fname) +/* Forward reference: this is defined in the auto-generated include file below. */ +static value Val_error (libxl_error error_c); + +static void failwith_xl(int error, char *fname) { - value *exc = caml_named_value("Xenlight.Error"); + CAMLlocal1(arg); + static value *exc = NULL; + + /* First time around, lookup by name */ + if (!exc) + exc = caml_named_value("Xenlight.Error"); + if (!exc) - caml_invalid_argument("Exception Xenlight.Error not initialized, please link xl.cma"); - caml_raise_with_string(*exc, fname); + caml_invalid_argument("Exception Xenlight.Error not initialized, please link xenlight.cma"); + + arg = caml_alloc(2, 0); + + Store_field(arg, 0, Val_error(error)); + Store_field(arg, 1, caml_copy_string(fname)); + + caml_raise_with_arg(*exc, arg); +} + +CAMLprim value stub_raise_exception(value unit) +{ + CAMLparam1(unit); + failwith_xl(ERROR_FAIL, "test exception"); + CAMLreturn(Val_unit); } void ctx_finalize(value ctx) @@ -78,7 +100,7 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); if (ret != 0) \ - failwith_xl("cannot init context"); + failwith_xl(ERROR_FAIL, "cannot init context"); handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); Ctx_val(handle) = ctx; @@ -246,7 +268,7 @@ static int Bitmap_val(libxl_ctx *ctx, libxl_bitmap *c_val, value v) c_val->size = 0; if (len > 0 && libxl_bitmap_alloc(ctx, c_val, len)) - failwith_xl("cannot allocate bitmap"); + failwith_xl(ERROR_NOMEM, "cannot allocate bitmap"); for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBv9-000452-CA; Tue, 12 Nov 2013 11:14:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBv7-00044d-Qs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:10 +0000 Received: from [193.109.254.147:7680] by server-16.bemta-14.messagelabs.com id C6/79-03396-18D02825; Tue, 12 Nov 2013 11:14:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1384254847!1501906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17561 invoked from network); 12 Nov 2013 11:14:08 -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; 12 Nov 2013 11:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBv4-0000gv-UM for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBv4-0008UU-T6 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:06 +0000 Date: Tue, 12 Nov 2013 11:14:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: propagate the libxl return error code in exceptions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38d5aaff4c495eae2d06999a6a18a07eaf719833 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:49 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:38 2013 +0000 libxl: ocaml: propagate the libxl return error code in exceptions Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 10 +++--- tools/ocaml/libs/xl/xenlight.ml.in | 10 +++++-- tools/ocaml/libs/xl/xenlight.mli.in | 9 +++++- tools/ocaml/libs/xl/xenlight_stubs.c | 50 ++++++++++++++++++++++++--------- 4 files changed, 55 insertions(+), 24 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 0f73e26..e072386 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -244,7 +244,7 @@ def c_val(ty, c, o, indent="", parent = None): for e in ty.values: s += " case %d: *%s = %s; break;\n" % (n, c, e.name) n += 1 - s += " default: failwith_xl(\"cannot convert value to %s\"); break;\n" % ty.typename + s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value to %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): s += "{\n" @@ -257,7 +257,7 @@ def c_val(ty, c, o, indent="", parent = None): parent + ty.keyvar.name, f.enumname) n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(ERROR_FAIL, \"variant handling bug %s%s (long)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t} else {\n" s += "\t\t/* Is block... */\n" @@ -273,7 +273,7 @@ def c_val(ty, c, o, indent="", parent = None): s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") s += "break;\n" n += 1 - s += "\t\t default: failwith_xl(\"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) + s += "\t\t default: failwith_xl(ERROR_FAIL, \"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name) s += "\t\t}\n" s += "\t}\n" s += "}" @@ -342,7 +342,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): for e in ty.values: s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) n += 1 - s += " default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename + s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "}" elif isinstance(ty, idl.KeyedUnion): n = 0 @@ -371,7 +371,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): m += 1 #s += "\t %s = caml_alloc(%d,%d);\n" % (o,len(f.type.fields),n) s += "\t break;\n" - s += "\t default: failwith_xl(\"cannot convert value from %s\"); break;\n" % ty.typename + s += "\t default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "\t}" elif isinstance(ty,idl.Aggregate) and (parent is None or ty.rawname is None): s += "{\n" diff --git a/tools/ocaml/libs/xl/xenlight.ml.in b/tools/ocaml/libs/xl/xenlight.ml.in index dffba72..a281425 100644 --- a/tools/ocaml/libs/xl/xenlight.ml.in +++ b/tools/ocaml/libs/xl/xenlight.ml.in @@ -13,18 +13,22 @@ * GNU Lesser General Public License for more details. *) -exception Error of string - type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) +exception Error of (error * string) + external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" +external test_raise_exception: unit -> unit = "stub_raise_exception" + external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" -let _ = Callback.register_exception "Xenlight.Error" (Error("")) +let register_exceptions () = + Callback.register_exception "Xenlight.Error" (Error(ERROR_FAIL, "")) + diff --git a/tools/ocaml/libs/xl/xenlight.mli.in b/tools/ocaml/libs/xl/xenlight.mli.in index e2686bb..d663196 100644 --- a/tools/ocaml/libs/xl/xenlight.mli.in +++ b/tools/ocaml/libs/xl/xenlight.mli.in @@ -13,16 +13,21 @@ * GNU Lesser General Public License for more details. *) -exception Error of string - type ctx type domid = int type devid = int (* @@LIBXL_TYPES@@ *) +exception Error of (error * string) + +val register_exceptions: unit -> unit + external ctx_alloc: Xentoollog.handle -> ctx = "stub_libxl_ctx_alloc" +external test_raise_exception: unit -> unit = "stub_raise_exception" + external send_trigger : ctx -> domid -> trigger -> int -> unit = "stub_xl_send_trigger" external send_sysrq : ctx -> domid -> char -> unit = "stub_xl_send_sysrq" external send_debug_keys : ctx -> string -> unit = "stub_xl_send_debug_keys" + diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index dd6c781..67612f4 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -47,12 +47,34 @@ static char * dup_String_val(value s) return c; } -static void failwith_xl(char *fname) +/* Forward reference: this is defined in the auto-generated include file below. */ +static value Val_error (libxl_error error_c); + +static void failwith_xl(int error, char *fname) { - value *exc = caml_named_value("Xenlight.Error"); + CAMLlocal1(arg); + static value *exc = NULL; + + /* First time around, lookup by name */ + if (!exc) + exc = caml_named_value("Xenlight.Error"); + if (!exc) - caml_invalid_argument("Exception Xenlight.Error not initialized, please link xl.cma"); - caml_raise_with_string(*exc, fname); + caml_invalid_argument("Exception Xenlight.Error not initialized, please link xenlight.cma"); + + arg = caml_alloc(2, 0); + + Store_field(arg, 0, Val_error(error)); + Store_field(arg, 1, caml_copy_string(fname)); + + caml_raise_with_arg(*exc, arg); +} + +CAMLprim value stub_raise_exception(value unit) +{ + CAMLparam1(unit); + failwith_xl(ERROR_FAIL, "test exception"); + CAMLreturn(Val_unit); } void ctx_finalize(value ctx) @@ -78,7 +100,7 @@ CAMLprim value stub_libxl_ctx_alloc(value logger) ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger *) Xtl_val(logger)); if (ret != 0) \ - failwith_xl("cannot init context"); + failwith_xl(ERROR_FAIL, "cannot init context"); handle = caml_alloc_custom(&libxl_ctx_custom_operations, sizeof(ctx), 0, 1); Ctx_val(handle) = ctx; @@ -246,7 +268,7 @@ static int Bitmap_val(libxl_ctx *ctx, libxl_bitmap *c_val, value v) c_val->size = 0; if (len > 0 && libxl_bitmap_alloc(ctx, c_val, len)) - failwith_xl("cannot allocate bitmap"); + failwith_xl(ERROR_NOMEM, "cannot allocate bitmap"); for (i=0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvJ-0004H2-FF; Tue, 12 Nov 2013 11:14:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvH-0004GM-RR for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:20 +0000 Received: from [193.109.254.147:64734] by server-4.bemta-14.messagelabs.com id 99/92-22292-B8D02825; Tue, 12 Nov 2013 11:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1384254857!2214457!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6736 invoked from network); 12 Nov 2013 11:14:18 -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; 12 Nov 2013 11:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvF-0000gy-3O for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvF-0008Vk-0g for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:17 +0000 Date: Tue, 12 Nov 2013 11:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: make Val_defbool GC-proof X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe14c97ae87581269d0391dcc2d0bb94d73c6f6e Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: make Val_defbool GC-proof In order to avoid newly created OCaml values from being GC'ed, they must be registered as roots with the GC, before an iteration of the GC may happen. The Val_* functions potentially allocate new values on the OCaml heap, and may trigger an iteration of the OCaml GC. The way to register a value with the GC is to assign it to a variable declared with a CAMLparam or CAMLlocal macro, which put the value into a struct that can be reached from a GC root. This leads to slightly weird looking C code, but avoids hard to find segfaults. Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 67612f4..94601c4 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -308,15 +308,17 @@ static int Uuid_val(libxl_uuid *c_val, value v) static value Val_defbool(libxl_defbool c_val) { CAMLparam0(); - CAMLlocal1(v); + CAMLlocal2(v1, v2); + bool b; if (libxl_defbool_is_default(c_val)) - v = Val_none; + v2 = Val_none; else { - bool b = libxl_defbool_val(c_val); - v = Val_some(b ? Val_bool(true) : Val_bool(false)); + b = libxl_defbool_val(c_val); + v1 = b ? Val_bool(true) : Val_bool(false); + v2 = Val_some(v1); } - CAMLreturn(v); + CAMLreturn(v2); } static libxl_defbool Defbool_val(value v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvJ-0004H2-FF; Tue, 12 Nov 2013 11:14:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvH-0004GM-RR for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:20 +0000 Received: from [193.109.254.147:64734] by server-4.bemta-14.messagelabs.com id 99/92-22292-B8D02825; Tue, 12 Nov 2013 11:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1384254857!2214457!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6736 invoked from network); 12 Nov 2013 11:14:18 -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; 12 Nov 2013 11:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvF-0000gy-3O for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvF-0008Vk-0g for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:17 +0000 Date: Tue, 12 Nov 2013 11:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: make Val_defbool GC-proof X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe14c97ae87581269d0391dcc2d0bb94d73c6f6e Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: make Val_defbool GC-proof In order to avoid newly created OCaml values from being GC'ed, they must be registered as roots with the GC, before an iteration of the GC may happen. The Val_* functions potentially allocate new values on the OCaml heap, and may trigger an iteration of the OCaml GC. The way to register a value with the GC is to assign it to a variable declared with a CAMLparam or CAMLlocal macro, which put the value into a struct that can be reached from a GC root. This leads to slightly weird looking C code, but avoids hard to find segfaults. Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 67612f4..94601c4 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -308,15 +308,17 @@ static int Uuid_val(libxl_uuid *c_val, value v) static value Val_defbool(libxl_defbool c_val) { CAMLparam0(); - CAMLlocal1(v); + CAMLlocal2(v1, v2); + bool b; if (libxl_defbool_is_default(c_val)) - v = Val_none; + v2 = Val_none; else { - bool b = libxl_defbool_val(c_val); - v = Val_some(b ? Val_bool(true) : Val_bool(false)); + b = libxl_defbool_val(c_val); + v1 = b ? Val_bool(true) : Val_bool(false); + v2 = Val_some(v1); } - CAMLreturn(v); + CAMLreturn(v2); } static libxl_defbool Defbool_val(value v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvT-0004Is-JU; Tue, 12 Nov 2013 11:14:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvR-0004IY-It for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:29 +0000 Received: from [85.158.143.35:2431] by server-2.bemta-4.messagelabs.com id 1C/EA-11386-49D02825; Tue, 12 Nov 2013 11:14:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1384254867!2594882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27303 invoked from network); 12 Nov 2013 11:14:28 -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; 12 Nov 2013 11:14:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvP-0000h7-8W for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvP-0008W7-63 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:27 +0000 Date: Tue, 12 Nov 2013 11:14:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add domain_build/create_info/config and events to the bindings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd5897bdda84388e1b859847b2263709bb254860 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:51 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add domain_build/create_info/config and events to the bindings. We now have enough infrastructure in place to do this trivially. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/libxl/libxl_types.idl | 2 +- tools/ocaml/libs/xl/genwrap.py | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index c43c5b1..ce003c6 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -464,7 +464,7 @@ libxl_domain_config = Struct("domain_config", [ ("on_reboot", libxl_action_on_shutdown), ("on_watchdog", libxl_action_on_shutdown), ("on_crash", libxl_action_on_shutdown), - ]) + ], dir=DIR_IN) libxl_diskinfo = Struct("diskinfo", [ ("backend", string), diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index e072386..4206c87 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -441,11 +441,7 @@ if __name__ == '__main__': # Do not generate these yet. blacklist = [ "cpupoolinfo", - "domain_create_info", - "domain_build_info", - "domain_config", "vcpuinfo", - "event", ] for t in blacklist: -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:14:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvT-0004Is-JU; Tue, 12 Nov 2013 11:14:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvR-0004IY-It for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:29 +0000 Received: from [85.158.143.35:2431] by server-2.bemta-4.messagelabs.com id 1C/EA-11386-49D02825; Tue, 12 Nov 2013 11:14:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1384254867!2594882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27303 invoked from network); 12 Nov 2013 11:14:28 -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; 12 Nov 2013 11:14:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvP-0000h7-8W for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvP-0008W7-63 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:27 +0000 Date: Tue, 12 Nov 2013 11:14:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add domain_build/create_info/config and events to the bindings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd5897bdda84388e1b859847b2263709bb254860 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:51 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add domain_build/create_info/config and events to the bindings. We now have enough infrastructure in place to do this trivially. Signed-off-by: Ian Campbell Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/libxl/libxl_types.idl | 2 +- tools/ocaml/libs/xl/genwrap.py | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index c43c5b1..ce003c6 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -464,7 +464,7 @@ libxl_domain_config = Struct("domain_config", [ ("on_reboot", libxl_action_on_shutdown), ("on_watchdog", libxl_action_on_shutdown), ("on_crash", libxl_action_on_shutdown), - ]) + ], dir=DIR_IN) libxl_diskinfo = Struct("diskinfo", [ ("backend", string), diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index e072386..4206c87 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -441,11 +441,7 @@ if __name__ == '__main__': # Do not generate these yet. blacklist = [ "cpupoolinfo", - "domain_create_info", - "domain_build_info", - "domain_config", "vcpuinfo", - "event", ] for t in blacklist: -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:14:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvd-0004L6-O1; Tue, 12 Nov 2013 11:14:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvb-0004Kh-Ns for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:39 +0000 Received: from [193.109.254.147:14912] by server-5.bemta-14.messagelabs.com id AA/24-13525-F9D02825; Tue, 12 Nov 2013 11:14:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384254877!2216879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25557 invoked from network); 12 Nov 2013 11:14:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:14:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvZ-0000hC-Cp for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvZ-00004u-B6 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:37 +0000 Date: Tue, 12 Nov 2013 11:14:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: fix the handling of enums in the bindings generator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 127229b9c02419cc3cbdfd1a100a62cce8cc734f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:52 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: fix the handling of enums in the bindings generator Signed-off-by: Rob Hoes Acked-by: Ian Campbell Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 4206c87..5a3fd8d 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -340,7 +340,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n = 0 s += "switch(%s) {\n" % c for e in ty.values: - s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) + s += " case %s: %s = Val_int(%d); break;\n" % (e.name, o, n) n += 1 s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvd-0004L6-O1; Tue, 12 Nov 2013 11:14:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvb-0004Kh-Ns for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:39 +0000 Received: from [193.109.254.147:14912] by server-5.bemta-14.messagelabs.com id AA/24-13525-F9D02825; Tue, 12 Nov 2013 11:14:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384254877!2216879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25557 invoked from network); 12 Nov 2013 11:14:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:14:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvZ-0000hC-Cp for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvZ-00004u-B6 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:37 +0000 Date: Tue, 12 Nov 2013 11:14:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: fix the handling of enums in the bindings generator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 127229b9c02419cc3cbdfd1a100a62cce8cc734f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:52 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: fix the handling of enums in the bindings generator Signed-off-by: Rob Hoes Acked-by: Ian Campbell Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 4206c87..5a3fd8d 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -340,7 +340,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): n = 0 s += "switch(%s) {\n" % c for e in ty.values: - s += " case %s: %s = Int_val(%d); break;\n" % (e.name, o, n) + s += " case %s: %s = Val_int(%d); break;\n" % (e.name, o, n) n += 1 s += " default: failwith_xl(ERROR_FAIL, \"cannot convert value from %s\"); break;\n" % ty.typename s += "}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvo-0004NW-Qm; Tue, 12 Nov 2013 11:14:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvm-0004N4-UB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:51 +0000 Received: from [85.158.137.68:13964] by server-5.bemta-3.messagelabs.com id 93/F9-25946-AAD02825; Tue, 12 Nov 2013 11:14:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384254887!981885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1574 invoked from network); 12 Nov 2013 11:14:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvj-0000hL-HZ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvj-00005G-FT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:47 +0000 Date: Tue, 12 Nov 2013 11:14:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: use the "string option" type for IDL 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 31a6fc78ab4b90a2d8510ab28a9bde5b77bc685f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:53 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: use the "string option" type for IDL strings The libxl IDL is based on C type "char *", and therefore "strings" can by NULL, or be an actual string. In ocaml, it is common to encode such things as option types. Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 2 +- tools/ocaml/libs/xl/xenlight_stubs.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5a3fd8d..3d939d6 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -8,7 +8,7 @@ import idl builtins = { "bool": ("bool", "%(c)s = Bool_val(%(o)s)", "Val_bool(%(c)s)" ), "int": ("int", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), - "char *": ("string", "%(c)s = dup_String_val(%(o)s)", "caml_copy_string(%(c)s)"), + "char *": ("string option", "%(c)s = String_option_val(%(o)s)", "Val_string_option(%(c)s)"), "libxl_domid": ("domid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 94601c4..372ce8f 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -347,6 +347,27 @@ static value Val_hwcap(libxl_hwcap *c_val) CAMLreturn(hwcap); } +static value Val_string_option(const char *c_val) +{ + CAMLparam0(); + CAMLlocal2(tmp1, tmp2); + if (c_val) { + tmp1 = caml_copy_string(c_val); + tmp2 = Val_some(tmp1); + CAMLreturn(tmp2); + } + else + CAMLreturn(Val_none); +} + +static char *String_option_val(value v) +{ + char *s = NULL; + if (v != Val_none) + s = dup_String_val(Some_val(v)); + return s; +} + #include "_libxl_types.inc" #define _STRINGIFY(x) #x -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:14:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:14: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 1VgBvo-0004NW-Qm; Tue, 12 Nov 2013 11:14:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvm-0004N4-UB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:51 +0000 Received: from [85.158.137.68:13964] by server-5.bemta-3.messagelabs.com id 93/F9-25946-AAD02825; Tue, 12 Nov 2013 11:14:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384254887!981885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1574 invoked from network); 12 Nov 2013 11:14:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvj-0000hL-HZ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvj-00005G-FT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:47 +0000 Date: Tue, 12 Nov 2013 11:14:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: use the "string option" type for IDL 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 31a6fc78ab4b90a2d8510ab28a9bde5b77bc685f Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:53 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: use the "string option" type for IDL strings The libxl IDL is based on C type "char *", and therefore "strings" can by NULL, or be an actual string. In ocaml, it is common to encode such things as option types. Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 2 +- tools/ocaml/libs/xl/xenlight_stubs.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 5a3fd8d..3d939d6 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -8,7 +8,7 @@ import idl builtins = { "bool": ("bool", "%(c)s = Bool_val(%(o)s)", "Val_bool(%(c)s)" ), "int": ("int", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), - "char *": ("string", "%(c)s = dup_String_val(%(o)s)", "caml_copy_string(%(c)s)"), + "char *": ("string option", "%(c)s = String_option_val(%(o)s)", "Val_string_option(%(c)s)"), "libxl_domid": ("domid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_devid": ("devid", "%(c)s = Int_val(%(o)s)", "Val_int(%(c)s)" ), "libxl_defbool": ("bool option", "%(c)s = Defbool_val(%(o)s)", "Val_defbool(%(c)s)" ), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 94601c4..372ce8f 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -347,6 +347,27 @@ static value Val_hwcap(libxl_hwcap *c_val) CAMLreturn(hwcap); } +static value Val_string_option(const char *c_val) +{ + CAMLparam0(); + CAMLlocal2(tmp1, tmp2); + if (c_val) { + tmp1 = caml_copy_string(c_val); + tmp2 = Val_some(tmp1); + CAMLreturn(tmp2); + } + else + CAMLreturn(Val_none); +} + +static char *String_option_val(value v) +{ + char *s = NULL; + if (v != Val_none) + s = dup_String_val(Some_val(v)); + return s; +} + #include "_libxl_types.inc" #define _STRINGIFY(x) #x -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:15:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBvz-0004QF-US; Tue, 12 Nov 2013 11:15:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvx-0004Pa-Ij for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:01 +0000 Received: from [85.158.139.211:47015] by server-12.bemta-5.messagelabs.com id FC/70-15833-4BD02825; Tue, 12 Nov 2013 11:15:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1384254898!1459691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28680 invoked from network); 12 Nov 2013 11:14:59 -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 Nov 2013 11:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvu-0000hU-LN for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvt-00005h-KU for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:58 +0000 Date: Tue, 12 Nov 2013 11:14:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add dominfo_list and dominfo_get X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5711ae6181cfb74c6e8da8541653d9c751e68b13 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:54 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add dominfo_list and dominfo_get Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 3 ++ tools/ocaml/libs/xl/xenlight_stubs.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 3d939d6..7a22b20 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -33,6 +33,9 @@ functions = { # ( name , [type1,type2,....] ) "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": DEVICE_FUNCTIONS, + "dominfo": [ ("list", ["ctx", "t list"]), + ("get", ["ctx", "domid", "t"]), + ], "physinfo": [ ("get", ["ctx", "t"]), ], "cputopology": [ ("get", ["ctx", "t array"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 372ce8f..a6b4294 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -450,6 +450,47 @@ value stub_xl_cputopology_get(value ctx) CAMLreturn(topology); } +value stub_xl_dominfo_list(value ctx) +{ + CAMLparam1(ctx); + CAMLlocal2(domlist, temp); + libxl_dominfo *c_domlist; + int i, nb; + + c_domlist = libxl_list_domain(CTX, &nb); + if (!c_domlist) + failwith_xl(ERROR_FAIL, "dominfo_list"); + + domlist = temp = Val_emptylist; + for (i = nb - 1; i >= 0; i--) { + domlist = caml_alloc_small(2, Tag_cons); + Field(domlist, 0) = Val_int(0); + Field(domlist, 1) = temp; + temp = domlist; + + Store_field(domlist, 0, Val_dominfo(&c_domlist[i])); + } + + libxl_dominfo_list_free(c_domlist, nb); + + CAMLreturn(domlist); +} + +value stub_xl_dominfo_get(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal1(dominfo); + libxl_dominfo c_dominfo; + int ret; + + ret = libxl_domain_info(CTX, &c_dominfo, Int_val(domid)); + if (ret != 0) + failwith_xl(ERROR_FAIL, "domain_info"); + dominfo = Val_dominfo(&c_dominfo); + + CAMLreturn(dominfo); +} + value stub_xl_domain_sched_params_get(value ctx, value domid) { CAMLparam2(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 Nov 12 11:15:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBvz-0004QF-US; Tue, 12 Nov 2013 11:15:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvx-0004Pa-Ij for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:01 +0000 Received: from [85.158.139.211:47015] by server-12.bemta-5.messagelabs.com id FC/70-15833-4BD02825; Tue, 12 Nov 2013 11:15:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1384254898!1459691!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28680 invoked from network); 12 Nov 2013 11:14:59 -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 Nov 2013 11:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBvu-0000hU-LN for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBvt-00005h-KU for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:14:58 +0000 Date: Tue, 12 Nov 2013 11:14:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add dominfo_list and dominfo_get X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5711ae6181cfb74c6e8da8541653d9c751e68b13 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:54 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add dominfo_list and dominfo_get Signed-off-by: Rob Hoes Acked-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/libs/xl/genwrap.py | 3 ++ tools/ocaml/libs/xl/xenlight_stubs.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 3d939d6..7a22b20 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -33,6 +33,9 @@ functions = { # ( name , [type1,type2,....] ) "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": DEVICE_FUNCTIONS, + "dominfo": [ ("list", ["ctx", "t list"]), + ("get", ["ctx", "domid", "t"]), + ], "physinfo": [ ("get", ["ctx", "t"]), ], "cputopology": [ ("get", ["ctx", "t array"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 372ce8f..a6b4294 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -450,6 +450,47 @@ value stub_xl_cputopology_get(value ctx) CAMLreturn(topology); } +value stub_xl_dominfo_list(value ctx) +{ + CAMLparam1(ctx); + CAMLlocal2(domlist, temp); + libxl_dominfo *c_domlist; + int i, nb; + + c_domlist = libxl_list_domain(CTX, &nb); + if (!c_domlist) + failwith_xl(ERROR_FAIL, "dominfo_list"); + + domlist = temp = Val_emptylist; + for (i = nb - 1; i >= 0; i--) { + domlist = caml_alloc_small(2, Tag_cons); + Field(domlist, 0) = Val_int(0); + Field(domlist, 1) = temp; + temp = domlist; + + Store_field(domlist, 0, Val_dominfo(&c_domlist[i])); + } + + libxl_dominfo_list_free(c_domlist, nb); + + CAMLreturn(domlist); +} + +value stub_xl_dominfo_get(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal1(dominfo); + libxl_dominfo c_dominfo; + int ret; + + ret = libxl_domain_info(CTX, &c_dominfo, Int_val(domid)); + if (ret != 0) + failwith_xl(ERROR_FAIL, "domain_info"); + dominfo = Val_dominfo(&c_dominfo); + + CAMLreturn(dominfo); +} + value stub_xl_domain_sched_params_get(value ctx, value domid) { CAMLparam2(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 Nov 12 11:15:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBw9-0004S8-1S; Tue, 12 Nov 2013 11:15:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBw7-0004Rv-SJ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:12 +0000 Received: from [85.158.139.211:5276] by server-2.bemta-5.messagelabs.com id BF/75-14533-FBD02825; Tue, 12 Nov 2013 11:15:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384254909!1471972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22242 invoked from network); 12 Nov 2013 11:15:10 -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; 12 Nov 2013 11:15:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBw4-0000iZ-Qb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBw4-00006L-Ok for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:08 +0000 Date: Tue, 12 Nov 2013 11:15:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add NIC helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652376e583c14dc6edb1c6309e8caa0570a6be90 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:58 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add NIC helper functions Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 5 +++- tools/ocaml/libs/xl/xenlight_stubs.c | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 7a22b20..3d4a866 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -31,7 +31,10 @@ functions = { # ( name , [type1,type2,....] ) "device_vfb": DEVICE_FUNCTIONS, "device_vkb": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS, - "device_nic": DEVICE_FUNCTIONS, + "device_nic": DEVICE_FUNCTIONS + + [ ("list", ["ctx", "domid", "t list"]), + ("of_devid", ["ctx", "domid", "int", "t"]), + ], "device_pci": DEVICE_FUNCTIONS, "dominfo": [ ("list", ["ctx", "t list"]), ("get", ["ctx", "domid", "t"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index a6b4294..3f41935 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -403,6 +403,45 @@ DEVICE_ADDREMOVE(vfb) DEVICE_ADDREMOVE(vkb) DEVICE_ADDREMOVE(pci) +value stub_xl_device_nic_of_devid(value ctx, value domid, value devid) +{ + CAMLparam3(ctx, domid, devid); + CAMLlocal1(nic); + libxl_device_nic c_nic; + libxl_devid_to_device_nic(CTX, Int_val(domid), Int_val(devid), &c_nic); + nic = Val_device_nic(&c_nic); + libxl_device_nic_dispose(&c_nic); + CAMLreturn(nic); +} + +value stub_xl_device_nic_list(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal2(list, temp); + libxl_device_nic *c_list; + int i, nb; + uint32_t c_domid; + + c_domid = Int_val(domid); + + c_list = libxl_device_nic_list(CTX, c_domid, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "nic_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_nic(&c_list[i])); + libxl_device_nic_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + value stub_xl_physinfo_get(value ctx) { CAMLparam1(ctx); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBw9-0004S8-1S; Tue, 12 Nov 2013 11:15:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBw7-0004Rv-SJ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:12 +0000 Received: from [85.158.139.211:5276] by server-2.bemta-5.messagelabs.com id BF/75-14533-FBD02825; Tue, 12 Nov 2013 11:15:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384254909!1471972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22242 invoked from network); 12 Nov 2013 11:15:10 -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; 12 Nov 2013 11:15:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBw4-0000iZ-Qb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBw4-00006L-Ok for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:08 +0000 Date: Tue, 12 Nov 2013 11:15:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add NIC helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 652376e583c14dc6edb1c6309e8caa0570a6be90 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:58 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:39 2013 +0000 libxl: ocaml: add NIC helper functions Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 5 +++- tools/ocaml/libs/xl/xenlight_stubs.c | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 7a22b20..3d4a866 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -31,7 +31,10 @@ functions = { # ( name , [type1,type2,....] ) "device_vfb": DEVICE_FUNCTIONS, "device_vkb": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS, - "device_nic": DEVICE_FUNCTIONS, + "device_nic": DEVICE_FUNCTIONS + + [ ("list", ["ctx", "domid", "t list"]), + ("of_devid", ["ctx", "domid", "int", "t"]), + ], "device_pci": DEVICE_FUNCTIONS, "dominfo": [ ("list", ["ctx", "t list"]), ("get", ["ctx", "domid", "t"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index a6b4294..3f41935 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -403,6 +403,45 @@ DEVICE_ADDREMOVE(vfb) DEVICE_ADDREMOVE(vkb) DEVICE_ADDREMOVE(pci) +value stub_xl_device_nic_of_devid(value ctx, value domid, value devid) +{ + CAMLparam3(ctx, domid, devid); + CAMLlocal1(nic); + libxl_device_nic c_nic; + libxl_devid_to_device_nic(CTX, Int_val(domid), Int_val(devid), &c_nic); + nic = Val_device_nic(&c_nic); + libxl_device_nic_dispose(&c_nic); + CAMLreturn(nic); +} + +value stub_xl_device_nic_list(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal2(list, temp); + libxl_device_nic *c_list; + int i, nb; + uint32_t c_domid; + + c_domid = Int_val(domid); + + c_list = libxl_device_nic_list(CTX, c_domid, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "nic_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_nic(&c_list[i])); + libxl_device_nic_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + value stub_xl_physinfo_get(value ctx) { CAMLparam1(ctx); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwJ-0004UF-4G; Tue, 12 Nov 2013 11:15:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwI-0004U1-5I for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:22 +0000 Received: from [85.158.137.68:51457] by server-3.bemta-3.messagelabs.com id 9D/B7-03862-9CD02825; Tue, 12 Nov 2013 11:15:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384254919!986772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2211 invoked from network); 12 Nov 2013 11:15:20 -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 Nov 2013 11:15:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwE-0000if-Vy for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwE-00007I-Tu for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:18 +0000 Date: Tue, 12 Nov 2013 11:15:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add PCI device helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc5c2d5971299f23d88a0a68813ab3e8d7bece45 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:59 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: add PCI device helper functions Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 7 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 3d4a866..edadd14 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -35,7 +35,12 @@ functions = { # ( name , [type1,type2,....] ) [ ("list", ["ctx", "domid", "t list"]), ("of_devid", ["ctx", "domid", "int", "t"]), ], - "device_pci": DEVICE_FUNCTIONS, + "device_pci": DEVICE_FUNCTIONS + + [ ("list", ["ctx", "domid", "t list"]), + ("assignable_add", ["ctx", "t", "bool", "unit"]), + ("assignable_remove", ["ctx", "t", "bool", "unit"]), + ("assignable_list", ["ctx", "t list"]), + ], "dominfo": [ ("list", ["ctx", "t list"]), ("get", ["ctx", "domid", "t"]), ], diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 3f41935..be8a3e8 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -442,6 +442,96 @@ value stub_xl_device_nic_list(value ctx, value domid) CAMLreturn(list); } +value stub_xl_device_pci_list(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal2(list, temp); + libxl_device_pci *c_list; + int i, nb; + uint32_t c_domid; + + c_domid = Int_val(domid); + + c_list = libxl_device_pci_list(CTX, c_domid, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "pci_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_pci(&c_list[i])); + libxl_device_pci_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + +value stub_xl_device_pci_assignable_add(value ctx, value info, value rebind) +{ + CAMLparam3(ctx, info, rebind); + libxl_device_pci c_info; + int ret, marker_var; + + device_pci_val(CTX, &c_info, info); + + ret = libxl_device_pci_assignable_add(CTX, &c_info, (int) Bool_val(rebind)); + + libxl_device_pci_dispose(&c_info); + + if (ret != 0) + failwith_xl(ret, "pci_assignable_add"); + + CAMLreturn(Val_unit); +} + +value stub_xl_device_pci_assignable_remove(value ctx, value info, value rebind) +{ + CAMLparam3(ctx, info, rebind); + libxl_device_pci c_info; + int ret, marker_var; + + device_pci_val(CTX, &c_info, info); + + ret = libxl_device_pci_assignable_remove(CTX, &c_info, (int) Bool_val(rebind)); + + libxl_device_pci_dispose(&c_info); + + if (ret != 0) + failwith_xl(ret, "pci_assignable_remove"); + + CAMLreturn(Val_unit); +} + +value stub_xl_device_pci_assignable_list(value ctx) +{ + CAMLparam1(ctx); + CAMLlocal2(list, temp); + libxl_device_pci *c_list; + int i, nb; + uint32_t c_domid; + + c_list = libxl_device_pci_assignable_list(CTX, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "pci_assignable_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_pci(&c_list[i])); + libxl_device_pci_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + value stub_xl_physinfo_get(value ctx) { CAMLparam1(ctx); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwJ-0004UF-4G; Tue, 12 Nov 2013 11:15:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwI-0004U1-5I for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:22 +0000 Received: from [85.158.137.68:51457] by server-3.bemta-3.messagelabs.com id 9D/B7-03862-9CD02825; Tue, 12 Nov 2013 11:15:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384254919!986772!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2211 invoked from network); 12 Nov 2013 11:15:20 -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 Nov 2013 11:15:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwE-0000if-Vy for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwE-00007I-Tu for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:18 +0000 Date: Tue, 12 Nov 2013 11:15:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: add PCI device helper functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc5c2d5971299f23d88a0a68813ab3e8d7bece45 Author: Rob Hoes AuthorDate: Wed Nov 6 17:49:59 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: add PCI device helper functions Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 7 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 3d4a866..edadd14 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -35,7 +35,12 @@ functions = { # ( name , [type1,type2,....] ) [ ("list", ["ctx", "domid", "t list"]), ("of_devid", ["ctx", "domid", "int", "t"]), ], - "device_pci": DEVICE_FUNCTIONS, + "device_pci": DEVICE_FUNCTIONS + + [ ("list", ["ctx", "domid", "t list"]), + ("assignable_add", ["ctx", "t", "bool", "unit"]), + ("assignable_remove", ["ctx", "t", "bool", "unit"]), + ("assignable_list", ["ctx", "t list"]), + ], "dominfo": [ ("list", ["ctx", "t list"]), ("get", ["ctx", "domid", "t"]), ], diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 3f41935..be8a3e8 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -442,6 +442,96 @@ value stub_xl_device_nic_list(value ctx, value domid) CAMLreturn(list); } +value stub_xl_device_pci_list(value ctx, value domid) +{ + CAMLparam2(ctx, domid); + CAMLlocal2(list, temp); + libxl_device_pci *c_list; + int i, nb; + uint32_t c_domid; + + c_domid = Int_val(domid); + + c_list = libxl_device_pci_list(CTX, c_domid, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "pci_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_pci(&c_list[i])); + libxl_device_pci_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + +value stub_xl_device_pci_assignable_add(value ctx, value info, value rebind) +{ + CAMLparam3(ctx, info, rebind); + libxl_device_pci c_info; + int ret, marker_var; + + device_pci_val(CTX, &c_info, info); + + ret = libxl_device_pci_assignable_add(CTX, &c_info, (int) Bool_val(rebind)); + + libxl_device_pci_dispose(&c_info); + + if (ret != 0) + failwith_xl(ret, "pci_assignable_add"); + + CAMLreturn(Val_unit); +} + +value stub_xl_device_pci_assignable_remove(value ctx, value info, value rebind) +{ + CAMLparam3(ctx, info, rebind); + libxl_device_pci c_info; + int ret, marker_var; + + device_pci_val(CTX, &c_info, info); + + ret = libxl_device_pci_assignable_remove(CTX, &c_info, (int) Bool_val(rebind)); + + libxl_device_pci_dispose(&c_info); + + if (ret != 0) + failwith_xl(ret, "pci_assignable_remove"); + + CAMLreturn(Val_unit); +} + +value stub_xl_device_pci_assignable_list(value ctx) +{ + CAMLparam1(ctx); + CAMLlocal2(list, temp); + libxl_device_pci *c_list; + int i, nb; + uint32_t c_domid; + + c_list = libxl_device_pci_assignable_list(CTX, &nb); + if (!c_list) + failwith_xl(ERROR_FAIL, "pci_assignable_list"); + + list = temp = Val_emptylist; + for (i = 0; i < nb; i++) { + list = caml_alloc_small(2, Tag_cons); + Field(list, 0) = Val_int(0); + Field(list, 1) = temp; + temp = list; + Store_field(list, 0, Val_device_pci(&c_list[i])); + libxl_device_pci_dispose(&c_list[i]); + } + free(c_list); + + CAMLreturn(list); +} + value stub_xl_physinfo_get(value ctx) { CAMLparam1(ctx); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwT-0004WL-7A; Tue, 12 Nov 2013 11:15:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwS-0004W4-9n for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:32 +0000 Received: from [85.158.137.68:22544] by server-4.bemta-3.messagelabs.com id 85/10-08123-3DD02825; Tue, 12 Nov 2013 11:15:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384254929!89163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28302 invoked from network); 12 Nov 2013 11:15:30 -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; 12 Nov 2013 11:15:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwP-0000iq-AB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwP-00007n-2T for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:29 +0000 Date: Tue, 12 Nov 2013 11:15:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: in send_debug_keys, clean up before raising exception X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff571a047661c461fe27613442370f66de387d8e Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:02 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: in send_debug_keys, clean up before raising exception Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index be8a3e8..80a5986 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -695,11 +695,11 @@ value stub_xl_send_debug_keys(value ctx, value keys) c_keys = dup_String_val(keys); ret = libxl_send_debug_keys(CTX, c_keys); + free(c_keys); + if (ret != 0) failwith_xl(ret, "send_debug_keys"); - free(c_keys); - CAMLreturn(Val_unit); } -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwT-0004WL-7A; Tue, 12 Nov 2013 11:15:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwS-0004W4-9n for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:32 +0000 Received: from [85.158.137.68:22544] by server-4.bemta-3.messagelabs.com id 85/10-08123-3DD02825; Tue, 12 Nov 2013 11:15:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384254929!89163!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28302 invoked from network); 12 Nov 2013 11:15:30 -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; 12 Nov 2013 11:15:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwP-0000iq-AB for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwP-00007n-2T for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:29 +0000 Date: Tue, 12 Nov 2013 11:15:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: in send_debug_keys, clean up before raising exception X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff571a047661c461fe27613442370f66de387d8e Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:02 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: in send_debug_keys, clean up before raising exception Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index be8a3e8..80a5986 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -695,11 +695,11 @@ value stub_xl_send_debug_keys(value ctx, value keys) c_keys = dup_String_val(keys); ret = libxl_send_debug_keys(CTX, c_keys); + free(c_keys); + if (ret != 0) failwith_xl(ret, "send_debug_keys"); - free(c_keys); - CAMLreturn(Val_unit); } -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwd-0004YF-9n; Tue, 12 Nov 2013 11:15:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwc-0004Xs-2a for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:42 +0000 Received: from [193.109.254.147:29964] by server-10.bemta-14.messagelabs.com id C9/5E-07477-DDD02825; Tue, 12 Nov 2013 11:15:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1384254939!2234498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7904 invoked from network); 12 Nov 2013 11:15:40 -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; 12 Nov 2013 11:15:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwZ-0000it-FI for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwZ-00008E-Db for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:39 +0000 Date: Tue, 12 Nov 2013 11:15:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: provide defaults for libxl 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 2f4f8ffc2447a999165091cc93b6748e5cc54a26 Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:03 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: provide defaults for libxl types Libxl functions such as libxl_domain_create_new take large structs of configuration parameters. Often, we would like to use the default values for many of these parameters. The struct and keyed-union types in libxl have init functions, which fill in the defaults for a given type. This commit provides an OCaml interface to obtain records of defaults by calling the relevant init function. These default records can be used as a base to construct your own records, and to selectively override parameters where needed. For example, a Domain_create_info record can now be created as follows: Xenlight.Domain_create_info.({ default ctx () with ty = Xenlight.DOMAIN_TYPE_PV; name = Some vm_name; uuid = vm_uuid; }) For types with KeyedUnion fields, such as Domain_build_info, a record with defaults is obtained by specifying the type key: Xenlight.Domain_build_info.default ctx ~ty:Xenlight.DOMAIN_TYPE_HVM () Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 61 +++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index edadd14..0bb636a 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -119,6 +119,7 @@ def gen_struct(ty): def gen_ocaml_keyedunions(ty, interface, indent, parent = None): s = "" + union_type = "" if ty.rawname is not None: # Non-anonymous types need no special handling @@ -158,9 +159,11 @@ def gen_ocaml_keyedunions(ty, interface, indent, parent = None): s += " | ".join(u) + "\n" ty.union_name = name + union_type = "?%s:%s" % (munge_name(nparent), ty.keyvar.type.rawname) + if s == "": - return None - return s.replace("\n", "\n%s" % indent) + return None, None + return s.replace("\n", "\n%s" % indent), union_type def gen_ocaml_ml(ty, interface, indent=""): @@ -196,17 +199,27 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "module %s = struct\n" % module_name # Handle KeyedUnions... + union_types = [] for f in ty.fields: - ku = gen_ocaml_keyedunions(f.type, interface, "\t") + ku, union_type = gen_ocaml_keyedunions(f.type, interface, "\t") if ku is not None: s += ku s += "\n" + if union_type is not None: + union_types.append(union_type) s += "\ttype t =\n" s += "\t{\n" s += gen_struct(ty) s += "\t}\n" - + + if ty.init_fn is not None: + union_args = "".join([u + " -> " for u in union_types]) + if interface: + s += "\tval default : ctx -> %sunit -> t\n" % union_args + else: + s += "\texternal default : ctx -> %sunit -> t = \"stub_libxl_%s_init\"\n" % (union_args, ty.rawname) + if functions.has_key(ty.rawname): for name,args in functions[ty.rawname]: s += "\texternal %s : " % name @@ -434,6 +447,38 @@ def gen_c_stub_prototype(ty, fns): s += ");\n" return s +def gen_c_default(ty): + s = "/* Get the defaults for %s */\n" % ty.rawname + # Handle KeyedUnions... + union_types = [] + for f in ty.fields: + if isinstance(f.type, idl.KeyedUnion): + union_types.append(f.type.keyvar) + + s += "value stub_libxl_%s_init(value ctx, %svalue unit)\n" % (ty.rawname, + "".join(["value " + u.name + ", " for u in union_types])) + s += "{\n" + s += "\tCAMLparam%d(ctx, %sunit);\n" % (len(union_types) + 2, "".join([u.name + ", " for u in union_types])) + s += "\tCAMLlocal1(val);\n" + s += "\tlibxl_%s c_val;\n" % ty.rawname + s += "\tlibxl_%s_init(&c_val);\n" % ty.rawname + for u in union_types: + s += "\tif (%s != Val_none) {\n" % u.name + s += "\t\t%s c = 0;\n" % u.type.typename + s += "\t\t%s_val(CTX, &c, Some_val(%s));\n" % (u.type.rawname, u.name) + s += "\t\tlibxl_%s_init_%s(&c_val, c);\n" % (ty.rawname, u.name) + s += "\t}\n" + s += "\tval = Val_%s(&c_val);\n" % ty.rawname + if ty.dispose_fn: + s += "\tlibxl_%s_dispose(&c_val);\n" % ty.rawname + s += "\tCAMLreturn(val);\n" + s += "}\n" + return s + +def gen_c_defaults(ty): + s = gen_c_default(ty) + return s + def autogen_header(open_comment, close_comment): s = open_comment + " AUTO-GENERATED FILE DO NOT EDIT " + close_comment + "\n" s += open_comment + " autogenerated by \n" @@ -486,12 +531,14 @@ if __name__ == '__main__': if ty.marshal_in(): cinc.write(gen_c_val(ty)) cinc.write("\n") - if ty.marshal_out(): - cinc.write(gen_Val_ocaml(ty)) - cinc.write("\n") + cinc.write(gen_Val_ocaml(ty)) + cinc.write("\n") if functions.has_key(ty.rawname): cinc.write(gen_c_stub_prototype(ty, functions[ty.rawname])) cinc.write("\n") + if ty.init_fn is not None: + cinc.write(gen_c_defaults(ty)) + cinc.write("\n") #sys.stdout.write("\n") ml.write("(* END OF AUTO-GENERATED CODE *)\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:15:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwd-0004YF-9n; Tue, 12 Nov 2013 11:15:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwc-0004Xs-2a for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:42 +0000 Received: from [193.109.254.147:29964] by server-10.bemta-14.messagelabs.com id C9/5E-07477-DDD02825; Tue, 12 Nov 2013 11:15:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1384254939!2234498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7904 invoked from network); 12 Nov 2013 11:15:40 -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; 12 Nov 2013 11:15:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwZ-0000it-FI for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwZ-00008E-Db for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:39 +0000 Date: Tue, 12 Nov 2013 11:15:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: provide defaults for libxl 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 2f4f8ffc2447a999165091cc93b6748e5cc54a26 Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:03 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: provide defaults for libxl types Libxl functions such as libxl_domain_create_new take large structs of configuration parameters. Often, we would like to use the default values for many of these parameters. The struct and keyed-union types in libxl have init functions, which fill in the defaults for a given type. This commit provides an OCaml interface to obtain records of defaults by calling the relevant init function. These default records can be used as a base to construct your own records, and to selectively override parameters where needed. For example, a Domain_create_info record can now be created as follows: Xenlight.Domain_create_info.({ default ctx () with ty = Xenlight.DOMAIN_TYPE_PV; name = Some vm_name; uuid = vm_uuid; }) For types with KeyedUnion fields, such as Domain_build_info, a record with defaults is obtained by specifying the type key: Xenlight.Domain_build_info.default ctx ~ty:Xenlight.DOMAIN_TYPE_HVM () Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 61 +++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index edadd14..0bb636a 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -119,6 +119,7 @@ def gen_struct(ty): def gen_ocaml_keyedunions(ty, interface, indent, parent = None): s = "" + union_type = "" if ty.rawname is not None: # Non-anonymous types need no special handling @@ -158,9 +159,11 @@ def gen_ocaml_keyedunions(ty, interface, indent, parent = None): s += " | ".join(u) + "\n" ty.union_name = name + union_type = "?%s:%s" % (munge_name(nparent), ty.keyvar.type.rawname) + if s == "": - return None - return s.replace("\n", "\n%s" % indent) + return None, None + return s.replace("\n", "\n%s" % indent), union_type def gen_ocaml_ml(ty, interface, indent=""): @@ -196,17 +199,27 @@ def gen_ocaml_ml(ty, interface, indent=""): s += "module %s = struct\n" % module_name # Handle KeyedUnions... + union_types = [] for f in ty.fields: - ku = gen_ocaml_keyedunions(f.type, interface, "\t") + ku, union_type = gen_ocaml_keyedunions(f.type, interface, "\t") if ku is not None: s += ku s += "\n" + if union_type is not None: + union_types.append(union_type) s += "\ttype t =\n" s += "\t{\n" s += gen_struct(ty) s += "\t}\n" - + + if ty.init_fn is not None: + union_args = "".join([u + " -> " for u in union_types]) + if interface: + s += "\tval default : ctx -> %sunit -> t\n" % union_args + else: + s += "\texternal default : ctx -> %sunit -> t = \"stub_libxl_%s_init\"\n" % (union_args, ty.rawname) + if functions.has_key(ty.rawname): for name,args in functions[ty.rawname]: s += "\texternal %s : " % name @@ -434,6 +447,38 @@ def gen_c_stub_prototype(ty, fns): s += ");\n" return s +def gen_c_default(ty): + s = "/* Get the defaults for %s */\n" % ty.rawname + # Handle KeyedUnions... + union_types = [] + for f in ty.fields: + if isinstance(f.type, idl.KeyedUnion): + union_types.append(f.type.keyvar) + + s += "value stub_libxl_%s_init(value ctx, %svalue unit)\n" % (ty.rawname, + "".join(["value " + u.name + ", " for u in union_types])) + s += "{\n" + s += "\tCAMLparam%d(ctx, %sunit);\n" % (len(union_types) + 2, "".join([u.name + ", " for u in union_types])) + s += "\tCAMLlocal1(val);\n" + s += "\tlibxl_%s c_val;\n" % ty.rawname + s += "\tlibxl_%s_init(&c_val);\n" % ty.rawname + for u in union_types: + s += "\tif (%s != Val_none) {\n" % u.name + s += "\t\t%s c = 0;\n" % u.type.typename + s += "\t\t%s_val(CTX, &c, Some_val(%s));\n" % (u.type.rawname, u.name) + s += "\t\tlibxl_%s_init_%s(&c_val, c);\n" % (ty.rawname, u.name) + s += "\t}\n" + s += "\tval = Val_%s(&c_val);\n" % ty.rawname + if ty.dispose_fn: + s += "\tlibxl_%s_dispose(&c_val);\n" % ty.rawname + s += "\tCAMLreturn(val);\n" + s += "}\n" + return s + +def gen_c_defaults(ty): + s = gen_c_default(ty) + return s + def autogen_header(open_comment, close_comment): s = open_comment + " AUTO-GENERATED FILE DO NOT EDIT " + close_comment + "\n" s += open_comment + " autogenerated by \n" @@ -486,12 +531,14 @@ if __name__ == '__main__': if ty.marshal_in(): cinc.write(gen_c_val(ty)) cinc.write("\n") - if ty.marshal_out(): - cinc.write(gen_Val_ocaml(ty)) - cinc.write("\n") + cinc.write(gen_Val_ocaml(ty)) + cinc.write("\n") if functions.has_key(ty.rawname): cinc.write(gen_c_stub_prototype(ty, functions[ty.rawname])) cinc.write("\n") + if ty.init_fn is not None: + cinc.write(gen_c_defaults(ty)) + cinc.write("\n") #sys.stdout.write("\n") ml.write("(* END OF AUTO-GENERATED CODE *)\n") -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:15:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwn-0004aX-EK; Tue, 12 Nov 2013 11:15:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwm-0004aJ-FL for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:52 +0000 Received: from [85.158.139.211:13724] by server-2.bemta-5.messagelabs.com id 69/D6-14533-7ED02825; Tue, 12 Nov 2013 11:15:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384254949!1466732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15546 invoked from network); 12 Nov 2013 11:15: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; 12 Nov 2013 11:15:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwj-0000j2-Kb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwj-00008n-Hq for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:49 +0000 Date: Tue, 12 Nov 2013 11:15:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: use CAMLlocal1 macro rather than value-type in auto-generated C-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 b376f74e504c1258045e1ef97af1ae42cb267842 Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:04 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: use CAMLlocal1 macro rather than value-type in auto-generated C-code Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 0bb636a..f5d2224 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -353,7 +353,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): elif isinstance(ty, idl.Array): s += "{\n" s += "\t int i;\n" - s += "\t value array_elem;\n" + s += "\t CAMLlocal1(array_elem);\n" s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "", parent=parent) @@ -403,7 +403,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): fn = "anon_field" else: fn = "%s_field" % ty.rawname - s += "\tvalue %s;\n" % fn + s += "\tCAMLlocal1(%s);\n" % fn s += "\n" s += "\t%s = caml_alloc_tuple(%d);\n" % (o, len(ty.fields)) -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:15:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:15: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 1VgBwn-0004aX-EK; Tue, 12 Nov 2013 11:15:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwm-0004aJ-FL for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:52 +0000 Received: from [85.158.139.211:13724] by server-2.bemta-5.messagelabs.com id 69/D6-14533-7ED02825; Tue, 12 Nov 2013 11:15:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384254949!1466732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15546 invoked from network); 12 Nov 2013 11:15: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; 12 Nov 2013 11:15:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwj-0000j2-Kb for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwj-00008n-Hq for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:49 +0000 Date: Tue, 12 Nov 2013 11:15:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ocaml: use CAMLlocal1 macro rather than value-type in auto-generated C-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 b376f74e504c1258045e1ef97af1ae42cb267842 Author: Rob Hoes AuthorDate: Wed Nov 6 17:50:04 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:39:47 2013 +0000 libxl: ocaml: use CAMLlocal1 macro rather than value-type in auto-generated C-code Signed-off-by: Rob Hoes Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/genwrap.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 0bb636a..f5d2224 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -353,7 +353,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): elif isinstance(ty, idl.Array): s += "{\n" s += "\t int i;\n" - s += "\t value array_elem;\n" + s += "\t CAMLlocal1(array_elem);\n" s += "\t %s = caml_alloc(%s,0);\n" % (o, parent + ty.lenvar.name) s += "\t for(i=0; i<%s; i++) {\n" % (parent + ty.lenvar.name) s += "\t %s\n" % ocaml_Val(ty.elem_type, "array_elem", c + "[i]", "", parent=parent) @@ -403,7 +403,7 @@ def ocaml_Val(ty, o, c, indent="", parent = None): fn = "anon_field" else: fn = "%s_field" % ty.rawname - s += "\tvalue %s;\n" % fn + s += "\tCAMLlocal1(%s);\n" % fn s += "\n" s += "\t%s = caml_alloc_tuple(%d);\n" % (o, len(ty.fields)) -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:16:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBwy-0004cu-IK; Tue, 12 Nov 2013 11:16:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBww-0004cR-OM for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:03 +0000 Received: from [85.158.137.68:30044] by server-8.bemta-3.messagelabs.com id 11/9F-06638-1FD02825; Tue, 12 Nov 2013 11:16:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1384254959!985415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11118 invoked from network); 12 Nov 2013 11:16:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:16:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwt-0000j8-P2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwt-00009D-N9 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:59 +0000 Date: Tue, 12 Nov 2013 11:15:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: allow updates regardless of quota X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed4f4bb739c4c25a0bc48712960a3b6fb9b465c2 Author: Zheng Li AuthorDate: Thu Oct 31 16:32:56 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:41:18 2013 +0000 oxenstored: allow updates regardless of quota Allow a domain updating existing xenstore keys even if it has already reached its max entries limit As updating existing key won't increase the number of entries belonging to a domain, we should avoid checking the max entries limit prematurely. The patch addresses this issue in the following functions: write/add, mkdir, setperms. Signed-off-by: Zheng Li Acked-by: Ian Campbell --- tools/ocaml/xenstored/store.ml | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index df11fa7..cac0b44 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -180,12 +180,12 @@ let get_node rnode path = try Some (lookup_get rnode path) with Define.Doesnt_exist -> None ) -(* get the deepest existing node for this path *) +(* get the deepest existing node for this path, return the node and a flag on the existence of the full path *) let rec get_deepest_existing_node node = function - | [] -> node + | [] -> node, true | h :: t -> try get_deepest_existing_node (Node.find node h) t - with Not_found -> node + with Not_found -> node, false let set_node rnode path nnode = let quota = Quota.create () in @@ -348,7 +348,7 @@ let traversal root_node f = List.iter (_traversal (path @ [ Symbol.to_string node.Node.name ])) node.Node.children in _traversal [] root_node - + let dump_store_buf root_node = let buf = Buffer.create 8192 in let dump_node path node = @@ -381,16 +381,24 @@ let set_node store path node = Quota.add store.quota quota_diff let write store perm path value = - let owner = Node.get_owner (get_deepest_existing_node store path) in - Quota.check store.quota owner (String.length value); + let node, existing = get_deepest_existing_node store path in + let owner = Node.get_owner node in + if existing then + (* Only check the string length limit *) + Quota.check store.quota (-1) (String.length value) + else + (* Check the domain entries limit too *) + Quota.check store.quota owner (String.length value); let root, node_created = path_write store perm path value in store.root <- root; if node_created then Quota.add_entry store.quota owner let mkdir store perm path = - let owner = Node.get_owner (get_deepest_existing_node store path) in - Quota.check store.quota owner 0; + let node, existing = get_deepest_existing_node store path in + let owner = Node.get_owner node in + (* It's upt to the mkdir logic to decide what to do with existing path *) + if not existing then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; Quota.add_entry store.quota owner @@ -408,7 +416,7 @@ let setperms store perm path nperms = | Some node -> let old_owner = Node.get_owner node in let new_owner = Perms.Node.get_owner nperms in - Quota.check store.quota new_owner 0; + if old_owner <> new_owner then Quota.check store.quota new_owner 0; store.root <- path_setperms store perm path nperms; Quota.del_entry store.quota old_owner; Quota.add_entry store.quota new_owner -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBwy-0004cu-IK; Tue, 12 Nov 2013 11:16:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBww-0004cR-OM for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:03 +0000 Received: from [85.158.137.68:30044] by server-8.bemta-3.messagelabs.com id 11/9F-06638-1FD02825; Tue, 12 Nov 2013 11:16:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1384254959!985415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11118 invoked from network); 12 Nov 2013 11:16:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:16:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBwt-0000j8-P2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBwt-00009D-N9 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:15:59 +0000 Date: Tue, 12 Nov 2013 11:15:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: allow updates regardless of quota X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed4f4bb739c4c25a0bc48712960a3b6fb9b465c2 Author: Zheng Li AuthorDate: Thu Oct 31 16:32:56 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 15:41:18 2013 +0000 oxenstored: allow updates regardless of quota Allow a domain updating existing xenstore keys even if it has already reached its max entries limit As updating existing key won't increase the number of entries belonging to a domain, we should avoid checking the max entries limit prematurely. The patch addresses this issue in the following functions: write/add, mkdir, setperms. Signed-off-by: Zheng Li Acked-by: Ian Campbell --- tools/ocaml/xenstored/store.ml | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml index df11fa7..cac0b44 100644 --- a/tools/ocaml/xenstored/store.ml +++ b/tools/ocaml/xenstored/store.ml @@ -180,12 +180,12 @@ let get_node rnode path = try Some (lookup_get rnode path) with Define.Doesnt_exist -> None ) -(* get the deepest existing node for this path *) +(* get the deepest existing node for this path, return the node and a flag on the existence of the full path *) let rec get_deepest_existing_node node = function - | [] -> node + | [] -> node, true | h :: t -> try get_deepest_existing_node (Node.find node h) t - with Not_found -> node + with Not_found -> node, false let set_node rnode path nnode = let quota = Quota.create () in @@ -348,7 +348,7 @@ let traversal root_node f = List.iter (_traversal (path @ [ Symbol.to_string node.Node.name ])) node.Node.children in _traversal [] root_node - + let dump_store_buf root_node = let buf = Buffer.create 8192 in let dump_node path node = @@ -381,16 +381,24 @@ let set_node store path node = Quota.add store.quota quota_diff let write store perm path value = - let owner = Node.get_owner (get_deepest_existing_node store path) in - Quota.check store.quota owner (String.length value); + let node, existing = get_deepest_existing_node store path in + let owner = Node.get_owner node in + if existing then + (* Only check the string length limit *) + Quota.check store.quota (-1) (String.length value) + else + (* Check the domain entries limit too *) + Quota.check store.quota owner (String.length value); let root, node_created = path_write store perm path value in store.root <- root; if node_created then Quota.add_entry store.quota owner let mkdir store perm path = - let owner = Node.get_owner (get_deepest_existing_node store path) in - Quota.check store.quota owner 0; + let node, existing = get_deepest_existing_node store path in + let owner = Node.get_owner node in + (* It's upt to the mkdir logic to decide what to do with existing path *) + if not existing then Quota.check store.quota owner 0; store.root <- path_mkdir store perm path; Quota.add_entry store.quota owner @@ -408,7 +416,7 @@ let setperms store perm path nperms = | Some node -> let old_owner = Node.get_owner node in let new_owner = Perms.Node.get_owner nperms in - Quota.check store.quota new_owner 0; + if old_owner <> new_owner then Quota.check store.quota new_owner 0; store.root <- path_setperms store perm path nperms; Quota.del_entry store.quota old_owner; Quota.add_entry store.quota new_owner -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBx7-0004et-LP; Tue, 12 Nov 2013 11:16:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBx6-0004ed-J2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:12 +0000 Received: from [85.158.139.211:62443] by server-1.bemta-5.messagelabs.com id 23/84-16887-BFD02825; Tue, 12 Nov 2013 11:16:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384254970!1460575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21337 invoked from network); 12 Nov 2013 11:16:11 -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 Nov 2013 11:16:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBx3-0000jk-Tp for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBx3-00009k-Rc for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:09 +0000 Date: Tue, 12 Nov 2013 11:16:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Device Tree cpu clock-frequency X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0220338fc9360b9bc741f975f00d7ff8ae6242f9 Author: Jon Fraser AuthorDate: Thu Nov 7 18:50:28 2013 -0500 Commit: Ian Campbell CommitDate: Mon Nov 11 16:05:15 2013 +0000 xen/arm: Device Tree cpu clock-frequency When creating CPU device tree properties, copy the clock-frequency if present. Quiets annoying messages from linux kernel: "/cpus/cpu@0 missing clock-frequency property" Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c644be2..186746c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -391,6 +391,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, u32 len; /* Placeholder for cpu@ + a 32-bit number + \0 */ char buf[15]; + u32 clock_frequency; + bool_t clock_valid; DPRINT("Create cpus node\n"); @@ -411,6 +413,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, if ( dt_device_type_is_equal(npcpu, "cpu") ) { compatible = dt_get_property(npcpu, "compatible", &len); + clock_valid = dt_property_read_u32(npcpu, "clock-frequency", + &clock_frequency); break; } } @@ -457,6 +461,12 @@ static int make_cpus_node(const struct domain *d, void *fdt, if ( res ) return res; + if (clock_valid) { + res = fdt_property_cell(fdt, "clock-frequency", clock_frequency); + if ( res ) + return res; + } + res = fdt_end_node(fdt); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBx7-0004et-LP; Tue, 12 Nov 2013 11:16:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBx6-0004ed-J2 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:12 +0000 Received: from [85.158.139.211:62443] by server-1.bemta-5.messagelabs.com id 23/84-16887-BFD02825; Tue, 12 Nov 2013 11:16:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384254970!1460575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21337 invoked from network); 12 Nov 2013 11:16:11 -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 Nov 2013 11:16:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBx3-0000jk-Tp for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBx3-00009k-Rc for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:09 +0000 Date: Tue, 12 Nov 2013 11:16:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Device Tree cpu clock-frequency X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0220338fc9360b9bc741f975f00d7ff8ae6242f9 Author: Jon Fraser AuthorDate: Thu Nov 7 18:50:28 2013 -0500 Commit: Ian Campbell CommitDate: Mon Nov 11 16:05:15 2013 +0000 xen/arm: Device Tree cpu clock-frequency When creating CPU device tree properties, copy the clock-frequency if present. Quiets annoying messages from linux kernel: "/cpus/cpu@0 missing clock-frequency property" Signed-off-by: Jon Fraser Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c644be2..186746c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -391,6 +391,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, u32 len; /* Placeholder for cpu@ + a 32-bit number + \0 */ char buf[15]; + u32 clock_frequency; + bool_t clock_valid; DPRINT("Create cpus node\n"); @@ -411,6 +413,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, if ( dt_device_type_is_equal(npcpu, "cpu") ) { compatible = dt_get_property(npcpu, "compatible", &len); + clock_valid = dt_property_read_u32(npcpu, "clock-frequency", + &clock_frequency); break; } } @@ -457,6 +461,12 @@ static int make_cpus_node(const struct domain *d, void *fdt, if ( res ) return res; + if (clock_valid) { + res = fdt_property_cell(fdt, "clock-frequency", clock_frequency); + if ( res ) + return res; + } + res = fdt_end_node(fdt); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxH-0004gm-ON; Tue, 12 Nov 2013 11:16:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxG-0004gY-BG for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:22 +0000 Received: from [85.158.143.35:32161] by server-3.bemta-4.messagelabs.com id D2/D7-19578-50E02825; Tue, 12 Nov 2013 11:16:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1384254980!2622135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2055 invoked from network); 12 Nov 2013 11:16:21 -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 Nov 2013 11:16:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxE-0000jn-1y for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxE-0000Av-0B for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:20 +0000 Date: Tue, 12 Nov 2013 11:16:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correct strtod error 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 9dc145a5828c180d828ad0844f6103bfcc89f799 Author: Matthew Daley AuthorDate: Fri Nov 8 13:32:58 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:10:26 2013 +0000 libxl: correct strtod error check Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index c6ffb52..d2f7de8 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -486,7 +486,7 @@ static int json_callback_number(void *opaque, const char *s, libxl_yajl_length l if (is_decimal(s, len)) { double d = strtod(s, NULL); - if ((d == HUGE_VAL || d == HUGE_VAL) && errno == ERANGE) { + if ((d == HUGE_VALF || d == HUGE_VALL) && errno == ERANGE) { 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 Tue Nov 12 11:16:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxH-0004gm-ON; Tue, 12 Nov 2013 11:16:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxG-0004gY-BG for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:22 +0000 Received: from [85.158.143.35:32161] by server-3.bemta-4.messagelabs.com id D2/D7-19578-50E02825; Tue, 12 Nov 2013 11:16:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1384254980!2622135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2055 invoked from network); 12 Nov 2013 11:16:21 -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 Nov 2013 11:16:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxE-0000jn-1y for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxE-0000Av-0B for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:20 +0000 Date: Tue, 12 Nov 2013 11:16:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: correct strtod error 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 9dc145a5828c180d828ad0844f6103bfcc89f799 Author: Matthew Daley AuthorDate: Fri Nov 8 13:32:58 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:10:26 2013 +0000 libxl: correct strtod error check Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl_json.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index c6ffb52..d2f7de8 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -486,7 +486,7 @@ static int json_callback_number(void *opaque, const char *s, libxl_yajl_length l if (is_decimal(s, len)) { double d = strtod(s, NULL); - if ((d == HUGE_VAL || d == HUGE_VAL) && errno == ERANGE) { + if ((d == HUGE_VALF || d == HUGE_VALL) && errno == ERANGE) { 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 Tue Nov 12 11:16:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxT-0004iz-SG; Tue, 12 Nov 2013 11:16:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxS-0004iV-5c for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:34 +0000 Received: from [85.158.143.35:33210] by server-3.bemta-4.messagelabs.com id 4A/48-19578-01E02825; Tue, 12 Nov 2013 11:16:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1384254990!2610073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17283 invoked from network); 12 Nov 2013 11:16:31 -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 Nov 2013 11:16:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxO-0000jx-Hf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxO-0000BR-55 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:30 +0000 Date: Tue, 12 Nov 2013 11:16:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: remove pointless if subcondition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49e547756ed89bef0cb59c311d273fae34074582 Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:08 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:40 2013 +0000 xen/arm: remove pointless if subcondition It's already handled just above. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- xen/common/device_tree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f7d0215..44253da 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -906,7 +906,7 @@ static int dt_translate_one(const struct dt_device_node *parent, dt_printk(XENLOG_ERR "DT: no ranges; cannot translate\n"); return 1; } - if ( ranges == NULL || rlen == 0 ) + if ( rlen == 0 ) { offset = dt_read_number(addr, na); memset(addr, 0, pna * 4); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxT-0004iz-SG; Tue, 12 Nov 2013 11:16:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxS-0004iV-5c for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:34 +0000 Received: from [85.158.143.35:33210] by server-3.bemta-4.messagelabs.com id 4A/48-19578-01E02825; Tue, 12 Nov 2013 11:16:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1384254990!2610073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17283 invoked from network); 12 Nov 2013 11:16:31 -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 Nov 2013 11:16:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxO-0000jx-Hf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxO-0000BR-55 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:30 +0000 Date: Tue, 12 Nov 2013 11:16:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: remove pointless if subcondition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49e547756ed89bef0cb59c311d273fae34074582 Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:08 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:40 2013 +0000 xen/arm: remove pointless if subcondition It's already handled just above. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- xen/common/device_tree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f7d0215..44253da 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -906,7 +906,7 @@ static int dt_translate_one(const struct dt_device_node *parent, dt_printk(XENLOG_ERR "DT: no ranges; cannot translate\n"); return 1; } - if ( ranges == NULL || rlen == 0 ) + if ( rlen == 0 ) { offset = dt_read_number(addr, na); memset(addr, 0, pna * 4); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxl-0004mF-Bx; Tue, 12 Nov 2013 11:16:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxk-0004lv-LH for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:52 +0000 Received: from [85.158.137.68:45055] by server-12.bemta-3.messagelabs.com id 80/FB-23139-32E02825; Tue, 12 Nov 2013 11:16:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1384255000!973290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29036 invoked from network); 12 Nov 2013 11:16:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:16:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxY-0000k0-MO for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxY-0000Bw-KJ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:40 +0000 Date: Tue, 12 Nov 2013 11:16:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: remove pointless if subcondition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d621f95d6a15430d479ac03dea592ea6ae386d4b Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:09 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:52 2013 +0000 xen/video: remove pointless if subcondition It's already handled just above. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- xen/drivers/video/arm_hdlcd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index dffda9a..647f22c 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -150,7 +150,7 @@ void __init video_init(void) return; } - if ( !hdlcd_start || !framebuffer_start ) + if ( !framebuffer_start ) { early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); return; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxl-0004mM-EP; Tue, 12 Nov 2013 11:16:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxk-0004lK-Qi for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:52 +0000 Received: from [85.158.143.35:35730] by server-3.bemta-4.messagelabs.com id 49/09-19578-42E02825; Tue, 12 Nov 2013 11:16:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384255010!2621434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6911 invoked from network); 12 Nov 2013 11:16:51 -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; 12 Nov 2013 11:16:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxi-0000k6-QX for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxi-0000CR-Ow for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:50 +0000 Date: Tue, 12 Nov 2013 11:16:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove pointless null pointer 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 570e223242de00d9cf673d719cb68d28e4a1fcdd Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:10 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:54 2013 +0000 libxc: remove pointless null pointer check ctxt_buf is guaranteed non-null here. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 2cea6e3..1ccafc5 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -444,8 +444,7 @@ int xc_domain_hvm_getcontext_partial(xc_interface *xch, ret = do_domctl(xch, &domctl); - if ( ctxt_buf ) - xc_hypercall_bounce_post(xch, ctxt_buf); + xc_hypercall_bounce_post(xch, ctxt_buf); return ret ? -1 : 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxl-0004mF-Bx; Tue, 12 Nov 2013 11:16:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxk-0004lv-LH for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:52 +0000 Received: from [85.158.137.68:45055] by server-12.bemta-3.messagelabs.com id 80/FB-23139-32E02825; Tue, 12 Nov 2013 11:16:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1384255000!973290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29036 invoked from network); 12 Nov 2013 11:16:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:16:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxY-0000k0-MO for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxY-0000Bw-KJ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:40 +0000 Date: Tue, 12 Nov 2013 11:16:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/video: remove pointless if subcondition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d621f95d6a15430d479ac03dea592ea6ae386d4b Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:09 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:52 2013 +0000 xen/video: remove pointless if subcondition It's already handled just above. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- xen/drivers/video/arm_hdlcd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index dffda9a..647f22c 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -150,7 +150,7 @@ void __init video_init(void) return; } - if ( !hdlcd_start || !framebuffer_start ) + if ( !framebuffer_start ) { early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); return; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:16:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:16: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 1VgBxl-0004mM-EP; Tue, 12 Nov 2013 11:16:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxk-0004lK-Qi for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:52 +0000 Received: from [85.158.143.35:35730] by server-3.bemta-4.messagelabs.com id 49/09-19578-42E02825; Tue, 12 Nov 2013 11:16:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384255010!2621434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6911 invoked from network); 12 Nov 2013 11:16:51 -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; 12 Nov 2013 11:16:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxi-0000k6-QX for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxi-0000CR-Ow for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:16:50 +0000 Date: Tue, 12 Nov 2013 11:16:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: remove pointless null pointer 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 570e223242de00d9cf673d719cb68d28e4a1fcdd Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:10 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:54 2013 +0000 libxc: remove pointless null pointer check ctxt_buf is guaranteed non-null here. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 2cea6e3..1ccafc5 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -444,8 +444,7 @@ int xc_domain_hvm_getcontext_partial(xc_interface *xch, ret = do_domctl(xch, &domctl); - if ( ctxt_buf ) - xc_hypercall_bounce_post(xch, ctxt_buf); + xc_hypercall_bounce_post(xch, ctxt_buf); return ret ? -1 : 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:17:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgBxw-0004pX-IG; Tue, 12 Nov 2013 11:17:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxv-0004p9-Rf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:03 +0000 Received: from [85.158.139.211:28799] by server-10.bemta-5.messagelabs.com id 4E/B7-28640-E2E02825; Tue, 12 Nov 2013 11:17:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384255021!1483498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22256 invoked from network); 12 Nov 2013 11:17:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:17:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxs-0000kC-Vv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxs-0000Co-U7 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:00 +0000 Date: Tue, 12 Nov 2013 11:17:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove pointless null pointer 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 bd222b3fd4eb874721c28c43358f93d3307bcca1 Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:11 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:57 2013 +0000 xl: remove pointless null pointer check poolinfo is guaranteed non-null here. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 40feb7d..5bd9b15 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5095,8 +5095,8 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), break; } } - if (poolinfo) - libxl_cpupoolinfo_list_free(poolinfo, n_pools); + + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:17:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgBxw-0004pX-IG; Tue, 12 Nov 2013 11:17:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxv-0004p9-Rf for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:03 +0000 Received: from [85.158.139.211:28799] by server-10.bemta-5.messagelabs.com id 4E/B7-28640-E2E02825; Tue, 12 Nov 2013 11:17:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384255021!1483498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22256 invoked from network); 12 Nov 2013 11:17:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 11:17:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBxs-0000kC-Vv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBxs-0000Co-U7 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:00 +0000 Date: Tue, 12 Nov 2013 11:17:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: remove pointless null pointer 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 bd222b3fd4eb874721c28c43358f93d3307bcca1 Author: Matthew Daley AuthorDate: Fri Nov 8 13:45:11 2013 +1300 Commit: Ian Campbell CommitDate: Mon Nov 11 16:13:57 2013 +0000 xl: remove pointless null pointer check poolinfo is guaranteed non-null here. Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 40feb7d..5bd9b15 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5095,8 +5095,8 @@ static int sched_domain_output(libxl_scheduler sched, int (*output)(int), break; } } - if (poolinfo) - libxl_cpupoolinfo_list_free(poolinfo, n_pools); + + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 11:17:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgBy6-0004sb-LH; Tue, 12 Nov 2013 11:17:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBy5-0004sC-OF for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:13 +0000 Received: from [85.158.137.68:16875] by server-14.bemta-3.messagelabs.com id 9C/76-20312-83E02825; Tue, 12 Nov 2013 11:17:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384255031!978290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14607 invoked from network); 12 Nov 2013 11:17: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; 12 Nov 2013 11:17:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBy3-0000kr-4O for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBy3-0000DM-2C for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:11 +0000 Date: Tue, 12 Nov 2013 11:17:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/midway: Add 1:1 workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7c95989b57be5ffaabf9c46010c9011f07ecfd9 Author: Julien Grall AuthorDate: Wed Nov 6 19:37:15 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 16:15:01 2013 +0000 xen/midway: Add 1:1 workaround Signed-off-by: Julien Grall Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platforms/midway.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c index b221279..399056b 100644 --- a/xen/arch/arm/platforms/midway.c +++ b/xen/arch/arm/platforms/midway.c @@ -42,6 +42,11 @@ static void midway_reset(void) iounmap(pmu); } +static uint32_t midway_quirks(void) +{ + return PLATFORM_QUIRK_DOM0_MAPPING_11; +} + static const char * const midway_dt_compat[] __initconst = { "calxeda,ecx-2000", @@ -51,6 +56,7 @@ static const char * const midway_dt_compat[] __initconst = PLATFORM_START(midway, "CALXEDA MIDWAY") .compatible = midway_dt_compat, .reset = midway_reset, + .quirks = midway_quirks, 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 Tue Nov 12 11:17:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgBy6-0004sb-LH; Tue, 12 Nov 2013 11:17:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBy5-0004sC-OF for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:13 +0000 Received: from [85.158.137.68:16875] by server-14.bemta-3.messagelabs.com id 9C/76-20312-83E02825; Tue, 12 Nov 2013 11:17:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384255031!978290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14607 invoked from network); 12 Nov 2013 11:17: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; 12 Nov 2013 11:17:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgBy3-0000kr-4O for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgBy3-0000DM-2C for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:11 +0000 Date: Tue, 12 Nov 2013 11:17:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/midway: Add 1:1 workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7c95989b57be5ffaabf9c46010c9011f07ecfd9 Author: Julien Grall AuthorDate: Wed Nov 6 19:37:15 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 16:15:01 2013 +0000 xen/midway: Add 1:1 workaround Signed-off-by: Julien Grall Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platforms/midway.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c index b221279..399056b 100644 --- a/xen/arch/arm/platforms/midway.c +++ b/xen/arch/arm/platforms/midway.c @@ -42,6 +42,11 @@ static void midway_reset(void) iounmap(pmu); } +static uint32_t midway_quirks(void) +{ + return PLATFORM_QUIRK_DOM0_MAPPING_11; +} + static const char * const midway_dt_compat[] __initconst = { "calxeda,ecx-2000", @@ -51,6 +56,7 @@ static const char * const midway_dt_compat[] __initconst = PLATFORM_START(midway, "CALXEDA MIDWAY") .compatible = midway_dt_compat, .reset = midway_reset, + .quirks = midway_quirks, 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 Tue Nov 12 11:17:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgByG-0004vR-Px; Tue, 12 Nov 2013 11:17:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgByG-0004v9-3x for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:24 +0000 Received: from [85.158.139.211:42193] by server-10.bemta-5.messagelabs.com id D2/D8-28640-34E02825; Tue, 12 Nov 2013 11:17:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1384255041!1458979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12465 invoked from network); 12 Nov 2013 11:17:22 -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; 12 Nov 2013 11:17:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgByD-0000ku-9q for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgByD-0000EJ-6u for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:21 +0000 Date: Tue, 12 Nov 2013 11:17:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: more info on the ARM ABI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c17eb342efa91420756eab7913bd8dd11d0dbbc7 Author: Stefano Stabellini AuthorDate: Thu Nov 7 14:52:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 16:15:43 2013 +0000 xen/arm: more info on the ARM ABI Add more information about the exported ARM ABI. Signed-off-by: Stefano Stabellini --- xen/include/public/arch-arm.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 5d359af..1e8aeda 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -120,6 +120,40 @@ * Exactly these sub-operations are supported: * * VCPUOP_register_vcpu_info * * VCPUOP_register_runstate_memory_area + * + * + * Other notes on the ARM ABI: + * + * - struct start_info is not exported to ARM guests. + * + * - struct shared_info is mapped by ARM guests using the + * HYPERVISOR_memory_op sub-op XENMEM_add_to_physmap, passing + * XENMAPSPACE_shared_info as space parameter. + * + * - All the per-cpu struct vcpu_info are mapped by ARM guests using the + * HYPERVISOR_vcpu_op sub-op VCPUOP_register_vcpu_info, including cpu0 + * struct vcpu_info. + * + * - The grant table is mapped using the HYPERVISOR_memory_op sub-op + * XENMEM_add_to_physmap, passing XENMAPSPACE_grant_table as space + * parameter. The memory range specified under the Xen compatible + * hypervisor node on device tree can be used as target gpfn for the + * mapping. + * + * - Xenstore is initialized by using the two hvm_params + * HVM_PARAM_STORE_PFN and HVM_PARAM_STORE_EVTCHN. They can be read + * with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - The paravirtualized console is initialized by using the two + * hvm_params HVM_PARAM_CONSOLE_PFN and HVM_PARAM_CONSOLE_EVTCHN. They + * can be read with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - Event channel notifications are delivered using the percpu GIC + * interrupt specified under the Xen compatible hypervisor node on + * device tree. + * + * - The device tree Xen compatible node is fully described under Linux + * at Documentation/devicetree/bindings/arm/xen.txt. */ #define XEN_HYPERCALL_TAG 0XEA1 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 11:17:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 11:17: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 1VgByG-0004vR-Px; Tue, 12 Nov 2013 11:17:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgByG-0004v9-3x for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:24 +0000 Received: from [85.158.139.211:42193] by server-10.bemta-5.messagelabs.com id D2/D8-28640-34E02825; Tue, 12 Nov 2013 11:17:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1384255041!1458979!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12465 invoked from network); 12 Nov 2013 11:17:22 -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; 12 Nov 2013 11:17:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgByD-0000ku-9q for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgByD-0000EJ-6u for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 11:17:21 +0000 Date: Tue, 12 Nov 2013 11:17:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: more info on the ARM ABI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c17eb342efa91420756eab7913bd8dd11d0dbbc7 Author: Stefano Stabellini AuthorDate: Thu Nov 7 14:52:50 2013 +0000 Commit: Ian Campbell CommitDate: Mon Nov 11 16:15:43 2013 +0000 xen/arm: more info on the ARM ABI Add more information about the exported ARM ABI. Signed-off-by: Stefano Stabellini --- xen/include/public/arch-arm.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 5d359af..1e8aeda 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -120,6 +120,40 @@ * Exactly these sub-operations are supported: * * VCPUOP_register_vcpu_info * * VCPUOP_register_runstate_memory_area + * + * + * Other notes on the ARM ABI: + * + * - struct start_info is not exported to ARM guests. + * + * - struct shared_info is mapped by ARM guests using the + * HYPERVISOR_memory_op sub-op XENMEM_add_to_physmap, passing + * XENMAPSPACE_shared_info as space parameter. + * + * - All the per-cpu struct vcpu_info are mapped by ARM guests using the + * HYPERVISOR_vcpu_op sub-op VCPUOP_register_vcpu_info, including cpu0 + * struct vcpu_info. + * + * - The grant table is mapped using the HYPERVISOR_memory_op sub-op + * XENMEM_add_to_physmap, passing XENMAPSPACE_grant_table as space + * parameter. The memory range specified under the Xen compatible + * hypervisor node on device tree can be used as target gpfn for the + * mapping. + * + * - Xenstore is initialized by using the two hvm_params + * HVM_PARAM_STORE_PFN and HVM_PARAM_STORE_EVTCHN. They can be read + * with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - The paravirtualized console is initialized by using the two + * hvm_params HVM_PARAM_CONSOLE_PFN and HVM_PARAM_CONSOLE_EVTCHN. They + * can be read with the HYPERVISOR_hvm_op sub-op HVMOP_get_param. + * + * - Event channel notifications are delivered using the percpu GIC + * interrupt specified under the Xen compatible hypervisor node on + * device tree. + * + * - The device tree Xen compatible node is fully described under Linux + * at Documentation/devicetree/bindings/arm/xen.txt. */ #define XEN_HYPERCALL_TAG 0XEA1 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 12 13:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgEQu-0002SI-Cl; Tue, 12 Nov 2013 13: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 1VgEQs-0002S8-Ll for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:06 +0000 Received: from [85.158.143.35:35132] by server-3.bemta-4.messagelabs.com id 23/20-19578-A3332825; Tue, 12 Nov 2013 13:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1384264504!2665390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9542 invoked from network); 12 Nov 2013 13:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgEQq-0002Qq-4H for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgEQp-0004ed-ML for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:03 +0000 Date: Tue, 12 Nov 2013 13:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d86a985a273662f3275ee60585d7507d457802a1 Author: Jan Beulich AuthorDate: Mon Nov 11 09:17:32 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:17:32 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell master commit: 4e87bc5b03e05123ba5c888f77969140c8ebd1bf master date: 2013-11-11 09:15:04 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2acdf33..041c9f6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1508,15 +1508,10 @@ static void clear_vvmcs_launched(struct list_head *launched_list, } } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1535,6 +1530,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1554,10 +1553,13 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; - int rc; struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- 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 Nov 12 13:55:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgEQu-0002SI-Cl; Tue, 12 Nov 2013 13: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 1VgEQs-0002S8-Ll for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:06 +0000 Received: from [85.158.143.35:35132] by server-3.bemta-4.messagelabs.com id 23/20-19578-A3332825; Tue, 12 Nov 2013 13:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1384264504!2665390!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9542 invoked from network); 12 Nov 2013 13:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgEQq-0002Qq-4H for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgEQp-0004ed-ML for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:03 +0000 Date: Tue, 12 Nov 2013 13:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d86a985a273662f3275ee60585d7507d457802a1 Author: Jan Beulich AuthorDate: Mon Nov 11 09:17:32 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 09:17:32 2013 +0100 nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing Otherwise uninitialized data may be used, leading to crashes. This is CVE-2013-4551 / XSA-75. Reported-and-tested-by: Jeff Zimmerman Signed-off-by: Jan Beulich Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell master commit: 4e87bc5b03e05123ba5c888f77969140c8ebd1bf master date: 2013-11-11 09:15:04 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2acdf33..041c9f6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1508,15 +1508,10 @@ static void clear_vvmcs_launched(struct list_head *launched_list, } } -int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) +static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - int rc; - - rc = vmx_inst_check_privilege(regs, 0); - if ( rc != X86EMUL_OKAY ) - return rc; /* check VMCS is valid and IO BITMAP is set */ if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) && @@ -1535,6 +1530,10 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { @@ -1554,10 +1553,13 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; - int rc; struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + int rc = vmx_inst_check_privilege(regs, 0); + + if ( rc != X86EMUL_OKAY ) + return rc; if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR ) { -- 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 Nov 12 13:55:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55: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 1VgER6-0002TK-FU; Tue, 12 Nov 2013 13:55:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgER4-0002T3-Ep for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:18 +0000 Received: from [85.158.139.211:51137] by server-17.bemta-5.messagelabs.com id 83/F6-17059-54332825; Tue, 12 Nov 2013 13:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384264514!1518595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7938 invoked from network); 12 Nov 2013 13:55: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; 12 Nov 2013 13:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgER0-0002Qw-DR for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgER0-0004f1-7x for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:14 +0000 Date: Tue, 12 Nov 2013 13:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] scheduler: adjust internal locking 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 fbf12a33fe7cb54feb2d15cd970e910c92103e6c Author: Jan Beulich AuthorDate: Mon Nov 11 16:17:20 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:17:20 2013 +0100 scheduler: adjust internal locking interface Make the locking functions return the lock pointers, so they can be passed to the unlocking functions (which in turn can check that the lock is still actually providing the intended protection, i.e. the parameters determining which lock is the right one didn't change). Further use proper spin lock primitives rather than open coded local_irq_...() constructs, so that interrupts can be re-enabled as appropriate while spinning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: eedd60391610629b4e8a2e8278b857ff884f750d master date: 2013-10-14 08:57:56 +0200 --- xen/common/sched_credit.c | 11 ++- xen/common/sched_credit2.c | 22 ++++--- xen/common/sched_sedf.c | 29 ++++++---- xen/common/schedule.c | 61 ++++++++++---------- xen/include/xen/sched-if.h | 138 ++++++++++++++++++-------------------------- 5 files changed, 125 insertions(+), 136 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 24f70c6..7806b67 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1170,6 +1170,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) struct csched_pcpu * const spc = CSCHED_PCPU(cpu); struct list_head *runq, *elem, *next, *last_under; struct csched_vcpu *svc_elem; + spinlock_t *lock; unsigned long flags; int sort_epoch; @@ -1179,7 +1180,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) spc->runq_sort_last = sort_epoch; - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); runq = &spc->runq; elem = runq->next; @@ -1204,7 +1205,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) elem = next; } - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); } static void @@ -1568,7 +1569,9 @@ csched_load_balance(struct csched_private *prv, int cpu, * could cause a deadlock if the peer CPU is also load * balancing and trying to lock this CPU. */ - if ( !pcpu_schedule_trylock(peer_cpu) ) + spinlock_t *lock = pcpu_schedule_trylock(peer_cpu); + + if ( !lock ) { SCHED_STAT_CRANK(steal_trylock_failed); peer_cpu = cpumask_cycle(peer_cpu, &workers); @@ -1578,7 +1581,7 @@ csched_load_balance(struct csched_private *prv, int cpu, /* Any work over there to steal? */ speer = cpumask_test_cpu(peer_cpu, online) ? csched_runq_steal(peer_cpu, cpu, snext->pri, bstep) : NULL; - pcpu_schedule_unlock(peer_cpu); + pcpu_schedule_unlock(lock, peer_cpu); /* As soon as one vcpu is found, balancing ends */ if ( speer != NULL ) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 825ec98..46a991e 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -881,15 +881,17 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) */ if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + /* FIXME: Do we need the private lock here? */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); /* Add vcpu to runqueue of initial processor */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_assign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); sdom->nr_vcpus++; } @@ -916,14 +918,16 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + SCHED_STAT_CRANK(vcpu_destroy); /* Remove from runqueue */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_deassign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); /* Remove from sdom list. Don't need a lock for this, as it's called * syncronously when nothing else can happen. */ @@ -1010,8 +1014,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu * const svc = CSCHED_VCPU(vc); s_time_t now = NOW(); - - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); BUG_ON( !is_idle_vcpu(vc) && svc->rqd != RQD(ops, vc->processor)); @@ -1037,7 +1040,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) else if ( !is_idle_vcpu(vc) ) update_load(ops, svc->rqd, svc, -1, now); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); } #define MAX_LOAD (1ULL<<60); @@ -1454,14 +1457,14 @@ csched_dom_cntl( * must never lock csched_priv.lock if we're holding a runqueue lock. * Also, calling vcpu_schedule_lock() is enough, since IRQs have already * been disabled. */ - vcpu_schedule_lock(svc->vcpu); + spinlock_t *lock = vcpu_schedule_lock(svc->vcpu); BUG_ON(svc->rqd != RQD(ops, svc->vcpu->processor)); svc->weight = sdom->weight; update_max_weight(svc->rqd, svc->weight, old_weight); - vcpu_schedule_unlock(svc->vcpu); + vcpu_schedule_unlock(lock, svc->vcpu); } } } @@ -1991,6 +1994,7 @@ static void init_pcpu(const struct scheduler *ops, int cpu) cpumask_set_cpu(cpu, &rqd->idle); cpumask_set_cpu(cpu, &rqd->active); + /* _Not_ pcpu_schedule_unlock(): per_cpu().schedule_lock changed! */ spin_unlock(old_lock); cpumask_set_cpu(cpu, &prv->initialized); diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index d1812b6..7c24171 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -1350,14 +1350,16 @@ static int sedf_adjust_weights(struct cpupool *c, int nr_cpus, int *sumw, s_time if ( EDOM_INFO(p)->weight ) { /* Interrupts already off */ - vcpu_schedule_lock(p); + spinlock_t *lock = vcpu_schedule_lock(p); + EDOM_INFO(p)->period_orig = EDOM_INFO(p)->period = WEIGHT_PERIOD; EDOM_INFO(p)->slice_orig = EDOM_INFO(p)->slice = (EDOM_INFO(p)->weight * (WEIGHT_PERIOD - WEIGHT_SAFETY - sumt[cpu])) / sumw[cpu]; - vcpu_schedule_unlock(p); + + vcpu_schedule_unlock(lock, p); } } } @@ -1418,21 +1420,24 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen { /* (Here and everywhere in the following) IRQs are already off, * hence vcpu_spin_lock() is the one. */ - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->extraweight = op->u.sedf.weight; EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->slice = 0; EDOM_INFO(v)->period = WEIGHT_PERIOD; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else { /* Weight-driven domains with real-time execution */ - for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + for_each_vcpu ( p, v ) + { + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = op->u.sedf.weight; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } } @@ -1454,14 +1459,15 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen /* Time-driven domains */ for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->extraweight = 0; EDOM_INFO(v)->period_orig = EDOM_INFO(v)->period = op->u.sedf.period; EDOM_INFO(v)->slice_orig = EDOM_INFO(v)->slice = op->u.sedf.slice; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } @@ -1471,13 +1477,14 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->status = (EDOM_INFO(v)->status & ~EXTRA_AWARE) | (op->u.sedf.extratime & EXTRA_AWARE); EDOM_INFO(v)->latency = op->u.sedf.latency; extraq_check(v); - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else if ( op->cmd == XEN_DOMCTL_SCHEDOP_getinfo ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1ddfb22..95472ba 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -160,18 +160,16 @@ static inline void vcpu_runstate_change( void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate) { + spinlock_t *lock = likely(v == current) ? NULL : vcpu_schedule_lock_irq(v); s_time_t delta; - if ( unlikely(v != current) ) - vcpu_schedule_lock_irq(v); - memcpy(runstate, &v->runstate, sizeof(*runstate)); delta = NOW() - runstate->state_entry_time; if ( delta > 0 ) runstate->time[runstate->state] += delta; - if ( unlikely(v != current) ) - vcpu_schedule_unlock_irq(v); + if ( unlikely(lock != NULL) ) + vcpu_schedule_unlock_irq(lock, v); } uint64_t get_cpu_idle_time(unsigned int cpu) @@ -333,8 +331,7 @@ void sched_destroy_domain(struct domain *d) void vcpu_sleep_nosync(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(!vcpu_runnable(v)) ) { @@ -344,7 +341,7 @@ void vcpu_sleep_nosync(struct vcpu *v) SCHED_OP(VCPU2OP(v), sleep, v); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); } @@ -362,8 +359,7 @@ void vcpu_sleep_sync(struct vcpu *v) void vcpu_wake(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(vcpu_runnable(v)) ) { @@ -377,7 +373,7 @@ void vcpu_wake(struct vcpu *v) vcpu_runstate_change(v, RUNSTATE_offline, NOW()); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); } @@ -528,10 +524,11 @@ static void vcpu_migrate(struct vcpu *v) */ void vcpu_force_reschedule(struct vcpu *v) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); + if ( v->is_running ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); if ( test_bit(_VPF_migrating, &v->pause_flags) ) { @@ -546,7 +543,7 @@ void restore_vcpu_affinity(struct domain *d) for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); if ( v->affinity_broken ) { @@ -559,13 +556,13 @@ void restore_vcpu_affinity(struct domain *d) if ( v->processor == smp_processor_id() ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } } @@ -592,7 +589,7 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -613,13 +610,13 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } /* @@ -646,6 +643,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) { cpumask_t online_affinity; cpumask_t *online; + spinlock_t *lock; if ( v->domain->is_pinned ) return -EINVAL; @@ -654,7 +652,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) if ( cpumask_empty(&online_affinity) ) return -EINVAL; - vcpu_schedule_lock_irq(v); + lock = vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); @@ -662,7 +660,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) * when changing the affinity */ set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); domain_update_node_affinity(v->domain); @@ -776,10 +774,10 @@ static long do_poll(struct sched_poll *sched_poll) static long do_yield(void) { struct vcpu * v=current; + spinlock_t *lock = vcpu_schedule_lock_irq(v); - vcpu_schedule_lock_irq(v); SCHED_OP(VCPU2OP(v), yield, v); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); @@ -1140,6 +1138,7 @@ static void schedule(void) unsigned long *tasklet_work = &this_cpu(tasklet_work_to_do); bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; + spinlock_t *lock; struct task_slice next_slice; int cpu = smp_processor_id(); @@ -1166,7 +1165,7 @@ static void schedule(void) BUG(); } - pcpu_schedule_lock_irq(cpu); + lock = pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1183,7 +1182,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); trace_continue_running(next); return continue_running(prev); } @@ -1221,7 +1220,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_STAT_CRANK(sched_ctx); @@ -1408,6 +1407,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { unsigned long flags; struct vcpu *idle; + spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; struct scheduler *old_ops = per_cpu(scheduler, cpu); struct scheduler *new_ops = (c == NULL) ? &ops : c->sched; @@ -1426,7 +1426,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1437,7 +1437,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) SCHED_OP(new_ops, tick_resume, cpu); SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); @@ -1495,10 +1495,11 @@ void schedule_dump(struct cpupool *c) for_each_cpu (i, cpus) { - pcpu_schedule_lock(i); + spinlock_t *lock = pcpu_schedule_lock(i); + printk("CPU[%02d] ", i); SCHED_OP(sched, dump_cpu_state, i); - pcpu_schedule_unlock(i); + pcpu_schedule_unlock(lock, i); } } diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index ad4d80c..d95e254 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -47,96 +47,70 @@ DECLARE_PER_CPU(struct schedule_data, schedule_data); DECLARE_PER_CPU(struct scheduler *, scheduler); DECLARE_PER_CPU(struct cpupool *, cpupool); -static inline spinlock_t * pcpu_schedule_lock(int cpu) -{ - spinlock_t * lock=NULL; - - for ( ; ; ) - { - /* The per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - */ - lock=per_cpu(schedule_data, cpu).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) - break; - spin_unlock(lock); - } - return lock; +#define sched_lock(kind, param, cpu, irq, arg...) \ +static inline spinlock_t *kind##_schedule_lock##irq(param EXTRA_TYPE(arg)) \ +{ \ + for ( ; ; ) \ + { \ + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; \ + /* \ + * v->processor may change when grabbing the lock; but \ + * per_cpu(v->processor) may also change, if changing cpu pool \ + * also changes the scheduler lock. Retry until they match. \ + * \ + * It may also be the case that v->processor may change but the \ + * lock may be the same; this will succeed in that case. \ + */ \ + spin_lock##irq(lock, ## arg); \ + if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) \ + return lock; \ + spin_unlock##irq(lock, ## arg); \ + } \ } -static inline int pcpu_schedule_trylock(int cpu) -{ - spinlock_t * lock=NULL; - - lock=per_cpu(schedule_data, cpu).schedule_lock; - if ( ! spin_trylock(lock) ) - return 0; - if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) - return 1; - else - { - spin_unlock(lock); - return 0; - } -} - -#define pcpu_schedule_lock_irq(p) \ - do { local_irq_disable(); pcpu_schedule_lock(p); } while ( 0 ) -#define pcpu_schedule_lock_irqsave(p, flags) \ - do { local_irq_save(flags); pcpu_schedule_lock(p); } while ( 0 ) - -static inline void pcpu_schedule_unlock(int cpu) -{ - spin_unlock(per_cpu(schedule_data, cpu).schedule_lock); +#define sched_unlock(kind, param, cpu, irq, arg...) \ +static inline void kind##_schedule_unlock##irq(spinlock_t *lock \ + EXTRA_TYPE(arg), param) \ +{ \ + ASSERT(lock == per_cpu(schedule_data, cpu).schedule_lock); \ + spin_unlock##irq(lock, ## arg); \ } -#define pcpu_schedule_unlock_irq(p) \ - do { pcpu_schedule_unlock(p); local_irq_enable(); } while ( 0 ) -#define pcpu_schedule_unlock_irqrestore(p, flags) \ - do { pcpu_schedule_unlock(p); local_irq_restore(flags); } while ( 0 ) - -static inline void vcpu_schedule_lock(struct vcpu *v) +#define EXTRA_TYPE(arg) +sched_lock(pcpu, unsigned int cpu, cpu, ) +sched_lock(vcpu, const struct vcpu *v, v->processor, ) +sched_lock(pcpu, unsigned int cpu, cpu, _irq) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irq) +sched_unlock(pcpu, unsigned int cpu, cpu, ) +sched_unlock(vcpu, const struct vcpu *v, v->processor, ) +sched_unlock(pcpu, unsigned int cpu, cpu, _irq) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irq) +#undef EXTRA_TYPE + +#define EXTRA_TYPE(arg) , unsigned long arg +#define spin_unlock_irqsave spin_unlock_irqrestore +sched_lock(pcpu, unsigned int cpu, cpu, _irqsave, *flags) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irqsave, *flags) +#undef spin_unlock_irqsave +sched_unlock(pcpu, unsigned int cpu, cpu, _irqrestore, flags) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irqrestore, flags) +#undef EXTRA_TYPE + +#undef sched_unlock +#undef sched_lock + +static inline spinlock_t *pcpu_schedule_trylock(unsigned int cpu) { - spinlock_t * lock; - - for ( ; ; ) - { - /* v->processor may change when grabbing the lock; but - * per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - * - * It may also be the case that v->processor may change - * but the lock may be the same; this will succeed - * in that case. - */ - lock=per_cpu(schedule_data, v->processor).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, v->processor).schedule_lock) ) - break; - spin_unlock(lock); - } -} - -#define vcpu_schedule_lock_irq(v) \ - do { local_irq_disable(); vcpu_schedule_lock(v); } while ( 0 ) -#define vcpu_schedule_lock_irqsave(v, flags) \ - do { local_irq_save(flags); vcpu_schedule_lock(v); } while ( 0 ) + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; -static inline void vcpu_schedule_unlock(struct vcpu *v) -{ - spin_unlock(per_cpu(schedule_data, v->processor).schedule_lock); + if ( !spin_trylock(lock) ) + return NULL; + if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) + return lock; + spin_unlock(lock); + return NULL; } -#define vcpu_schedule_unlock_irq(v) \ - do { vcpu_schedule_unlock(v); local_irq_enable(); } while ( 0 ) -#define vcpu_schedule_unlock_irqrestore(v, flags) \ - do { vcpu_schedule_unlock(v); local_irq_restore(flags); } while ( 0 ) - struct task_slice { struct vcpu *task; s_time_t time; -- 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 Nov 12 13:55:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55: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 1VgER6-0002TK-FU; Tue, 12 Nov 2013 13:55:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgER4-0002T3-Ep for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:18 +0000 Received: from [85.158.139.211:51137] by server-17.bemta-5.messagelabs.com id 83/F6-17059-54332825; Tue, 12 Nov 2013 13:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384264514!1518595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7938 invoked from network); 12 Nov 2013 13:55: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; 12 Nov 2013 13:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgER0-0002Qw-DR for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgER0-0004f1-7x for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:14 +0000 Date: Tue, 12 Nov 2013 13:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] scheduler: adjust internal locking 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 fbf12a33fe7cb54feb2d15cd970e910c92103e6c Author: Jan Beulich AuthorDate: Mon Nov 11 16:17:20 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:17:20 2013 +0100 scheduler: adjust internal locking interface Make the locking functions return the lock pointers, so they can be passed to the unlocking functions (which in turn can check that the lock is still actually providing the intended protection, i.e. the parameters determining which lock is the right one didn't change). Further use proper spin lock primitives rather than open coded local_irq_...() constructs, so that interrupts can be re-enabled as appropriate while spinning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: eedd60391610629b4e8a2e8278b857ff884f750d master date: 2013-10-14 08:57:56 +0200 --- xen/common/sched_credit.c | 11 ++- xen/common/sched_credit2.c | 22 ++++--- xen/common/sched_sedf.c | 29 ++++++---- xen/common/schedule.c | 61 ++++++++++---------- xen/include/xen/sched-if.h | 138 ++++++++++++++++++-------------------------- 5 files changed, 125 insertions(+), 136 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 24f70c6..7806b67 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1170,6 +1170,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) struct csched_pcpu * const spc = CSCHED_PCPU(cpu); struct list_head *runq, *elem, *next, *last_under; struct csched_vcpu *svc_elem; + spinlock_t *lock; unsigned long flags; int sort_epoch; @@ -1179,7 +1180,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) spc->runq_sort_last = sort_epoch; - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); runq = &spc->runq; elem = runq->next; @@ -1204,7 +1205,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) elem = next; } - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); } static void @@ -1568,7 +1569,9 @@ csched_load_balance(struct csched_private *prv, int cpu, * could cause a deadlock if the peer CPU is also load * balancing and trying to lock this CPU. */ - if ( !pcpu_schedule_trylock(peer_cpu) ) + spinlock_t *lock = pcpu_schedule_trylock(peer_cpu); + + if ( !lock ) { SCHED_STAT_CRANK(steal_trylock_failed); peer_cpu = cpumask_cycle(peer_cpu, &workers); @@ -1578,7 +1581,7 @@ csched_load_balance(struct csched_private *prv, int cpu, /* Any work over there to steal? */ speer = cpumask_test_cpu(peer_cpu, online) ? csched_runq_steal(peer_cpu, cpu, snext->pri, bstep) : NULL; - pcpu_schedule_unlock(peer_cpu); + pcpu_schedule_unlock(lock, peer_cpu); /* As soon as one vcpu is found, balancing ends */ if ( speer != NULL ) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 825ec98..46a991e 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -881,15 +881,17 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) */ if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + /* FIXME: Do we need the private lock here? */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); /* Add vcpu to runqueue of initial processor */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_assign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); sdom->nr_vcpus++; } @@ -916,14 +918,16 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + SCHED_STAT_CRANK(vcpu_destroy); /* Remove from runqueue */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_deassign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); /* Remove from sdom list. Don't need a lock for this, as it's called * syncronously when nothing else can happen. */ @@ -1010,8 +1014,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu * const svc = CSCHED_VCPU(vc); s_time_t now = NOW(); - - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); BUG_ON( !is_idle_vcpu(vc) && svc->rqd != RQD(ops, vc->processor)); @@ -1037,7 +1040,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) else if ( !is_idle_vcpu(vc) ) update_load(ops, svc->rqd, svc, -1, now); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); } #define MAX_LOAD (1ULL<<60); @@ -1454,14 +1457,14 @@ csched_dom_cntl( * must never lock csched_priv.lock if we're holding a runqueue lock. * Also, calling vcpu_schedule_lock() is enough, since IRQs have already * been disabled. */ - vcpu_schedule_lock(svc->vcpu); + spinlock_t *lock = vcpu_schedule_lock(svc->vcpu); BUG_ON(svc->rqd != RQD(ops, svc->vcpu->processor)); svc->weight = sdom->weight; update_max_weight(svc->rqd, svc->weight, old_weight); - vcpu_schedule_unlock(svc->vcpu); + vcpu_schedule_unlock(lock, svc->vcpu); } } } @@ -1991,6 +1994,7 @@ static void init_pcpu(const struct scheduler *ops, int cpu) cpumask_set_cpu(cpu, &rqd->idle); cpumask_set_cpu(cpu, &rqd->active); + /* _Not_ pcpu_schedule_unlock(): per_cpu().schedule_lock changed! */ spin_unlock(old_lock); cpumask_set_cpu(cpu, &prv->initialized); diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index d1812b6..7c24171 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -1350,14 +1350,16 @@ static int sedf_adjust_weights(struct cpupool *c, int nr_cpus, int *sumw, s_time if ( EDOM_INFO(p)->weight ) { /* Interrupts already off */ - vcpu_schedule_lock(p); + spinlock_t *lock = vcpu_schedule_lock(p); + EDOM_INFO(p)->period_orig = EDOM_INFO(p)->period = WEIGHT_PERIOD; EDOM_INFO(p)->slice_orig = EDOM_INFO(p)->slice = (EDOM_INFO(p)->weight * (WEIGHT_PERIOD - WEIGHT_SAFETY - sumt[cpu])) / sumw[cpu]; - vcpu_schedule_unlock(p); + + vcpu_schedule_unlock(lock, p); } } } @@ -1418,21 +1420,24 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen { /* (Here and everywhere in the following) IRQs are already off, * hence vcpu_spin_lock() is the one. */ - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->extraweight = op->u.sedf.weight; EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->slice = 0; EDOM_INFO(v)->period = WEIGHT_PERIOD; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else { /* Weight-driven domains with real-time execution */ - for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + for_each_vcpu ( p, v ) + { + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = op->u.sedf.weight; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } } @@ -1454,14 +1459,15 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen /* Time-driven domains */ for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->extraweight = 0; EDOM_INFO(v)->period_orig = EDOM_INFO(v)->period = op->u.sedf.period; EDOM_INFO(v)->slice_orig = EDOM_INFO(v)->slice = op->u.sedf.slice; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } @@ -1471,13 +1477,14 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->status = (EDOM_INFO(v)->status & ~EXTRA_AWARE) | (op->u.sedf.extratime & EXTRA_AWARE); EDOM_INFO(v)->latency = op->u.sedf.latency; extraq_check(v); - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else if ( op->cmd == XEN_DOMCTL_SCHEDOP_getinfo ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1ddfb22..95472ba 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -160,18 +160,16 @@ static inline void vcpu_runstate_change( void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate) { + spinlock_t *lock = likely(v == current) ? NULL : vcpu_schedule_lock_irq(v); s_time_t delta; - if ( unlikely(v != current) ) - vcpu_schedule_lock_irq(v); - memcpy(runstate, &v->runstate, sizeof(*runstate)); delta = NOW() - runstate->state_entry_time; if ( delta > 0 ) runstate->time[runstate->state] += delta; - if ( unlikely(v != current) ) - vcpu_schedule_unlock_irq(v); + if ( unlikely(lock != NULL) ) + vcpu_schedule_unlock_irq(lock, v); } uint64_t get_cpu_idle_time(unsigned int cpu) @@ -333,8 +331,7 @@ void sched_destroy_domain(struct domain *d) void vcpu_sleep_nosync(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(!vcpu_runnable(v)) ) { @@ -344,7 +341,7 @@ void vcpu_sleep_nosync(struct vcpu *v) SCHED_OP(VCPU2OP(v), sleep, v); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); } @@ -362,8 +359,7 @@ void vcpu_sleep_sync(struct vcpu *v) void vcpu_wake(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(vcpu_runnable(v)) ) { @@ -377,7 +373,7 @@ void vcpu_wake(struct vcpu *v) vcpu_runstate_change(v, RUNSTATE_offline, NOW()); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); } @@ -528,10 +524,11 @@ static void vcpu_migrate(struct vcpu *v) */ void vcpu_force_reschedule(struct vcpu *v) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); + if ( v->is_running ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); if ( test_bit(_VPF_migrating, &v->pause_flags) ) { @@ -546,7 +543,7 @@ void restore_vcpu_affinity(struct domain *d) for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); if ( v->affinity_broken ) { @@ -559,13 +556,13 @@ void restore_vcpu_affinity(struct domain *d) if ( v->processor == smp_processor_id() ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } } @@ -592,7 +589,7 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -613,13 +610,13 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } /* @@ -646,6 +643,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) { cpumask_t online_affinity; cpumask_t *online; + spinlock_t *lock; if ( v->domain->is_pinned ) return -EINVAL; @@ -654,7 +652,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) if ( cpumask_empty(&online_affinity) ) return -EINVAL; - vcpu_schedule_lock_irq(v); + lock = vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); @@ -662,7 +660,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) * when changing the affinity */ set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); domain_update_node_affinity(v->domain); @@ -776,10 +774,10 @@ static long do_poll(struct sched_poll *sched_poll) static long do_yield(void) { struct vcpu * v=current; + spinlock_t *lock = vcpu_schedule_lock_irq(v); - vcpu_schedule_lock_irq(v); SCHED_OP(VCPU2OP(v), yield, v); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); @@ -1140,6 +1138,7 @@ static void schedule(void) unsigned long *tasklet_work = &this_cpu(tasklet_work_to_do); bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; + spinlock_t *lock; struct task_slice next_slice; int cpu = smp_processor_id(); @@ -1166,7 +1165,7 @@ static void schedule(void) BUG(); } - pcpu_schedule_lock_irq(cpu); + lock = pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1183,7 +1182,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); trace_continue_running(next); return continue_running(prev); } @@ -1221,7 +1220,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_STAT_CRANK(sched_ctx); @@ -1408,6 +1407,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { unsigned long flags; struct vcpu *idle; + spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; struct scheduler *old_ops = per_cpu(scheduler, cpu); struct scheduler *new_ops = (c == NULL) ? &ops : c->sched; @@ -1426,7 +1426,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1437,7 +1437,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) SCHED_OP(new_ops, tick_resume, cpu); SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); @@ -1495,10 +1495,11 @@ void schedule_dump(struct cpupool *c) for_each_cpu (i, cpus) { - pcpu_schedule_lock(i); + spinlock_t *lock = pcpu_schedule_lock(i); + printk("CPU[%02d] ", i); SCHED_OP(sched, dump_cpu_state, i); - pcpu_schedule_unlock(i); + pcpu_schedule_unlock(lock, i); } } diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index ad4d80c..d95e254 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -47,96 +47,70 @@ DECLARE_PER_CPU(struct schedule_data, schedule_data); DECLARE_PER_CPU(struct scheduler *, scheduler); DECLARE_PER_CPU(struct cpupool *, cpupool); -static inline spinlock_t * pcpu_schedule_lock(int cpu) -{ - spinlock_t * lock=NULL; - - for ( ; ; ) - { - /* The per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - */ - lock=per_cpu(schedule_data, cpu).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) - break; - spin_unlock(lock); - } - return lock; +#define sched_lock(kind, param, cpu, irq, arg...) \ +static inline spinlock_t *kind##_schedule_lock##irq(param EXTRA_TYPE(arg)) \ +{ \ + for ( ; ; ) \ + { \ + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; \ + /* \ + * v->processor may change when grabbing the lock; but \ + * per_cpu(v->processor) may also change, if changing cpu pool \ + * also changes the scheduler lock. Retry until they match. \ + * \ + * It may also be the case that v->processor may change but the \ + * lock may be the same; this will succeed in that case. \ + */ \ + spin_lock##irq(lock, ## arg); \ + if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) \ + return lock; \ + spin_unlock##irq(lock, ## arg); \ + } \ } -static inline int pcpu_schedule_trylock(int cpu) -{ - spinlock_t * lock=NULL; - - lock=per_cpu(schedule_data, cpu).schedule_lock; - if ( ! spin_trylock(lock) ) - return 0; - if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) - return 1; - else - { - spin_unlock(lock); - return 0; - } -} - -#define pcpu_schedule_lock_irq(p) \ - do { local_irq_disable(); pcpu_schedule_lock(p); } while ( 0 ) -#define pcpu_schedule_lock_irqsave(p, flags) \ - do { local_irq_save(flags); pcpu_schedule_lock(p); } while ( 0 ) - -static inline void pcpu_schedule_unlock(int cpu) -{ - spin_unlock(per_cpu(schedule_data, cpu).schedule_lock); +#define sched_unlock(kind, param, cpu, irq, arg...) \ +static inline void kind##_schedule_unlock##irq(spinlock_t *lock \ + EXTRA_TYPE(arg), param) \ +{ \ + ASSERT(lock == per_cpu(schedule_data, cpu).schedule_lock); \ + spin_unlock##irq(lock, ## arg); \ } -#define pcpu_schedule_unlock_irq(p) \ - do { pcpu_schedule_unlock(p); local_irq_enable(); } while ( 0 ) -#define pcpu_schedule_unlock_irqrestore(p, flags) \ - do { pcpu_schedule_unlock(p); local_irq_restore(flags); } while ( 0 ) - -static inline void vcpu_schedule_lock(struct vcpu *v) +#define EXTRA_TYPE(arg) +sched_lock(pcpu, unsigned int cpu, cpu, ) +sched_lock(vcpu, const struct vcpu *v, v->processor, ) +sched_lock(pcpu, unsigned int cpu, cpu, _irq) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irq) +sched_unlock(pcpu, unsigned int cpu, cpu, ) +sched_unlock(vcpu, const struct vcpu *v, v->processor, ) +sched_unlock(pcpu, unsigned int cpu, cpu, _irq) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irq) +#undef EXTRA_TYPE + +#define EXTRA_TYPE(arg) , unsigned long arg +#define spin_unlock_irqsave spin_unlock_irqrestore +sched_lock(pcpu, unsigned int cpu, cpu, _irqsave, *flags) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irqsave, *flags) +#undef spin_unlock_irqsave +sched_unlock(pcpu, unsigned int cpu, cpu, _irqrestore, flags) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irqrestore, flags) +#undef EXTRA_TYPE + +#undef sched_unlock +#undef sched_lock + +static inline spinlock_t *pcpu_schedule_trylock(unsigned int cpu) { - spinlock_t * lock; - - for ( ; ; ) - { - /* v->processor may change when grabbing the lock; but - * per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - * - * It may also be the case that v->processor may change - * but the lock may be the same; this will succeed - * in that case. - */ - lock=per_cpu(schedule_data, v->processor).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, v->processor).schedule_lock) ) - break; - spin_unlock(lock); - } -} - -#define vcpu_schedule_lock_irq(v) \ - do { local_irq_disable(); vcpu_schedule_lock(v); } while ( 0 ) -#define vcpu_schedule_lock_irqsave(v, flags) \ - do { local_irq_save(flags); vcpu_schedule_lock(v); } while ( 0 ) + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; -static inline void vcpu_schedule_unlock(struct vcpu *v) -{ - spin_unlock(per_cpu(schedule_data, v->processor).schedule_lock); + if ( !spin_trylock(lock) ) + return NULL; + if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) + return lock; + spin_unlock(lock); + return NULL; } -#define vcpu_schedule_unlock_irq(v) \ - do { vcpu_schedule_unlock(v); local_irq_enable(); } while ( 0 ) -#define vcpu_schedule_unlock_irqrestore(v, flags) \ - do { vcpu_schedule_unlock(v); local_irq_restore(flags); } while ( 0 ) - struct task_slice { struct vcpu *task; s_time_t time; -- 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 Nov 12 13:55:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERF-0002Uf-IT; Tue, 12 Nov 2013 13: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 1VgERD-0002UO-IL for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:27 +0000 Received: from [85.158.139.211:9379] by server-15.bemta-5.messagelabs.com id 35/C6-17574-E4332825; Tue, 12 Nov 2013 13:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384264524!1526613!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20835 invoked from network); 12 Nov 2013 13:55:25 -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; 12 Nov 2013 13:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERA-0002R2-Ly for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERA-0004fP-GT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:24 +0000 Date: Tue, 12 Nov 2013 13:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix locking in cpu_disable_scheduler() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 836ac327ac02f726a655444588df51f51484aebe Author: Jan Beulich AuthorDate: Mon Nov 11 16:18:39 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:18:39 2013 +0100 fix locking in cpu_disable_scheduler() So commit eedd6039 ("scheduler: adjust internal locking interface") uncovered - by now using proper spin lock constructs - a bug after all: When bringing down a CPU, cpu_disable_scheduler() gets called with interrupts disabled, and hence the use of vcpu_schedule_lock_irq() was never really correct (i.e. the caller ended up with interrupts enabled despite having disabled them explicitly). Fixing this however surfaced another problem: The call path vcpu_migrate() -> evtchn_move_pirqs() wants to acquire the event lock, which however is a non-IRQ-safe once, and hence check_lock() doesn't like this lock to be acquired when interrupts are already off. As we're in stop-machine context here, getting things wrong wrt interrupt state management during lock acquire/release is out of question though, so the simple solution to this appears to be to just suppress spin lock debugging for the period of time while the stop machine callback gets run. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 41a0cc9e26160a89245c9ba3233e3f70bf9cd4b4 master date: 2013-10-29 09:57:14 +0100 --- xen/common/schedule.c | 9 ++++----- xen/common/stop_machine.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 95472ba..4528400 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -589,7 +589,8 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - spinlock_t *lock = vcpu_schedule_lock_irq(v); + unsigned long flags; + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -610,14 +611,12 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(lock, v); + vcpu_schedule_unlock_irqrestore(lock, flags, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else - { - vcpu_schedule_unlock_irq(lock, v); - } + vcpu_schedule_unlock_irqrestore(lock, flags, v); /* * A vcpu active in the hypervisor will not be migratable. diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c index 0590504..932e5a7 100644 --- a/xen/common/stop_machine.c +++ b/xen/common/stop_machine.c @@ -110,6 +110,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) local_irq_disable(); stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); stopmachine_wait_state(); + spin_debug_disable(); stopmachine_set_state(STOPMACHINE_INVOKE); if ( (cpu == smp_processor_id()) || (cpu == NR_CPUS) ) @@ -117,6 +118,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) stopmachine_wait_state(); ret = stopmachine_data.fn_result; + spin_debug_enable(); stopmachine_set_state(STOPMACHINE_EXIT); stopmachine_wait_state(); local_irq_enable(); -- 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 Nov 12 13:55:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERF-0002Uf-IT; Tue, 12 Nov 2013 13: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 1VgERD-0002UO-IL for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:27 +0000 Received: from [85.158.139.211:9379] by server-15.bemta-5.messagelabs.com id 35/C6-17574-E4332825; Tue, 12 Nov 2013 13:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384264524!1526613!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20835 invoked from network); 12 Nov 2013 13:55:25 -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; 12 Nov 2013 13:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERA-0002R2-Ly for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERA-0004fP-GT for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:24 +0000 Date: Tue, 12 Nov 2013 13:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix locking in cpu_disable_scheduler() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 836ac327ac02f726a655444588df51f51484aebe Author: Jan Beulich AuthorDate: Mon Nov 11 16:18:39 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:18:39 2013 +0100 fix locking in cpu_disable_scheduler() So commit eedd6039 ("scheduler: adjust internal locking interface") uncovered - by now using proper spin lock constructs - a bug after all: When bringing down a CPU, cpu_disable_scheduler() gets called with interrupts disabled, and hence the use of vcpu_schedule_lock_irq() was never really correct (i.e. the caller ended up with interrupts enabled despite having disabled them explicitly). Fixing this however surfaced another problem: The call path vcpu_migrate() -> evtchn_move_pirqs() wants to acquire the event lock, which however is a non-IRQ-safe once, and hence check_lock() doesn't like this lock to be acquired when interrupts are already off. As we're in stop-machine context here, getting things wrong wrt interrupt state management during lock acquire/release is out of question though, so the simple solution to this appears to be to just suppress spin lock debugging for the period of time while the stop machine callback gets run. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 41a0cc9e26160a89245c9ba3233e3f70bf9cd4b4 master date: 2013-10-29 09:57:14 +0100 --- xen/common/schedule.c | 9 ++++----- xen/common/stop_machine.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 95472ba..4528400 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -589,7 +589,8 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - spinlock_t *lock = vcpu_schedule_lock_irq(v); + unsigned long flags; + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -610,14 +611,12 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(lock, v); + vcpu_schedule_unlock_irqrestore(lock, flags, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else - { - vcpu_schedule_unlock_irq(lock, v); - } + vcpu_schedule_unlock_irqrestore(lock, flags, v); /* * A vcpu active in the hypervisor will not be migratable. diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c index 0590504..932e5a7 100644 --- a/xen/common/stop_machine.c +++ b/xen/common/stop_machine.c @@ -110,6 +110,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) local_irq_disable(); stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); stopmachine_wait_state(); + spin_debug_disable(); stopmachine_set_state(STOPMACHINE_INVOKE); if ( (cpu == smp_processor_id()) || (cpu == NR_CPUS) ) @@ -117,6 +118,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) stopmachine_wait_state(); ret = stopmachine_data.fn_result; + spin_debug_enable(); stopmachine_set_state(STOPMACHINE_EXIT); stopmachine_wait_state(); local_irq_enable(); -- 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 Nov 12 13:55:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERO-0002WG-Mt; Tue, 12 Nov 2013 13:55:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERN-0002W2-K5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:37 +0000 Received: from [85.158.143.35:40205] by server-1.bemta-4.messagelabs.com id B6/81-17304-85332825; Tue, 12 Nov 2013 13:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384264535!2673939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9013 invoked from network); 12 Nov 2013 13:55:36 -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 Nov 2013 13:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERL-0002RB-0V for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERK-0004gP-P5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:34 +0000 Date: Tue, 12 Nov 2013 13:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched: fix race between sched_move_domain() and vcpu_wake() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da128be2c55e3f60dd025ff7480396bd74a5a12d Author: David Vrabel AuthorDate: Mon Nov 11 16:19:36 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:19:36 2013 +0100 sched: fix race between sched_move_domain() and vcpu_wake() sched_move_domain() changes v->processor for all the domain's VCPUs. If another domain, softirq etc. triggers a simultaneous call to vcpu_wake() (e.g., by setting an event channel as pending), then vcpu_wake() may lock one schedule lock and try to unlock another. vcpu_schedule_lock() attempts to handle this but only does so for the window between reading the schedule_lock from the per-CPU data and the spin_lock() call. This does not help with sched_move_domain() changing v->processor between the calls to vcpu_schedule_lock() and vcpu_schedule_unlock(). Fix the race by taking the schedule_lock for v->processor in sched_move_domain(). Signed-off-by: David Vrabel Acked-by: Juergen Gross Use vcpu_schedule_lock_irq() (which now returns the lock) to properly retry the locking should the to be used lock have changed in the course of acquiring it (issue pointed out by George Dunlap). Add a comment explaining the state after the v->processor adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: ef55257bc81204e34691f1c2aa9e01f2d0768bdd master date: 2013-10-14 08:58:31 +0200 --- xen/common/schedule.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 4528400..def568b 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -276,6 +276,8 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + spinlock_t *lock; + vcpudata = v->sched_priv; migrate_timer(&v->periodic_timer, new_p); @@ -283,7 +285,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) migrate_timer(&v->poll_timer, new_p); cpumask_setall(v->cpu_affinity); + + lock = vcpu_schedule_lock_irq(v); v->processor = new_p; + /* + * With v->processor modified we must not + * - make any further changes assuming we hold the scheduler lock, + * - use vcpu_schedule_unlock_irq(). + */ + spin_unlock_irq(lock); + v->sched_priv = vcpu_priv[v->vcpu_id]; evtchn_move_pirqs(v); -- 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 Nov 12 13:55:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERO-0002WG-Mt; Tue, 12 Nov 2013 13:55:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERN-0002W2-K5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:37 +0000 Received: from [85.158.143.35:40205] by server-1.bemta-4.messagelabs.com id B6/81-17304-85332825; Tue, 12 Nov 2013 13:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384264535!2673939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9013 invoked from network); 12 Nov 2013 13:55:36 -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 Nov 2013 13:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERL-0002RB-0V for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERK-0004gP-P5 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:34 +0000 Date: Tue, 12 Nov 2013 13:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] sched: fix race between sched_move_domain() and vcpu_wake() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da128be2c55e3f60dd025ff7480396bd74a5a12d Author: David Vrabel AuthorDate: Mon Nov 11 16:19:36 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:19:36 2013 +0100 sched: fix race between sched_move_domain() and vcpu_wake() sched_move_domain() changes v->processor for all the domain's VCPUs. If another domain, softirq etc. triggers a simultaneous call to vcpu_wake() (e.g., by setting an event channel as pending), then vcpu_wake() may lock one schedule lock and try to unlock another. vcpu_schedule_lock() attempts to handle this but only does so for the window between reading the schedule_lock from the per-CPU data and the spin_lock() call. This does not help with sched_move_domain() changing v->processor between the calls to vcpu_schedule_lock() and vcpu_schedule_unlock(). Fix the race by taking the schedule_lock for v->processor in sched_move_domain(). Signed-off-by: David Vrabel Acked-by: Juergen Gross Use vcpu_schedule_lock_irq() (which now returns the lock) to properly retry the locking should the to be used lock have changed in the course of acquiring it (issue pointed out by George Dunlap). Add a comment explaining the state after the v->processor adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: ef55257bc81204e34691f1c2aa9e01f2d0768bdd master date: 2013-10-14 08:58:31 +0200 --- xen/common/schedule.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 4528400..def568b 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -276,6 +276,8 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + spinlock_t *lock; + vcpudata = v->sched_priv; migrate_timer(&v->periodic_timer, new_p); @@ -283,7 +285,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) migrate_timer(&v->poll_timer, new_p); cpumask_setall(v->cpu_affinity); + + lock = vcpu_schedule_lock_irq(v); v->processor = new_p; + /* + * With v->processor modified we must not + * - make any further changes assuming we hold the scheduler lock, + * - use vcpu_schedule_unlock_irq(). + */ + spin_unlock_irq(lock); + v->sched_priv = vcpu_priv[v->vcpu_id]; evtchn_move_pirqs(v); -- 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 Nov 12 13:55:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERZ-0002Zw-Do; Tue, 12 Nov 2013 13:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERX-0002ZF-Ma for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:47 +0000 Received: from [193.109.254.147:25586] by server-7.bemta-14.messagelabs.com id EF/4B-14870-36332825; Tue, 12 Nov 2013 13:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384264545!2200859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29430 invoked from network); 12 Nov 2013 13:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERV-0002RK-6R for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERV-0004gl-4J for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:45 +0000 Date: Tue, 12 Nov 2013 13:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] credit: unpause parked vcpu before destroying 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 6dd29df224cdf4c14824b32b6a48747811aa456a Author: Juergen Gross AuthorDate: Mon Nov 11 16:20:14 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:20:14 2013 +0100 credit: unpause parked vcpu before destroying it A capped out vcpu must be unpaused in case of moving it to another cpupool, otherwise it will be paused forever. Signed-off-by: Juergen Gross Acked-by: George Dunlap master commit: d38a668b6ef8c84d1d3fda9947ffb0056d01fe3a master date: 2013-10-16 12:26:48 +0200 --- xen/common/sched_credit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7806b67..98f5296 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -931,6 +931,12 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) SCHED_STAT_CRANK(vcpu_destroy); + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) + { + SCHED_STAT_CRANK(vcpu_unpark); + vcpu_unpause(svc->vcpu); + } + if ( __vcpu_on_runq(svc) ) __runq_remove(svc); -- 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 Nov 12 13:55:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERZ-0002Zw-Do; Tue, 12 Nov 2013 13:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERX-0002ZF-Ma for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:47 +0000 Received: from [193.109.254.147:25586] by server-7.bemta-14.messagelabs.com id EF/4B-14870-36332825; Tue, 12 Nov 2013 13:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384264545!2200859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29430 invoked from network); 12 Nov 2013 13:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERV-0002RK-6R for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERV-0004gl-4J for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:45 +0000 Date: Tue, 12 Nov 2013 13:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] credit: unpause parked vcpu before destroying 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 6dd29df224cdf4c14824b32b6a48747811aa456a Author: Juergen Gross AuthorDate: Mon Nov 11 16:20:14 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:20:14 2013 +0100 credit: unpause parked vcpu before destroying it A capped out vcpu must be unpaused in case of moving it to another cpupool, otherwise it will be paused forever. Signed-off-by: Juergen Gross Acked-by: George Dunlap master commit: d38a668b6ef8c84d1d3fda9947ffb0056d01fe3a master date: 2013-10-16 12:26:48 +0200 --- xen/common/sched_credit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7806b67..98f5296 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -931,6 +931,12 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) SCHED_STAT_CRANK(vcpu_destroy); + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) + { + SCHED_STAT_CRANK(vcpu_unpark); + vcpu_unpause(svc->vcpu); + } + if ( __vcpu_on_runq(svc) ) __runq_remove(svc); -- 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 Nov 12 13:56:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:56: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 1VgERj-0002cx-Gg; Tue, 12 Nov 2013 13:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERh-0002cJ-Oq for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:57 +0000 Received: from [193.109.254.147:14719] by server-5.bemta-14.messagelabs.com id F3/5D-13525-D6332825; Tue, 12 Nov 2013 13:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384264555!2241124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19557 invoked from network); 12 Nov 2013 13:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERf-0002RZ-An for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERf-0004hD-92 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:55 +0000 Date: Tue, 12 Nov 2013 13:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: print relevant (tail) part of filename for warnings and crashes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a002c8491b8dcc81633f1f9b0177c2b44593ba89 Author: Jan Beulich AuthorDate: Mon Nov 11 16:20:51 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:20:51 2013 +0100 x86: print relevant (tail) part of filename for warnings and crashes In particular when the origin construct is in a header file (and hence the file name is an absolute path instead of just the file name portion) the information can otherwise become rather useless when the build tree isn't sitting relatively close to the file system root. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f72cb6bbc10348f4f7671428e5db509731e9e6a5 master date: 2013-10-17 11:35:26 +0200 --- xen/arch/x86/traps.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index adc5009..fec382b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -953,7 +953,7 @@ void do_invalid_op(struct cpu_user_regs *regs) { struct bug_frame bug; struct bug_frame_str bug_str; - const char *p, *filename, *predicate, *eip = (char *)regs->eip; + const char *p, *prefix = "", *filename, *predicate, *eip = (char *)regs->eip; unsigned long fixup; int id, lineno; @@ -995,12 +995,19 @@ void do_invalid_op(struct cpu_user_regs *regs) } /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ - filename = p; + fixup = strlen(p); + if ( fixup > 50 ) + { + filename = p + fixup - 47; + prefix = "..."; + } + else + filename = p; lineno = bug.id >> 2; if ( id == BUGFRAME_warn ) { - printk("Xen WARN at %.50s:%d\n", filename, lineno); + printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno); show_execution_state(regs); regs->eip = (unsigned long)eip; return; @@ -1008,10 +1015,10 @@ void do_invalid_op(struct cpu_user_regs *regs) if ( id == BUGFRAME_bug ) { - printk("Xen BUG at %.50s:%d\n", filename, lineno); + printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); DEBUGGER_trap_fatal(TRAP_invalid_op, regs); show_execution_state(regs); - panic("Xen BUG at %.50s:%d\n", filename, lineno); + panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno); } /* ASSERT: decode the predicate string pointer. */ @@ -1025,12 +1032,12 @@ void do_invalid_op(struct cpu_user_regs *regs) if ( !is_kernel(predicate) ) predicate = ""; - printk("Assertion '%s' failed at %.50s:%d\n", - predicate, filename, lineno); + printk("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); DEBUGGER_trap_fatal(TRAP_invalid_op, regs); show_execution_state(regs); - panic("Assertion '%s' failed at %.50s:%d\n", - predicate, filename, lineno); + panic("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); die: if ( (fixup = search_exception_table(regs->eip)) != 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 Tue Nov 12 13:56:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 13:56: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 1VgERj-0002cx-Gg; Tue, 12 Nov 2013 13:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERh-0002cJ-Oq for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:57 +0000 Received: from [193.109.254.147:14719] by server-5.bemta-14.messagelabs.com id F3/5D-13525-D6332825; Tue, 12 Nov 2013 13:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384264555!2241124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19557 invoked from network); 12 Nov 2013 13:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 13:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgERf-0002RZ-An for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgERf-0004hD-92 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 13:55:55 +0000 Date: Tue, 12 Nov 2013 13:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: print relevant (tail) part of filename for warnings and crashes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a002c8491b8dcc81633f1f9b0177c2b44593ba89 Author: Jan Beulich AuthorDate: Mon Nov 11 16:20:51 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 11 16:20:51 2013 +0100 x86: print relevant (tail) part of filename for warnings and crashes In particular when the origin construct is in a header file (and hence the file name is an absolute path instead of just the file name portion) the information can otherwise become rather useless when the build tree isn't sitting relatively close to the file system root. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: f72cb6bbc10348f4f7671428e5db509731e9e6a5 master date: 2013-10-17 11:35:26 +0200 --- xen/arch/x86/traps.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index adc5009..fec382b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -953,7 +953,7 @@ void do_invalid_op(struct cpu_user_regs *regs) { struct bug_frame bug; struct bug_frame_str bug_str; - const char *p, *filename, *predicate, *eip = (char *)regs->eip; + const char *p, *prefix = "", *filename, *predicate, *eip = (char *)regs->eip; unsigned long fixup; int id, lineno; @@ -995,12 +995,19 @@ void do_invalid_op(struct cpu_user_regs *regs) } /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ - filename = p; + fixup = strlen(p); + if ( fixup > 50 ) + { + filename = p + fixup - 47; + prefix = "..."; + } + else + filename = p; lineno = bug.id >> 2; if ( id == BUGFRAME_warn ) { - printk("Xen WARN at %.50s:%d\n", filename, lineno); + printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno); show_execution_state(regs); regs->eip = (unsigned long)eip; return; @@ -1008,10 +1015,10 @@ void do_invalid_op(struct cpu_user_regs *regs) if ( id == BUGFRAME_bug ) { - printk("Xen BUG at %.50s:%d\n", filename, lineno); + printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); DEBUGGER_trap_fatal(TRAP_invalid_op, regs); show_execution_state(regs); - panic("Xen BUG at %.50s:%d\n", filename, lineno); + panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno); } /* ASSERT: decode the predicate string pointer. */ @@ -1025,12 +1032,12 @@ void do_invalid_op(struct cpu_user_regs *regs) if ( !is_kernel(predicate) ) predicate = ""; - printk("Assertion '%s' failed at %.50s:%d\n", - predicate, filename, lineno); + printk("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); DEBUGGER_trap_fatal(TRAP_invalid_op, regs); show_execution_state(regs); - panic("Assertion '%s' failed at %.50s:%d\n", - predicate, filename, lineno); + panic("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); die: if ( (fixup = search_exception_table(regs->eip)) != 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 Tue Nov 12 15:44:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 15:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8N-0003Zs-Ia; Tue, 12 Nov 2013 15:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8L-0003Zg-1b for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:06 +0000 Received: from [193.109.254.147:49474] by server-9.bemta-14.messagelabs.com id 3F/44-08751-4CC42825; Tue, 12 Nov 2013 15:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384271042!2254289!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20402 invoked from network); 12 Nov 2013 15:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 15:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8I-0003lj-Nv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgG8I-0007ue-Hs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:02 +0000 Date: Tue, 12 Nov 2013 15:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-traditional: do not strip binaries during make install X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18a08a23da88863435d56a0b14ff72013ef3b003 Author: Olaf Hering AuthorDate: Tue Oct 15 11:42:26 2013 +0200 Commit: Ian Jackson CommitDate: Tue Oct 15 15:42:16 2013 +0100 qemu-traditional: do not strip binaries during make install It is wrong to strip code during make install, unless explicit requested. Introduce a new variable INSTALL_PROG and use it along with an optional STRIP_OPT where currently install -s -m 755 is used. This is what upstream qemu offers in version 1.6. Signed-off-by: Olaf Hering --- Makefile | 2 +- Makefile.target | 2 +- configure | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 37c7066..ed9b28a 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" diff --git a/Makefile.target b/Makefile.target index 19bb0fd..3c3db2b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -755,7 +755,7 @@ clean: install: all install-hook ifneq ($(PROGS),) - $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)" endif # Include automatically generated dependency files diff --git a/configure b/configure index ace3c3e..4547359 100755 --- a/configure +++ b/configure @@ -1215,6 +1215,7 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h echo "MAKE=$make" >> $config_mak echo "INSTALL=$install" >> $config_mak +echo "INSTALL_PROG=$install -m 0755" >> $config_mak echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 15:44:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 15:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8W-0003aY-LN; Tue, 12 Nov 2013 15:44:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8V-0003aP-Kw for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:15 +0000 Received: from [193.109.254.147:54531] by server-2.bemta-14.messagelabs.com id 20/E9-08076-FCC42825; Tue, 12 Nov 2013 15:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384271053!2286906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16548 invoked from network); 12 Nov 2013 15:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 15:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8S-0003lm-UZ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgG8S-0007v3-Qa for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:12 +0000 Date: Tue, 12 Nov 2013 15:44:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 832f9bde25542961ea4f768be6e00e4801484e3a Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Tue Nov 12 15:40:38 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 15:44:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 15:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8N-0003Zs-Ia; Tue, 12 Nov 2013 15:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8L-0003Zg-1b for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:06 +0000 Received: from [193.109.254.147:49474] by server-9.bemta-14.messagelabs.com id 3F/44-08751-4CC42825; Tue, 12 Nov 2013 15:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384271042!2254289!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20402 invoked from network); 12 Nov 2013 15:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 15:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8I-0003lj-Nv for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgG8I-0007ue-Hs for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:02 +0000 Date: Tue, 12 Nov 2013 15:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-traditional: do not strip binaries during make install X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18a08a23da88863435d56a0b14ff72013ef3b003 Author: Olaf Hering AuthorDate: Tue Oct 15 11:42:26 2013 +0200 Commit: Ian Jackson CommitDate: Tue Oct 15 15:42:16 2013 +0100 qemu-traditional: do not strip binaries during make install It is wrong to strip code during make install, unless explicit requested. Introduce a new variable INSTALL_PROG and use it along with an optional STRIP_OPT where currently install -s -m 755 is used. This is what upstream qemu offers in version 1.6. Signed-off-by: Olaf Hering --- Makefile | 2 +- Makefile.target | 2 +- configure | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 37c7066..ed9b28a 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" diff --git a/Makefile.target b/Makefile.target index 19bb0fd..3c3db2b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -755,7 +755,7 @@ clean: install: all install-hook ifneq ($(PROGS),) - $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)" endif # Include automatically generated dependency files diff --git a/configure b/configure index ace3c3e..4547359 100755 --- a/configure +++ b/configure @@ -1215,6 +1215,7 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h echo "MAKE=$make" >> $config_mak echo "INSTALL=$install" >> $config_mak +echo "INSTALL_PROG=$install -m 0755" >> $config_mak echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 15:44:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 15:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8W-0003aY-LN; Tue, 12 Nov 2013 15:44:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8V-0003aP-Kw for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:15 +0000 Received: from [193.109.254.147:54531] by server-2.bemta-14.messagelabs.com id 20/E9-08076-FCC42825; Tue, 12 Nov 2013 15:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384271053!2286906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16548 invoked from network); 12 Nov 2013 15:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 15:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgG8S-0003lm-UZ for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgG8S-0007v3-Qa for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 15:44:12 +0000 Date: Tue, 12 Nov 2013 15:44:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 832f9bde25542961ea4f768be6e00e4801484e3a Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Tue Nov 12 15:40:38 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 12 22:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 22:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrX-0008PC-Ds; Tue, 12 Nov 2013 22:55:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrS-0008Oy-B7 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:09 +0000 Received: from [193.109.254.147:11905] by server-15.bemta-14.messagelabs.com id 47/85-06807-9C1B2825; Tue, 12 Nov 2013 22:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384296903!2344452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7410 invoked from network); 12 Nov 2013 22:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 22:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrP-0000cz-62 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgMrO-0003ij-Ps for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:02 +0000 Date: Tue, 12 Nov 2013 22:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/migrate: Fix regression when migrating from older version of Xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be2f2316f11d56555a37873d3f53bb3f46dec856 Author: Andrew Cooper AuthorDate: Thu Oct 10 14:56:32 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 15:05:55 2013 +0000 tools/migrate: Fix regression when migrating from older version of Xen Commit 00a4b65f8534c9e6521eab2e6ce796ae36037774 Sep 7 2010 "libxc: provide notification of final checkpoint to restore end" broke migration from any version of Xen using tools from prior to that commit Older tools have no idea about an XC_SAVE_ID_LAST_CHECKPOINT, causing newer tools xc_domain_restore() to start reading the qemu save record, as ctx->last_checkpoint is 0. The failure looks like: xc: error: Max batch size exceeded (1970103633). Giving up. where 1970103633 = 0x756d6551 = *(uint32_t*)"Qemu" With this fix in place, the behaviour for normal migrations is reverted to how it was before the regression; the migration is considered non-checkpointed right from the start. A XC_SAVE_ID_LAST_CHECKPOINT chunk seen in the migration stream is a nop. For checkpointed migrations the behaviour is unchanged. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson Acked-by: Shriram Rajagopalan (Remus bits) master commit: 7051d5c872e3e708b2d4b2088215d6ab1b33de1b master date: Thu, 10 Oct 2013 11:28:21 +0000 Backport to Xen-4.3: As remus was not a supported feature in libxl in 4.3 and earlier, this backport hardcodes a non-checkpointed stream from libxl, removing the need to any playing around with the IDL and API. Signed-off-by: Andrew Cooper CC: Ian Jackson --- tools/libxc/xc_domain_restore.c | 3 ++- tools/libxc/xc_nomigrate.c | 2 +- tools/libxc/xenguest.h | 3 ++- tools/libxl/libxl_save_helper.c | 2 +- tools/python/xen/xend/XendCheckpoint.py | 2 +- tools/xcutils/xc_restore.c | 14 +++++++++----- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 63d36cd..297546c 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1401,7 +1401,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks) { @@ -1472,6 +1472,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, ctx->superpages = superpages; ctx->hvm = hvm; + ctx->last_checkpoint = !checkpointed_stream; ctxt = xc_hypercall_buffer_alloc(xch, ctxt, sizeof(*ctxt)); diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c index 73e7566..fb6d53e 100644 --- a/tools/libxc/xc_nomigrate.c +++ b/tools/libxc/xc_nomigrate.c @@ -35,7 +35,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks) { diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 4714bd2..2101810 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -114,6 +114,7 @@ struct restore_callbacks { * @parm pae non-zero if this HVM domain has PAE support enabled * @parm superpages non-zero to allocate guest memory with superpages * @parm no_incr_generationid non-zero if generation id is NOT to be incremented + * @parm checkpointed_stream non-zero if the far end of the stream is using checkpointing * @parm vm_generationid_addr returned with the address of the generation id buffer * @parm callbacks non-NULL to receive a callback to restore toolstack * specific data @@ -124,7 +125,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks); /** diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 772251a..8f14b8b 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -264,7 +264,7 @@ int main(int argc, char **argv) r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, - no_incr_genidad, &genidad, + no_incr_genidad, 0, &genidad, &helper_restore_callbacks); helper_stub_restore_results(store_mfn,console_mfn,genidad,0); complete(r); diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index fa09757..a433ffa 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -301,7 +301,7 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE), fd, dominfo.getDomid(), - store_port, console_port, int(is_hvm), pae, apic, superpages]) + store_port, console_port, int(is_hvm), pae, apic, superpages, 1]) log.debug("[xc_restore]: %s", string.join(cmd)) handler = RestoreInputHandler() diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index 35d725c..5ec90ac 100644 --- a/tools/xcutils/xc_restore.c +++ b/tools/xcutils/xc_restore.c @@ -19,7 +19,7 @@ int main(int argc, char **argv) { unsigned int domid, store_evtchn, console_evtchn; - unsigned int hvm, pae, apic, lflags; + unsigned int hvm, pae, apic, lflags, checkpointed; xc_interface *xch; int io_fd, ret; int superpages; @@ -27,9 +27,9 @@ main(int argc, char **argv) xentoollog_level lvl; xentoollog_logger *l; - if ( (argc != 8) && (argc != 9) ) + if ( !( argc >= 8 && argc <= 10) ) errx(1, "usage: %s iofd domid store_evtchn " - "console_evtchn hvm pae apic [superpages]", argv[0]); + "console_evtchn hvm pae apic [superpages [checkpointed]]", argv[0]); lvl = XTL_DETAIL; lflags = XTL_STDIOSTREAM_SHOW_PID | XTL_STDIOSTREAM_HIDE_PROGRESS; @@ -45,14 +45,18 @@ main(int argc, char **argv) hvm = atoi(argv[5]); pae = atoi(argv[6]); apic = atoi(argv[7]); - if ( argc == 9 ) + if ( argc >= 9 ) superpages = atoi(argv[8]); else superpages = !!hvm; + if ( argc >= 10 ) + checkpointed = atoi(argv[9]); + else + checkpointed = 0; ret = xc_domain_restore(xch, io_fd, domid, store_evtchn, &store_mfn, 0, console_evtchn, &console_mfn, 0, hvm, pae, superpages, - 0, NULL, NULL); + 0, checkpointed, NULL, NULL); if ( ret == 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 Tue Nov 12 22:55:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Nov 2013 22:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrX-0008PC-Ds; Tue, 12 Nov 2013 22:55:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrS-0008Oy-B7 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:09 +0000 Received: from [193.109.254.147:11905] by server-15.bemta-14.messagelabs.com id 47/85-06807-9C1B2825; Tue, 12 Nov 2013 22:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384296903!2344452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7410 invoked from network); 12 Nov 2013 22:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2013 22:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgMrP-0000cz-62 for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgMrO-0003ij-Ps for xen-changelog@lists.xensource.com; Tue, 12 Nov 2013 22:55:02 +0000 Date: Tue, 12 Nov 2013 22:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/migrate: Fix regression when migrating from older version of Xen X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be2f2316f11d56555a37873d3f53bb3f46dec856 Author: Andrew Cooper AuthorDate: Thu Oct 10 14:56:32 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 15:05:55 2013 +0000 tools/migrate: Fix regression when migrating from older version of Xen Commit 00a4b65f8534c9e6521eab2e6ce796ae36037774 Sep 7 2010 "libxc: provide notification of final checkpoint to restore end" broke migration from any version of Xen using tools from prior to that commit Older tools have no idea about an XC_SAVE_ID_LAST_CHECKPOINT, causing newer tools xc_domain_restore() to start reading the qemu save record, as ctx->last_checkpoint is 0. The failure looks like: xc: error: Max batch size exceeded (1970103633). Giving up. where 1970103633 = 0x756d6551 = *(uint32_t*)"Qemu" With this fix in place, the behaviour for normal migrations is reverted to how it was before the regression; the migration is considered non-checkpointed right from the start. A XC_SAVE_ID_LAST_CHECKPOINT chunk seen in the migration stream is a nop. For checkpointed migrations the behaviour is unchanged. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson Acked-by: Shriram Rajagopalan (Remus bits) master commit: 7051d5c872e3e708b2d4b2088215d6ab1b33de1b master date: Thu, 10 Oct 2013 11:28:21 +0000 Backport to Xen-4.3: As remus was not a supported feature in libxl in 4.3 and earlier, this backport hardcodes a non-checkpointed stream from libxl, removing the need to any playing around with the IDL and API. Signed-off-by: Andrew Cooper CC: Ian Jackson --- tools/libxc/xc_domain_restore.c | 3 ++- tools/libxc/xc_nomigrate.c | 2 +- tools/libxc/xenguest.h | 3 ++- tools/libxl/libxl_save_helper.c | 2 +- tools/python/xen/xend/XendCheckpoint.py | 2 +- tools/xcutils/xc_restore.c | 14 +++++++++----- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 63d36cd..297546c 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1401,7 +1401,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks) { @@ -1472,6 +1472,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, ctx->superpages = superpages; ctx->hvm = hvm; + ctx->last_checkpoint = !checkpointed_stream; ctxt = xc_hypercall_buffer_alloc(xch, ctxt, sizeof(*ctxt)); diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c index 73e7566..fb6d53e 100644 --- a/tools/libxc/xc_nomigrate.c +++ b/tools/libxc/xc_nomigrate.c @@ -35,7 +35,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks) { diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 4714bd2..2101810 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -114,6 +114,7 @@ struct restore_callbacks { * @parm pae non-zero if this HVM domain has PAE support enabled * @parm superpages non-zero to allocate guest memory with superpages * @parm no_incr_generationid non-zero if generation id is NOT to be incremented + * @parm checkpointed_stream non-zero if the far end of the stream is using checkpointing * @parm vm_generationid_addr returned with the address of the generation id buffer * @parm callbacks non-NULL to receive a callback to restore toolstack * specific data @@ -124,7 +125,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, domid_t store_domid, unsigned int console_evtchn, unsigned long *console_mfn, domid_t console_domid, unsigned int hvm, unsigned int pae, int superpages, - int no_incr_generationid, + int no_incr_generationid, int checkpointed_stream, unsigned long *vm_generationid_addr, struct restore_callbacks *callbacks); /** diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 772251a..8f14b8b 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -264,7 +264,7 @@ int main(int argc, char **argv) r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, - no_incr_genidad, &genidad, + no_incr_genidad, 0, &genidad, &helper_restore_callbacks); helper_stub_restore_results(store_mfn,console_mfn,genidad,0); complete(r); diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index fa09757..a433ffa 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -301,7 +301,7 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False): cmd = map(str, [xen.util.auxbin.pathTo(XC_RESTORE), fd, dominfo.getDomid(), - store_port, console_port, int(is_hvm), pae, apic, superpages]) + store_port, console_port, int(is_hvm), pae, apic, superpages, 1]) log.debug("[xc_restore]: %s", string.join(cmd)) handler = RestoreInputHandler() diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index 35d725c..5ec90ac 100644 --- a/tools/xcutils/xc_restore.c +++ b/tools/xcutils/xc_restore.c @@ -19,7 +19,7 @@ int main(int argc, char **argv) { unsigned int domid, store_evtchn, console_evtchn; - unsigned int hvm, pae, apic, lflags; + unsigned int hvm, pae, apic, lflags, checkpointed; xc_interface *xch; int io_fd, ret; int superpages; @@ -27,9 +27,9 @@ main(int argc, char **argv) xentoollog_level lvl; xentoollog_logger *l; - if ( (argc != 8) && (argc != 9) ) + if ( !( argc >= 8 && argc <= 10) ) errx(1, "usage: %s iofd domid store_evtchn " - "console_evtchn hvm pae apic [superpages]", argv[0]); + "console_evtchn hvm pae apic [superpages [checkpointed]]", argv[0]); lvl = XTL_DETAIL; lflags = XTL_STDIOSTREAM_SHOW_PID | XTL_STDIOSTREAM_HIDE_PROGRESS; @@ -45,14 +45,18 @@ main(int argc, char **argv) hvm = atoi(argv[5]); pae = atoi(argv[6]); apic = atoi(argv[7]); - if ( argc == 9 ) + if ( argc >= 9 ) superpages = atoi(argv[8]); else superpages = !!hvm; + if ( argc >= 10 ) + checkpointed = atoi(argv[9]); + else + checkpointed = 0; ret = xc_domain_restore(xch, io_fd, domid, store_evtchn, &store_mfn, 0, console_evtchn, &console_mfn, 0, hvm, pae, superpages, - 0, NULL, NULL); + 0, checkpointed, NULL, NULL); if ( ret == 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 Wed Nov 13 01:00:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 01: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 1VgOoW-0000ty-21; Wed, 13 Nov 2013 01:00:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgOoU-0000m7-Vd for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:11 +0000 Received: from [85.158.139.211:9167] by server-17.bemta-5.messagelabs.com id F0/CD-17059-A1FC2825; Wed, 13 Nov 2013 01:00:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1384304407!1627330!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12509 invoked from network); 13 Nov 2013 01:00:08 -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 Nov 2013 01:00:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgOoQ-0002oN-Ut for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgOoO-0007e8-20 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:05 +0000 Date: Wed, 13 Nov 2013 01:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Fix bug in libxl_cdrom_insert, make more robust against bad xenstore 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 9be329056351255963a97f833d51695b6677283c Author: Ian Jackson AuthorDate: Wed May 1 16:56:54 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 18:12:51 2013 +0000 libxl: Fix bug in libxl_cdrom_insert, make more robust against bad xenstore data libxl_cdrom_insert was failing to initialize the backend type, resulting in the wrong default backend. The result was not only that the CD was not inserted properly, but also that some improper xenstore entries were created, causing further block commands to fail. This patch fixes the bug by setting the disk backend type based on the type of the existing device. It also makes the system more robust by checking to see that it has got a valid path before proceeding to write a partial xenstore entry. Signed-off-by: George Dunlap Acked-by: Ian Campbell Committed-by: Ian Campbell (cherry picked from commit c3556e2a1aee3c9b7dda5d57e85e8867fff1b9da) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e8d798e..f6da7cd 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2137,6 +2137,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, libxl__device device; const char * path; + char * tmp; flexarray_t *insert = NULL; @@ -2173,8 +2174,11 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, disks = libxl_device_disk_list(ctx, domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) - /* found */ + { + /* Found. Set backend type appropriately. */ + disk->backend=disks[i].backend; break; + } } if (i == num) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); @@ -2194,6 +2198,16 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, if (rc) goto out; path = libxl__device_backend_path(gc, &device); + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + insert = flexarray_make(4, 1); flexarray_append_pair(insert, "type", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 01:00:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 01: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 1VgOoW-0000ty-21; Wed, 13 Nov 2013 01:00:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgOoU-0000m7-Vd for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:11 +0000 Received: from [85.158.139.211:9167] by server-17.bemta-5.messagelabs.com id F0/CD-17059-A1FC2825; Wed, 13 Nov 2013 01:00:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1384304407!1627330!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12509 invoked from network); 13 Nov 2013 01:00:08 -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 Nov 2013 01:00:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgOoQ-0002oN-Ut for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgOoO-0007e8-20 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 01:00:05 +0000 Date: Wed, 13 Nov 2013 01:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Fix bug in libxl_cdrom_insert, make more robust against bad xenstore 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 9be329056351255963a97f833d51695b6677283c Author: Ian Jackson AuthorDate: Wed May 1 16:56:54 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 18:12:51 2013 +0000 libxl: Fix bug in libxl_cdrom_insert, make more robust against bad xenstore data libxl_cdrom_insert was failing to initialize the backend type, resulting in the wrong default backend. The result was not only that the CD was not inserted properly, but also that some improper xenstore entries were created, causing further block commands to fail. This patch fixes the bug by setting the disk backend type based on the type of the existing device. It also makes the system more robust by checking to see that it has got a valid path before proceeding to write a partial xenstore entry. Signed-off-by: George Dunlap Acked-by: Ian Campbell Committed-by: Ian Campbell (cherry picked from commit c3556e2a1aee3c9b7dda5d57e85e8867fff1b9da) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e8d798e..f6da7cd 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2137,6 +2137,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, libxl__device device; const char * path; + char * tmp; flexarray_t *insert = NULL; @@ -2173,8 +2174,11 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, disks = libxl_device_disk_list(ctx, domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) - /* found */ + { + /* Found. Set backend type appropriately. */ + disk->backend=disks[i].backend; break; + } } if (i == num) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); @@ -2194,6 +2198,16 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, if (rc) goto out; path = libxl__device_backend_path(gc, &device); + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + insert = flexarray_make(4, 1); flexarray_append_pair(insert, "type", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ6-0006Sj-Io; Wed, 13 Nov 2013 05:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ5-0006Sb-BJ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:17 +0000 Received: from [193.109.254.147:4595] by server-5.bemta-14.messagelabs.com id 11/C5-13525-44413825; Wed, 13 Nov 2013 05:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1384322114!1691546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24477 invoked from network); 13 Nov 2013 05:55:15 -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; 13 Nov 2013 05:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ2-00042V-CU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQ2-0007XO-68 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:14 +0000 Date: Wed, 13 Nov 2013 05:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Refactor string() out of vsnprintf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67a3542c5bc356e6452d8305991617c875f87de4 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:06:09 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:06:09 2013 +0100 common/vsprintf: Refactor string() out of vsnprintf() No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/vsprintf.c | 49 ++++++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 95bf85d..4211ebe 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -235,6 +235,32 @@ static char *number( return buf; } +static char *string(char *str, char *end, const char *s, + int field_width, int precision, int flags) +{ + unsigned int i, len = strnlen(s, precision); + + if (!(flags & LEFT)) { + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + } + for (i = 0; i < len; ++i) { + if (str <= end) + *str = *s; + ++str; ++s; + } + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + + return str; +} + /** * vsnprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into @@ -255,9 +281,8 @@ static char *number( */ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) { - int len; unsigned long long num; - int i, base; + int base; char *str, *end, c; const char *s; @@ -370,25 +395,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) if ((unsigned long)s < PAGE_SIZE) s = ""; - len = strnlen(s, precision); - - if (!(flags & LEFT)) { - while (len < field_width--) { - if (str <= end) - *str = ' '; - ++str; - } - } - for (i = 0; i < len; ++i) { - if (str <= end) - *str = *s; - ++str; ++s; - } - while (len < field_width--) { - if (str <= end) - *str = ' '; - ++str; - } + str = string(str, end, s, field_width, precision, flags); continue; case '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 Wed Nov 13 05:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ6-0006Sj-Io; Wed, 13 Nov 2013 05:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ5-0006Sb-BJ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:17 +0000 Received: from [193.109.254.147:4595] by server-5.bemta-14.messagelabs.com id 11/C5-13525-44413825; Wed, 13 Nov 2013 05:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1384322114!1691546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24477 invoked from network); 13 Nov 2013 05:55:15 -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; 13 Nov 2013 05:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQ2-00042V-CU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQ2-0007XO-68 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:14 +0000 Date: Wed, 13 Nov 2013 05:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Refactor string() out of vsnprintf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67a3542c5bc356e6452d8305991617c875f87de4 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:06:09 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:06:09 2013 +0100 common/vsprintf: Refactor string() out of vsnprintf() No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/vsprintf.c | 49 ++++++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 95bf85d..4211ebe 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -235,6 +235,32 @@ static char *number( return buf; } +static char *string(char *str, char *end, const char *s, + int field_width, int precision, int flags) +{ + unsigned int i, len = strnlen(s, precision); + + if (!(flags & LEFT)) { + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + } + for (i = 0; i < len; ++i) { + if (str <= end) + *str = *s; + ++str; ++s; + } + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + + return str; +} + /** * vsnprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into @@ -255,9 +281,8 @@ static char *number( */ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) { - int len; unsigned long long num; - int i, base; + int base; char *str, *end, c; const char *s; @@ -370,25 +395,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) if ((unsigned long)s < PAGE_SIZE) s = ""; - len = strnlen(s, precision); - - if (!(flags & LEFT)) { - while (len < field_width--) { - if (str <= end) - *str = ' '; - ++str; - } - } - for (i = 0; i < len; ++i) { - if (str <= end) - *str = *s; - ++str; ++s; - } - while (len < field_width--) { - if (str <= end) - *str = ' '; - ++str; - } + str = string(str, end, s, field_width, precision, flags); continue; case '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 Wed Nov 13 05:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPx-0006SE-3k; Wed, 13 Nov 2013 05:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPv-0006S6-H3 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:07 +0000 Received: from [85.158.137.68:39623] by server-7.bemta-3.messagelabs.com id 8A/A6-13052-A3413825; Wed, 13 Nov 2013 05:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1384322104!1146395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22717 invoked from network); 13 Nov 2013 05:55: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; 13 Nov 2013 05:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPs-00042S-2O for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTPr-0007Wx-Ob for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:03 +0000 Date: Wed, 13 Nov 2013 05:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] numa-sched: leave node-affinity alone if not in "auto" mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67348c3ac700b8bc9147638c719c3035c5ef20f5 Author: Dario Faggioli AuthorDate: Tue Nov 12 10:54:28 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 10:54:28 2013 +0100 numa-sched: leave node-affinity alone if not in "auto" mode If the domain's NUMA node-affinity is being specified by the user/toolstack (instead of being automatically computed by Xen), we really should stick to that. This means domain_update_node_affinity() is wrong when it filters out some stuff from there even in "!auto" mode. This commit fixes that. Of course, this does not mean node-affinity is always honoured (e.g., a vcpu won't run on a pcpu of a different cpupool) but the necessary logic for taking into account all the possible situations lives in the scheduler code, where it belongs. What could happen without this change is that, under certain circumstances, the node-affinity of a domain may change when the user modifies the vcpu-affinity of the domain's vcpus. This, even if probably not a real bug, is at least something the user does not expect, so let's avoid it. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Keir Fraser --- xen/common/domain.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 8c9b813..63c47e8 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -352,7 +352,6 @@ void domain_update_node_affinity(struct domain *d) cpumask_var_t cpumask; cpumask_var_t online_affinity; const cpumask_t *online; - nodemask_t nodemask = NODE_MASK_NONE; struct vcpu *v; unsigned int node; @@ -374,28 +373,19 @@ void domain_update_node_affinity(struct domain *d) cpumask_or(cpumask, cpumask, online_affinity); } + /* + * If d->auto_node_affinity is true, the domain's node-affinity mask + * (d->node_affinity) is automaically computed from all the domain's + * vcpus' vcpu-affinity masks (the union of which we have just built + * above in cpumask). OTOH, if d->auto_node_affinity is false, we + * must leave the node-affinity of the domain alone. + */ if ( d->auto_node_affinity ) { - /* Node-affinity is automaically computed from all vcpu-affinities */ + nodes_clear(d->node_affinity); for_each_online_node ( node ) if ( cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_set(node, nodemask); - - d->node_affinity = nodemask; - } - else - { - /* Node-affinity is provided by someone else, just filter out cpus - * that are either offline or not in the affinity of any vcpus. */ - nodemask = d->node_affinity; - for_each_node_mask ( node, d->node_affinity ) - if ( !cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_clear(node, nodemask);//d->node_affinity); - - /* Avoid loosing track of node-affinity because of a bad - * vcpu-affinity has been specified. */ - if ( !nodes_empty(nodemask) ) - d->node_affinity = nodemask; + node_set(node, d->node_affinity); } sched_set_node_affinity(d, &d->node_affinity); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:55:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPx-0006SE-3k; Wed, 13 Nov 2013 05:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPv-0006S6-H3 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:07 +0000 Received: from [85.158.137.68:39623] by server-7.bemta-3.messagelabs.com id 8A/A6-13052-A3413825; Wed, 13 Nov 2013 05:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1384322104!1146395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22717 invoked from network); 13 Nov 2013 05:55: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; 13 Nov 2013 05:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTPs-00042S-2O for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTPr-0007Wx-Ob for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:03 +0000 Date: Wed, 13 Nov 2013 05:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] numa-sched: leave node-affinity alone if not in "auto" mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67348c3ac700b8bc9147638c719c3035c5ef20f5 Author: Dario Faggioli AuthorDate: Tue Nov 12 10:54:28 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 10:54:28 2013 +0100 numa-sched: leave node-affinity alone if not in "auto" mode If the domain's NUMA node-affinity is being specified by the user/toolstack (instead of being automatically computed by Xen), we really should stick to that. This means domain_update_node_affinity() is wrong when it filters out some stuff from there even in "!auto" mode. This commit fixes that. Of course, this does not mean node-affinity is always honoured (e.g., a vcpu won't run on a pcpu of a different cpupool) but the necessary logic for taking into account all the possible situations lives in the scheduler code, where it belongs. What could happen without this change is that, under certain circumstances, the node-affinity of a domain may change when the user modifies the vcpu-affinity of the domain's vcpus. This, even if probably not a real bug, is at least something the user does not expect, so let's avoid it. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Keir Fraser --- xen/common/domain.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 8c9b813..63c47e8 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -352,7 +352,6 @@ void domain_update_node_affinity(struct domain *d) cpumask_var_t cpumask; cpumask_var_t online_affinity; const cpumask_t *online; - nodemask_t nodemask = NODE_MASK_NONE; struct vcpu *v; unsigned int node; @@ -374,28 +373,19 @@ void domain_update_node_affinity(struct domain *d) cpumask_or(cpumask, cpumask, online_affinity); } + /* + * If d->auto_node_affinity is true, the domain's node-affinity mask + * (d->node_affinity) is automaically computed from all the domain's + * vcpus' vcpu-affinity masks (the union of which we have just built + * above in cpumask). OTOH, if d->auto_node_affinity is false, we + * must leave the node-affinity of the domain alone. + */ if ( d->auto_node_affinity ) { - /* Node-affinity is automaically computed from all vcpu-affinities */ + nodes_clear(d->node_affinity); for_each_online_node ( node ) if ( cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_set(node, nodemask); - - d->node_affinity = nodemask; - } - else - { - /* Node-affinity is provided by someone else, just filter out cpus - * that are either offline or not in the affinity of any vcpus. */ - nodemask = d->node_affinity; - for_each_node_mask ( node, d->node_affinity ) - if ( !cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_clear(node, nodemask);//d->node_affinity); - - /* Avoid loosing track of node-affinity because of a bad - * vcpu-affinity has been specified. */ - if ( !nodes_empty(nodemask) ) - d->node_affinity = nodemask; + node_set(node, d->node_affinity); } sched_set_node_affinity(d, &d->node_affinity); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:55:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55: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 1VgTQH-0006U6-Lf; Wed, 13 Nov 2013 05:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQG-0006Tr-22 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:28 +0000 Received: from [85.158.137.68:58249] by server-8.bemta-3.messagelabs.com id 49/C7-06638-F4413825; Wed, 13 Nov 2013 05:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384322125!1112475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4414 invoked from network); 13 Nov 2013 05:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQC-00042Y-Su for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQC-0007Xt-H2 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:24 +0000 Date: Wed, 13 Nov 2013 05:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Refactor pointer() out of vsnprintf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d41b853cc7e86fe6007b337d0b26accce0dcbefc Author: Andrew Cooper AuthorDate: Tue Nov 12 11:06:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:06:45 2013 +0100 common/vsprintf: Refactor pointer() out of vsnprintf() No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/vsprintf.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 4211ebe..db926df 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -261,6 +261,20 @@ static char *string(char *str, char *end, const char *s, return str; } +static char *pointer(char *str, char *end, + const void *arg, int field_width, int precision, + int flags) +{ + if ( field_width == -1 ) + { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + + return number(str, end, (unsigned long)arg, + 16, field_width, precision, flags); +} + /** * vsnprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into @@ -399,13 +413,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) continue; case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (unsigned long) va_arg(args, void *), - 16, field_width, precision, flags); + str = pointer(str, end, va_arg(args, const void *), + field_width, precision, flags); 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 Wed Nov 13 05:55:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55: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 1VgTQH-0006U6-Lf; Wed, 13 Nov 2013 05:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQG-0006Tr-22 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:28 +0000 Received: from [85.158.137.68:58249] by server-8.bemta-3.messagelabs.com id 49/C7-06638-F4413825; Wed, 13 Nov 2013 05:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384322125!1112475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4414 invoked from network); 13 Nov 2013 05:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQC-00042Y-Su for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQC-0007Xt-H2 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:24 +0000 Date: Wed, 13 Nov 2013 05:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Refactor pointer() out of vsnprintf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d41b853cc7e86fe6007b337d0b26accce0dcbefc Author: Andrew Cooper AuthorDate: Tue Nov 12 11:06:45 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:06:45 2013 +0100 common/vsprintf: Refactor pointer() out of vsnprintf() No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/vsprintf.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 4211ebe..db926df 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -261,6 +261,20 @@ static char *string(char *str, char *end, const char *s, return str; } +static char *pointer(char *str, char *end, + const void *arg, int field_width, int precision, + int flags) +{ + if ( field_width == -1 ) + { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + + return number(str, end, (unsigned long)arg, + 16, field_width, precision, flags); +} + /** * vsnprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into @@ -399,13 +413,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) continue; case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (unsigned long) va_arg(args, void *), - 16, field_width, precision, flags); + str = pointer(str, end, va_arg(args, const void *), + field_width, precision, flags); 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 Wed Nov 13 05:55:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQR-0006W4-OM; Wed, 13 Nov 2013 05:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQQ-0006VX-6s for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:38 +0000 Received: from [85.158.137.68:40843] by server-2.bemta-3.messagelabs.com id AB/B9-29572-95413825; Wed, 13 Nov 2013 05:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384322135!1146344!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18067 invoked from network); 13 Nov 2013 05:55:36 -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 Nov 2013 05:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQN-00042j-2z for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQN-0007YJ-1C for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:35 +0000 Date: Wed, 13 Nov 2013 05:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Add %ps and %pS format specifier 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 9f6c545af9d2f031b6a29905a2508fff9dce6c71 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:09:12 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:09:12 2013 +0100 common/vsprintf: Add %ps and %pS format specifier support Introduce the %ps and %pS format options for printing a symbol. %ps will print the symbol name and optional offset and size %pS will print the symbol name and unconditional offset and size Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- docs/misc/printk-formats.txt | 17 +++++++++++++++++ xen/common/vsprintf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/docs/misc/printk-formats.txt b/docs/misc/printk-formats.txt new file mode 100644 index 0000000..4c4222b --- /dev/null +++ b/docs/misc/printk-formats.txt @@ -0,0 +1,17 @@ +Xen custom %p format options. A subset, borrowed from Linux. + +All parameters to a %p option should be compatible with void*. Regular +pointers are fine. Numbers should make use of the _p() macro. + +Symbol/Function pointers: + + %ps Symbol name with condition offset and size (iff offset != 0) + e.g. printk + default_idle+0x78/0x7d + + %pS Symbol name with unconditional offset and size + e.g. printk+0/0x48 + default_idle+0x78/0x7d + + In the case that an appropriate symbol name can't be found, %p[sS] will + fall back to '%p' and print the address in hex. diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index db926df..e8f45eb 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -261,10 +262,46 @@ static char *string(char *str, char *end, const char *s, return str; } -static char *pointer(char *str, char *end, +static char *pointer(char *str, char *end, const char **fmt_ptr, const void *arg, int field_width, int precision, int flags) { + const char *fmt = *fmt_ptr, *s; + + /* Custom %p suffixes. See XEN_ROOT/docs/misc/printk-formats.txt */ + switch ( fmt[1] ) + { + case 's': /* Symbol name with offset and size (iff offset != 0) */ + case 'S': /* Symbol name unconditionally with offset and size */ + { + unsigned long sym_size, sym_offset; + char namebuf[KSYM_NAME_LEN+1]; + + /* Advance parents fmt string, as we have consumed 's' or 'S' */ + ++*fmt_ptr; + + s = symbols_lookup((unsigned long)arg, &sym_size, &sym_offset, namebuf); + + /* If the symbol is not found, fall back to printing the address */ + if ( !s ) + break; + + /* Print symbol name */ + str = string(str, end, s, -1, -1, 0); + + if ( fmt[1] == 'S' || sym_offset != 0 ) + { + /* Print '+/' */ + str = number(str, end, sym_offset, 16, -1, -1, SPECIAL|SIGN|PLUS); + if ( str <= end ) + *str++ = '/'; + str = number(str, end, sym_size, 16, -1, -1, SPECIAL); + } + + return str; + } + } + if ( field_width == -1 ) { field_width = 2 * sizeof(void *); @@ -413,7 +450,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) continue; case 'p': - str = pointer(str, end, va_arg(args, const void *), + /* pointer() might advance fmt (%pS for example) */ + str = pointer(str, end, &fmt, va_arg(args, const void *), field_width, precision, flags); 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 Wed Nov 13 05:55:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQR-0006W4-OM; Wed, 13 Nov 2013 05:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQQ-0006VX-6s for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:38 +0000 Received: from [85.158.137.68:40843] by server-2.bemta-3.messagelabs.com id AB/B9-29572-95413825; Wed, 13 Nov 2013 05:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384322135!1146344!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18067 invoked from network); 13 Nov 2013 05:55:36 -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 Nov 2013 05:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQN-00042j-2z for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQN-0007YJ-1C for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:35 +0000 Date: Wed, 13 Nov 2013 05:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: Add %ps and %pS format specifier 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 9f6c545af9d2f031b6a29905a2508fff9dce6c71 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:09:12 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:09:12 2013 +0100 common/vsprintf: Add %ps and %pS format specifier support Introduce the %ps and %pS format options for printing a symbol. %ps will print the symbol name and optional offset and size %pS will print the symbol name and unconditional offset and size Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- docs/misc/printk-formats.txt | 17 +++++++++++++++++ xen/common/vsprintf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/docs/misc/printk-formats.txt b/docs/misc/printk-formats.txt new file mode 100644 index 0000000..4c4222b --- /dev/null +++ b/docs/misc/printk-formats.txt @@ -0,0 +1,17 @@ +Xen custom %p format options. A subset, borrowed from Linux. + +All parameters to a %p option should be compatible with void*. Regular +pointers are fine. Numbers should make use of the _p() macro. + +Symbol/Function pointers: + + %ps Symbol name with condition offset and size (iff offset != 0) + e.g. printk + default_idle+0x78/0x7d + + %pS Symbol name with unconditional offset and size + e.g. printk+0/0x48 + default_idle+0x78/0x7d + + In the case that an appropriate symbol name can't be found, %p[sS] will + fall back to '%p' and print the address in hex. diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index db926df..e8f45eb 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -261,10 +262,46 @@ static char *string(char *str, char *end, const char *s, return str; } -static char *pointer(char *str, char *end, +static char *pointer(char *str, char *end, const char **fmt_ptr, const void *arg, int field_width, int precision, int flags) { + const char *fmt = *fmt_ptr, *s; + + /* Custom %p suffixes. See XEN_ROOT/docs/misc/printk-formats.txt */ + switch ( fmt[1] ) + { + case 's': /* Symbol name with offset and size (iff offset != 0) */ + case 'S': /* Symbol name unconditionally with offset and size */ + { + unsigned long sym_size, sym_offset; + char namebuf[KSYM_NAME_LEN+1]; + + /* Advance parents fmt string, as we have consumed 's' or 'S' */ + ++*fmt_ptr; + + s = symbols_lookup((unsigned long)arg, &sym_size, &sym_offset, namebuf); + + /* If the symbol is not found, fall back to printing the address */ + if ( !s ) + break; + + /* Print symbol name */ + str = string(str, end, s, -1, -1, 0); + + if ( fmt[1] == 'S' || sym_offset != 0 ) + { + /* Print '+/' */ + str = number(str, end, sym_offset, 16, -1, -1, SPECIAL|SIGN|PLUS); + if ( str <= end ) + *str++ = '/'; + str = number(str, end, sym_size, 16, -1, -1, SPECIAL); + } + + return str; + } + } + if ( field_width == -1 ) { field_width = 2 * sizeof(void *); @@ -413,7 +450,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) continue; case 'p': - str = pointer(str, end, va_arg(args, const void *), + /* pointer() might advance fmt (%pS for example) */ + str = pointer(str, end, &fmt, va_arg(args, const void *), field_width, precision, flags); 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 Wed Nov 13 05:55:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55: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 1VgTQb-0006Y2-SF; Wed, 13 Nov 2013 05:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQa-0006Xg-5h for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:48 +0000 Received: from [85.158.137.68:41315] by server-8.bemta-3.messagelabs.com id 54/F7-06638-36413825; Wed, 13 Nov 2013 05:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1384322145!1147043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6163 invoked from network); 13 Nov 2013 05:55:46 -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 Nov 2013 05:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQX-00042s-9d for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQX-0007ZO-83 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:45 +0000 Date: Wed, 13 Nov 2013 05:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Replace print_symbol() with new %ps/%pS format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6653f3a4b745ad1f3067eaa21467258bc7f8da7 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:10:35 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:10:35 2013 +0100 x86: Replace print_symbol() with new %ps/%pS format Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/irq.c | 7 ++----- xen/arch/x86/time.c | 4 ++-- xen/arch/x86/traps.c | 30 ++++++++++-------------------- xen/arch/x86/x86_64/traps.c | 2 +- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index a984bda..a47d4f6 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2276,7 +2276,7 @@ static void dump_irqs(unsigned char key) printk("\n"); } else if ( desc->action ) - print_symbol("%s\n", (unsigned long)desc->action->handler); + printk("%ps()\n", desc->action->handler); else printk("mapped, unbound\n"); @@ -2288,10 +2288,7 @@ static void dump_irqs(unsigned char key) printk("Direct vector information:\n"); for ( i = FIRST_DYNAMIC_VECTOR; i < NR_VECTORS; ++i ) if ( direct_apic_vector[i] ) - { - printk(" %#02x -> ", i); - print_symbol("%s\n", (unsigned long)direct_apic_vector[i]); - } + printk(" %#02x -> %ps()\n", i, direct_apic_vector[i]); dump_ioapic_irq_info(); } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c1bbd50..21224f0 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1475,8 +1475,8 @@ static int _disable_pit_irq(void(*hpet_broadcast_setup)(void)) { if ( xen_cpuidle > 0 ) { - print_symbol("%s() failed, turning to PIT broadcast\n", - (unsigned long)hpet_broadcast_setup); + printk("%ps() failed, turning to PIT broadcast\n", + hpet_broadcast_setup); return -1; } ret = 0; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 77c200b..0e3c6e3 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -198,19 +198,14 @@ static void show_trace(struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; - printk("Xen call trace:\n "); - - printk("[<%p>]", _p(regs->eip)); - print_symbol(" %s\n ", regs->eip); + printk("Xen call trace:\n" + " [<%p>] %pS\n", _p(regs->eip), _p(regs->eip)); while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) { addr = *stack++; if ( is_active_kernel_text(addr) ) - { - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); - } + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); } printk("\n"); @@ -222,8 +217,6 @@ static void show_trace(struct cpu_user_regs *regs) { unsigned long *frame, next, addr, low, high; - printk("Xen call trace:\n "); - /* * If RIP is not pointing into hypervisor code then someone may have * called into oblivion. Peek to see if they left a return address at @@ -232,8 +225,9 @@ static void show_trace(struct cpu_user_regs *regs) addr = is_active_kernel_text(regs->eip) || !is_active_kernel_text(*ESP_BEFORE_EXCEPTION(regs)) ? regs->eip : *ESP_BEFORE_EXCEPTION(regs); - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + + printk("Xen call trace:\n" + " [<%p>] %pS\n", _p(addr), _p(addr)); /* Bounds for range of valid frame pointer. */ low = (unsigned long)(ESP_BEFORE_EXCEPTION(regs) - 2); @@ -269,8 +263,7 @@ static void show_trace(struct cpu_user_regs *regs) addr = frame[1]; } - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); low = (unsigned long)&frame[2]; } @@ -338,10 +331,7 @@ void show_stack_overflow(unsigned int cpu, unsigned long esp) { addr = *stack++; if ( is_active_kernel_text(addr) ) - { - printk("%p: [<%p>]", stack, _p(addr)); - print_symbol(" %s\n ", addr); - } + printk("%p: [<%p>] %pS\n", stack, _p(addr), _p(addr)); } printk("\n"); @@ -3755,8 +3745,8 @@ void asm_domain_crash_synchronous(unsigned long addr) if ( addr == 0 ) addr = this_cpu(last_extable_addr); - printk("domain_crash_sync called from entry.S: fault at %p ", _p(addr)); - print_symbol("%s\n", addr); + printk("domain_crash_sync called from entry.S: fault at %p %pS\n", + _p(addr), _p(addr)); __domain_crash_synchronous(); } diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 0316d7c..ae93539 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -49,7 +49,7 @@ static void _show_registers( printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); if ( context == CTXT_hypervisor ) - print_symbol(" %s", regs->rip); + printk(" %pS", _p(regs->rip)); printk("\nRFLAGS: %016lx ", regs->rflags); if ( (context == CTXT_pv_guest) && v && v->vcpu_info ) printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:55:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:55: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 1VgTQb-0006Y2-SF; Wed, 13 Nov 2013 05:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQa-0006Xg-5h for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:48 +0000 Received: from [85.158.137.68:41315] by server-8.bemta-3.messagelabs.com id 54/F7-06638-36413825; Wed, 13 Nov 2013 05:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1384322145!1147043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6163 invoked from network); 13 Nov 2013 05:55:46 -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 Nov 2013 05:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQX-00042s-9d for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQX-0007ZO-83 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:45 +0000 Date: Wed, 13 Nov 2013 05:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: Replace print_symbol() with new %ps/%pS format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6653f3a4b745ad1f3067eaa21467258bc7f8da7 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:10:35 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:10:35 2013 +0100 x86: Replace print_symbol() with new %ps/%pS format Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/irq.c | 7 ++----- xen/arch/x86/time.c | 4 ++-- xen/arch/x86/traps.c | 30 ++++++++++-------------------- xen/arch/x86/x86_64/traps.c | 2 +- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index a984bda..a47d4f6 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2276,7 +2276,7 @@ static void dump_irqs(unsigned char key) printk("\n"); } else if ( desc->action ) - print_symbol("%s\n", (unsigned long)desc->action->handler); + printk("%ps()\n", desc->action->handler); else printk("mapped, unbound\n"); @@ -2288,10 +2288,7 @@ static void dump_irqs(unsigned char key) printk("Direct vector information:\n"); for ( i = FIRST_DYNAMIC_VECTOR; i < NR_VECTORS; ++i ) if ( direct_apic_vector[i] ) - { - printk(" %#02x -> ", i); - print_symbol("%s\n", (unsigned long)direct_apic_vector[i]); - } + printk(" %#02x -> %ps()\n", i, direct_apic_vector[i]); dump_ioapic_irq_info(); } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c1bbd50..21224f0 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1475,8 +1475,8 @@ static int _disable_pit_irq(void(*hpet_broadcast_setup)(void)) { if ( xen_cpuidle > 0 ) { - print_symbol("%s() failed, turning to PIT broadcast\n", - (unsigned long)hpet_broadcast_setup); + printk("%ps() failed, turning to PIT broadcast\n", + hpet_broadcast_setup); return -1; } ret = 0; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 77c200b..0e3c6e3 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -198,19 +198,14 @@ static void show_trace(struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; - printk("Xen call trace:\n "); - - printk("[<%p>]", _p(regs->eip)); - print_symbol(" %s\n ", regs->eip); + printk("Xen call trace:\n" + " [<%p>] %pS\n", _p(regs->eip), _p(regs->eip)); while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) { addr = *stack++; if ( is_active_kernel_text(addr) ) - { - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); - } + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); } printk("\n"); @@ -222,8 +217,6 @@ static void show_trace(struct cpu_user_regs *regs) { unsigned long *frame, next, addr, low, high; - printk("Xen call trace:\n "); - /* * If RIP is not pointing into hypervisor code then someone may have * called into oblivion. Peek to see if they left a return address at @@ -232,8 +225,9 @@ static void show_trace(struct cpu_user_regs *regs) addr = is_active_kernel_text(regs->eip) || !is_active_kernel_text(*ESP_BEFORE_EXCEPTION(regs)) ? regs->eip : *ESP_BEFORE_EXCEPTION(regs); - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + + printk("Xen call trace:\n" + " [<%p>] %pS\n", _p(addr), _p(addr)); /* Bounds for range of valid frame pointer. */ low = (unsigned long)(ESP_BEFORE_EXCEPTION(regs) - 2); @@ -269,8 +263,7 @@ static void show_trace(struct cpu_user_regs *regs) addr = frame[1]; } - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); low = (unsigned long)&frame[2]; } @@ -338,10 +331,7 @@ void show_stack_overflow(unsigned int cpu, unsigned long esp) { addr = *stack++; if ( is_active_kernel_text(addr) ) - { - printk("%p: [<%p>]", stack, _p(addr)); - print_symbol(" %s\n ", addr); - } + printk("%p: [<%p>] %pS\n", stack, _p(addr), _p(addr)); } printk("\n"); @@ -3755,8 +3745,8 @@ void asm_domain_crash_synchronous(unsigned long addr) if ( addr == 0 ) addr = this_cpu(last_extable_addr); - printk("domain_crash_sync called from entry.S: fault at %p ", _p(addr)); - print_symbol("%s\n", addr); + printk("domain_crash_sync called from entry.S: fault at %p %pS\n", + _p(addr), _p(addr)); __domain_crash_synchronous(); } diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 0316d7c..ae93539 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -49,7 +49,7 @@ static void _show_registers( printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); if ( context == CTXT_hypervisor ) - print_symbol(" %s", regs->rip); + printk(" %pS", _p(regs->rip)); printk("\nRFLAGS: %016lx ", regs->rflags); if ( (context == CTXT_pv_guest) && v && v->vcpu_info ) printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56: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 1VgTQm-0006Zw-0K; Wed, 13 Nov 2013 05:56:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQk-0006Zf-0l for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:58 +0000 Received: from [85.158.143.35:35771] by server-1.bemta-4.messagelabs.com id 97/80-17304-D6413825; Wed, 13 Nov 2013 05:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384322155!2795950!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29111 invoked from network); 13 Nov 2013 05:55:56 -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 Nov 2013 05:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQh-00042y-FW for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQh-0007Zn-Dc for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:55 +0000 Date: Wed, 13 Nov 2013 05:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: Replace print_symbol() with new %ps/%pS format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c30ff64f4e77e56a0be003f1a3447e2f93b7ad1b Author: Andrew Cooper AuthorDate: Tue Nov 12 11:11:05 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:11:05 2013 +0100 arm: Replace print_symbol() with new %ps/%pS format Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/arch/arm/traps.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 287dd7b..10ee498 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -387,7 +387,7 @@ static void show_registers_32(struct cpu_user_regs *regs, #else printk("PC: %08"PRIx32, regs->pc); if ( !guest_mode ) - print_symbol(" %s", regs->pc); + printk(" %pS", _p(regs->pc)); printk("\n"); #endif printk("CPSR: %08"PRIx32" MODE:%s\n", regs->cpsr, @@ -462,7 +462,7 @@ static void show_registers_64(struct cpu_user_regs *regs, printk("PC: %016"PRIx64, regs->pc); if ( !guest_mode ) - print_symbol(" %s", regs->pc); + printk(" %pS", _p(regs->pc)); printk("\n"); printk("LR: %016"PRIx64"\n", regs->lr); if ( guest_mode ) @@ -735,12 +735,10 @@ static void show_trace(struct cpu_user_regs *regs) { register_t *frame, next, addr, low, high; - printk("Xen call trace:\n "); + printk("Xen call trace:\n"); - printk("[<%p>]", _p(regs->pc)); - print_symbol(" %s (PC)\n ", regs->pc); - printk("[<%p>]", _p(regs->lr)); - print_symbol(" %s (LR)\n ", regs->lr); + printk(" [<%p>] %pS (PC)\n", _p(regs->pc), _p(regs->pc)); + printk(" [<%p>] %pS (LR)\n", _p(regs->lr), _p(regs->lr)); /* Bounds for range of valid frame pointer. */ low = (register_t)(STACK_BEFORE_EXCEPTION(regs)); @@ -760,8 +758,7 @@ static void show_trace(struct cpu_user_regs *regs) next = frame[0]; addr = frame[1]; - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); low = (register_t)&frame[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 Nov 13 05:56:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56: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 1VgTQm-0006Zw-0K; Wed, 13 Nov 2013 05:56:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQk-0006Zf-0l for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:58 +0000 Received: from [85.158.143.35:35771] by server-1.bemta-4.messagelabs.com id 97/80-17304-D6413825; Wed, 13 Nov 2013 05:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384322155!2795950!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29111 invoked from network); 13 Nov 2013 05:55:56 -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 Nov 2013 05:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQh-00042y-FW for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQh-0007Zn-Dc for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:55:55 +0000 Date: Wed, 13 Nov 2013 05:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: Replace print_symbol() with new %ps/%pS format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c30ff64f4e77e56a0be003f1a3447e2f93b7ad1b Author: Andrew Cooper AuthorDate: Tue Nov 12 11:11:05 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:11:05 2013 +0100 arm: Replace print_symbol() with new %ps/%pS format Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/arch/arm/traps.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 287dd7b..10ee498 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -387,7 +387,7 @@ static void show_registers_32(struct cpu_user_regs *regs, #else printk("PC: %08"PRIx32, regs->pc); if ( !guest_mode ) - print_symbol(" %s", regs->pc); + printk(" %pS", _p(regs->pc)); printk("\n"); #endif printk("CPSR: %08"PRIx32" MODE:%s\n", regs->cpsr, @@ -462,7 +462,7 @@ static void show_registers_64(struct cpu_user_regs *regs, printk("PC: %016"PRIx64, regs->pc); if ( !guest_mode ) - print_symbol(" %s", regs->pc); + printk(" %pS", _p(regs->pc)); printk("\n"); printk("LR: %016"PRIx64"\n", regs->lr); if ( guest_mode ) @@ -735,12 +735,10 @@ static void show_trace(struct cpu_user_regs *regs) { register_t *frame, next, addr, low, high; - printk("Xen call trace:\n "); + printk("Xen call trace:\n"); - printk("[<%p>]", _p(regs->pc)); - print_symbol(" %s (PC)\n ", regs->pc); - printk("[<%p>]", _p(regs->lr)); - print_symbol(" %s (LR)\n ", regs->lr); + printk(" [<%p>] %pS (PC)\n", _p(regs->pc), _p(regs->pc)); + printk(" [<%p>] %pS (LR)\n", _p(regs->lr), _p(regs->lr)); /* Bounds for range of valid frame pointer. */ low = (register_t)(STACK_BEFORE_EXCEPTION(regs)); @@ -760,8 +758,7 @@ static void show_trace(struct cpu_user_regs *regs) next = frame[0]; addr = frame[1]; - printk("[<%p>]", _p(addr)); - print_symbol(" %s\n ", addr); + printk(" [<%p>] %pS\n", _p(addr), _p(addr)); low = (register_t)&frame[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 Nov 13 05:56:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56: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 1VgTQv-0006cS-35; Wed, 13 Nov 2013 05:56:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQu-0006c3-6L for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:08 +0000 Received: from [193.109.254.147:58993] by server-6.bemta-14.messagelabs.com id 1E/15-19621-77413825; Wed, 13 Nov 2013 05:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384322165!2386132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20523 invoked from network); 13 Nov 2013 05:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQr-00043a-MI for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQr-0007aK-KG for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:05 +0000 Date: Wed, 13 Nov 2013 05:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/symbols: Remove print_symbol() and associated infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 365beafb63c3f9696ef32640b84a414a4c824e94 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:11:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:11:30 2013 +0100 common/symbols: Remove print_symbol() and associated infrastructure Also adjust the one common user of print_symbol() to use the new printk() format. While adjusting the format string, increase the width so a long-to-expire plt_overflow() timer doesn't break the column alignment. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/symbols.c | 26 -------------------------- xen/common/timer.c | 3 +-- xen/include/xen/symbols.h | 23 ----------------------- 3 files changed, 1 insertions(+), 51 deletions(-) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index 83b2b58..45941e1 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -148,29 +148,3 @@ const char *symbols_lookup(unsigned long addr, *offset = addr - symbols_address(low); return namebuf; } - -/* Replace "%s" in format with address, or returns -errno. */ -void __print_symbol(const char *fmt, unsigned long address) -{ - const char *name; - unsigned long offset, size, flags; - - static DEFINE_SPINLOCK(lock); - static char namebuf[KSYM_NAME_LEN+1]; -#define BUFFER_SIZE sizeof("%s+%#lx/%#lx [%s]") + KSYM_NAME_LEN + \ - 2*(BITS_PER_LONG*3/10) + 1 - static char buffer[BUFFER_SIZE]; - - spin_lock_irqsave(&lock, flags); - - name = symbols_lookup(address, &size, &offset, namebuf); - - if (!name) - snprintf(buffer, BUFFER_SIZE, "???"); - else - snprintf(buffer, BUFFER_SIZE, "%s+%#lx/%#lx", name, offset, size); - - printk(fmt, buffer); - - spin_unlock_irqrestore(&lock, flags); -} diff --git a/xen/common/timer.c b/xen/common/timer.c index 9ed74e9..1895a78 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -511,9 +511,8 @@ s_time_t align_timer(s_time_t firsttick, uint64_t period) static void dump_timer(struct timer *t, s_time_t now) { - printk(" ex=%8"PRId64"us timer=%p cb=%p(%p)", + printk(" ex=%12"PRId64"us timer=%p cb=%ps(%p)\n", (t->expires - now) / 1000, t, t->function, t->data); - print_symbol(" %s\n", (unsigned long)t->function); } static void dump_timerq(unsigned char key) diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h index 37cf6bf..87cd77d 100644 --- a/xen/include/xen/symbols.h +++ b/xen/include/xen/symbols.h @@ -11,27 +11,4 @@ const char *symbols_lookup(unsigned long addr, unsigned long *offset, char *namebuf); -/* Replace "%s" in format with address, if found */ -void __print_symbol(const char *fmt, unsigned long address); - -/* This macro allows us to keep printk typechecking */ -static void __check_printsym_format(const char *fmt, ...) - __attribute__((format(printf,1,2))); - static inline void __check_printsym_format(const char *fmt, ...) -{ -} - -#if 0 -#define print_fn_descriptor_symbol(fmt, addr) \ - print_symbol(fmt, *(unsigned long *)addr) -#else -#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr) -#endif - -#define print_symbol(fmt, addr) \ -do { \ - __check_printsym_format(fmt, ""); \ - __print_symbol(fmt, addr); \ -} while(0) - #endif /*_XEN_SYMBOLS_H*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56: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 1VgTQv-0006cS-35; Wed, 13 Nov 2013 05:56:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQu-0006c3-6L for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:08 +0000 Received: from [193.109.254.147:58993] by server-6.bemta-14.messagelabs.com id 1E/15-19621-77413825; Wed, 13 Nov 2013 05:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384322165!2386132!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20523 invoked from network); 13 Nov 2013 05:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTQr-00043a-MI for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTQr-0007aK-KG for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:05 +0000 Date: Wed, 13 Nov 2013 05:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/symbols: Remove print_symbol() and associated infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 365beafb63c3f9696ef32640b84a414a4c824e94 Author: Andrew Cooper AuthorDate: Tue Nov 12 11:11:30 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:11:30 2013 +0100 common/symbols: Remove print_symbol() and associated infrastructure Also adjust the one common user of print_symbol() to use the new printk() format. While adjusting the format string, increase the width so a long-to-expire plt_overflow() timer doesn't break the column alignment. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser --- xen/common/symbols.c | 26 -------------------------- xen/common/timer.c | 3 +-- xen/include/xen/symbols.h | 23 ----------------------- 3 files changed, 1 insertions(+), 51 deletions(-) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index 83b2b58..45941e1 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -148,29 +148,3 @@ const char *symbols_lookup(unsigned long addr, *offset = addr - symbols_address(low); return namebuf; } - -/* Replace "%s" in format with address, or returns -errno. */ -void __print_symbol(const char *fmt, unsigned long address) -{ - const char *name; - unsigned long offset, size, flags; - - static DEFINE_SPINLOCK(lock); - static char namebuf[KSYM_NAME_LEN+1]; -#define BUFFER_SIZE sizeof("%s+%#lx/%#lx [%s]") + KSYM_NAME_LEN + \ - 2*(BITS_PER_LONG*3/10) + 1 - static char buffer[BUFFER_SIZE]; - - spin_lock_irqsave(&lock, flags); - - name = symbols_lookup(address, &size, &offset, namebuf); - - if (!name) - snprintf(buffer, BUFFER_SIZE, "???"); - else - snprintf(buffer, BUFFER_SIZE, "%s+%#lx/%#lx", name, offset, size); - - printk(fmt, buffer); - - spin_unlock_irqrestore(&lock, flags); -} diff --git a/xen/common/timer.c b/xen/common/timer.c index 9ed74e9..1895a78 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -511,9 +511,8 @@ s_time_t align_timer(s_time_t firsttick, uint64_t period) static void dump_timer(struct timer *t, s_time_t now) { - printk(" ex=%8"PRId64"us timer=%p cb=%p(%p)", + printk(" ex=%12"PRId64"us timer=%p cb=%ps(%p)\n", (t->expires - now) / 1000, t, t->function, t->data); - print_symbol(" %s\n", (unsigned long)t->function); } static void dump_timerq(unsigned char key) diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h index 37cf6bf..87cd77d 100644 --- a/xen/include/xen/symbols.h +++ b/xen/include/xen/symbols.h @@ -11,27 +11,4 @@ const char *symbols_lookup(unsigned long addr, unsigned long *offset, char *namebuf); -/* Replace "%s" in format with address, if found */ -void __print_symbol(const char *fmt, unsigned long address); - -/* This macro allows us to keep printk typechecking */ -static void __check_printsym_format(const char *fmt, ...) - __attribute__((format(printf,1,2))); - static inline void __check_printsym_format(const char *fmt, ...) -{ -} - -#if 0 -#define print_fn_descriptor_symbol(fmt, addr) \ - print_symbol(fmt, *(unsigned long *)addr) -#else -#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr) -#endif - -#define print_symbol(fmt, addr) \ -do { \ - __check_printsym_format(fmt, ""); \ - __print_symbol(fmt, addr); \ -} while(0) - #endif /*_XEN_SYMBOLS_H*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR6-0006ea-5r; Wed, 13 Nov 2013 05:56:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR4-0006eI-Rj for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:19 +0000 Received: from [85.158.139.211:15547] by server-7.bemta-5.messagelabs.com id 19/39-13897-18413825; Wed, 13 Nov 2013 05:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1384322176!1610750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26713 invoked from network); 13 Nov 2013 05:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR1-00043d-TN for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTR1-0007ai-Qj for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:15 +0000 Date: Wed, 13 Nov 2013 05:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: give FIX_EFI_MPF its own fixmap entry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb238512c13852d53578bffa763a99e2fb2425ce Author: David Vrabel AuthorDate: Tue Nov 12 11:37:19 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:37:19 2013 +0100 x86: give FIX_EFI_MPF its own fixmap entry FIX_EFI_MPF was the same as FIX_KEXEC_BASE_0 which is going away. So add its own entry. Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- xen/arch/x86/mpparse.c | 2 -- xen/include/asm-x86/fixmap.h | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 97d34bc..3753704 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -538,8 +538,6 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) } } -#define FIX_EFI_MPF FIX_KEXEC_BASE_0 - static __init void efi_unmap_mpf(void) { if (efi_enabled) diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index d850be4..8b4266d 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -66,6 +66,7 @@ enum fixed_addresses { FIX_APEI_RANGE_BASE, FIX_APEI_RANGE_END = FIX_APEI_RANGE_BASE + FIX_APEI_RANGE_MAX -1, FIX_IGD_MMIO, + FIX_EFI_MPF, __end_of_fixed_addresses }; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:56:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR6-0006ea-5r; Wed, 13 Nov 2013 05:56:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR4-0006eI-Rj for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:19 +0000 Received: from [85.158.139.211:15547] by server-7.bemta-5.messagelabs.com id 19/39-13897-18413825; Wed, 13 Nov 2013 05:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1384322176!1610750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26713 invoked from network); 13 Nov 2013 05:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTR1-00043d-TN for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTR1-0007ai-Qj for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:15 +0000 Date: Wed, 13 Nov 2013 05:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: give FIX_EFI_MPF its own fixmap entry X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb238512c13852d53578bffa763a99e2fb2425ce Author: David Vrabel AuthorDate: Tue Nov 12 11:37:19 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:37:19 2013 +0100 x86: give FIX_EFI_MPF its own fixmap entry FIX_EFI_MPF was the same as FIX_KEXEC_BASE_0 which is going away. So add its own entry. Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- xen/arch/x86/mpparse.c | 2 -- xen/include/asm-x86/fixmap.h | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 97d34bc..3753704 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -538,8 +538,6 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) } } -#define FIX_EFI_MPF FIX_KEXEC_BASE_0 - static __init void efi_unmap_mpf(void) { if (efi_enabled) diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index d850be4..8b4266d 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -66,6 +66,7 @@ enum fixed_addresses { FIX_APEI_RANGE_BASE, FIX_APEI_RANGE_END = FIX_APEI_RANGE_BASE + FIX_APEI_RANGE_MAX -1, FIX_IGD_MMIO, + FIX_EFI_MPF, __end_of_fixed_addresses }; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:56:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRG-0006gz-8Z; Wed, 13 Nov 2013 05:56:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRF-0006gj-FN for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:29 +0000 Received: from [85.158.143.35:38490] by server-3.bemta-4.messagelabs.com id 5E/9F-19578-C8413825; Wed, 13 Nov 2013 05:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384322186!2824405!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24408 invoked from network); 13 Nov 2013 05:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRC-00043m-52 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRC-0007b4-1W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:26 +0000 Date: Wed, 13 Nov 2013 05:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add public interface for improved load/unload sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5813737f8512b0c5ec9808e489f71b905d6c7c53 Author: David Vrabel AuthorDate: Tue Nov 12 11:39:29 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:39:29 2013 +0100 kexec: add public interface for improved load/unload sub-ops Add replacement KEXEC_CMD_load and KEXEC_CMD_unload sub-ops to the kexec hypercall. These new sub-ops allow a priviledged guest to provide the image data to be loaded into Xen memory or the crash region instead of guests loading the image data themselves and providing the relocation code and metadata. The old interface is provided to guests requesting an interface version prior to 4.4. Bump __XEN_LATEST_INTERFACE_VERSION__ to 0x00040400. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/common/kexec.c | 12 +++--- xen/include/public/kexec.h | 92 +++++++++++++++++++++++++++++++++++++-- xen/include/public/xen-compat.h | 2 +- 3 files changed, 95 insertions(+), 11 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7cd151f..7b23df0 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -734,7 +734,7 @@ static void crash_save_vmcoreinfo(void) #endif } -static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_t *load) +static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_v1_t *load) { xen_kexec_image_t *image; int base, bit, pos; @@ -781,7 +781,7 @@ static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_t *load) static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) { - xen_kexec_load_t load; + xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&load, uarg, 1)) ) return -EFAULT; @@ -793,8 +793,8 @@ static int kexec_load_unload_compat(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) { #ifdef CONFIG_COMPAT - compat_kexec_load_t compat_load; - xen_kexec_load_t load; + compat_kexec_load_v1_t compat_load; + xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&compat_load, uarg, 1)) ) return -EFAULT; @@ -866,8 +866,8 @@ static int do_kexec_op_internal(unsigned long op, else ret = kexec_get_range(uarg); break; - case KEXEC_CMD_kexec_load: - case KEXEC_CMD_kexec_unload: + case KEXEC_CMD_kexec_load_v1: + case KEXEC_CMD_kexec_unload_v1: spin_lock_irqsave(&kexec_lock, flags); if (!test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags)) { diff --git a/xen/include/public/kexec.h b/xen/include/public/kexec.h index 36409ff..a6a0a88 100644 --- a/xen/include/public/kexec.h +++ b/xen/include/public/kexec.h @@ -105,6 +105,20 @@ typedef struct xen_kexec_image { * Perform kexec having previously loaded a kexec or kdump kernel * as appropriate. * type == KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH [in] + * + * Control is transferred to the image entry point with the host in + * the following state. + * + * - The image may be executed on any PCPU and all other PCPUs are + * stopped. + * + * - Local interrupts are disabled. + * + * - Register values are undefined. + * + * - The image segments have writeable 1:1 virtual to machine + * mappings. The location of any page tables is undefined and these + * page table frames are not be mapped. */ #define KEXEC_CMD_kexec 0 typedef struct xen_kexec_exec { @@ -116,12 +130,12 @@ typedef struct xen_kexec_exec { * type == KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH [in] * image == relocation information for kexec (ignored for unload) [in] */ -#define KEXEC_CMD_kexec_load 1 -#define KEXEC_CMD_kexec_unload 2 -typedef struct xen_kexec_load { +#define KEXEC_CMD_kexec_load_v1 1 /* obsolete since 0x00040400 */ +#define KEXEC_CMD_kexec_unload_v1 2 /* obsolete since 0x00040400 */ +typedef struct xen_kexec_load_v1 { int type; xen_kexec_image_t image; -} xen_kexec_load_t; +} xen_kexec_load_v1_t; #define KEXEC_RANGE_MA_CRASH 0 /* machine address and size of crash area */ #define KEXEC_RANGE_MA_XEN 1 /* machine address and size of Xen itself */ @@ -152,6 +166,76 @@ typedef struct xen_kexec_range { unsigned long start; } xen_kexec_range_t; +#if __XEN_INTERFACE_VERSION__ >= 0x00040400 +/* + * A contiguous chunk of a kexec image and it's destination machine + * address. + */ +typedef struct xen_kexec_segment { + union { + XEN_GUEST_HANDLE(const_void) h; + uint64_t _pad; + } buf; + uint64_t buf_size; + uint64_t dest_maddr; + uint64_t dest_size; +} xen_kexec_segment_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_segment_t); + +/* + * Load a kexec image into memory. + * + * For KEXEC_TYPE_DEFAULT images, the segments may be anywhere in RAM. + * The image is relocated prior to being executed. + * + * For KEXEC_TYPE_CRASH images, each segment of the image must reside + * in the memory region reserved for kexec (KEXEC_RANGE_MA_CRASH) and + * the entry point must be within the image. The caller is responsible + * for ensuring that multiple images do not overlap. + * + * All image segments will be loaded to their destination machine + * addresses prior to being executed. The trailing portion of any + * segments with a source buffer (from dest_maddr + buf_size to + * dest_maddr + dest_size) will be zeroed. + * + * Segments with no source buffer will be accessible to the image when + * it is executed. + */ + +#define KEXEC_CMD_kexec_load 4 +typedef struct xen_kexec_load { + uint8_t type; /* One of KEXEC_TYPE_* */ + uint8_t _pad; + uint16_t arch; /* ELF machine type (EM_*). */ + uint32_t nr_segments; + union { + XEN_GUEST_HANDLE(xen_kexec_segment_t) h; + uint64_t _pad; + } segments; + uint64_t entry_maddr; /* image entry point machine address. */ +} xen_kexec_load_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_load_t); + +/* + * Unload a kexec image. + * + * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH. + */ +#define KEXEC_CMD_kexec_unload 5 +typedef struct xen_kexec_unload { + uint8_t type; +} xen_kexec_unload_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t); + +#else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */ + +#define KEXEC_CMD_kexec_load KEXEC_CMD_kexec_load_v1 +#define KEXEC_CMD_kexec_unload KEXEC_CMD_kexec_unload_v1 +#define xen_kexec_load xen_kexec_load_v1 +#define xen_kexec_load_t xen_kexec_load_v1_t + +#endif + #endif /* _XEN_PUBLIC_KEXEC_H */ /* diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 69141c4..3eb80a0 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040300 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:56:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRG-0006gz-8Z; Wed, 13 Nov 2013 05:56:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRF-0006gj-FN for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:29 +0000 Received: from [85.158.143.35:38490] by server-3.bemta-4.messagelabs.com id 5E/9F-19578-C8413825; Wed, 13 Nov 2013 05:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384322186!2824405!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24408 invoked from network); 13 Nov 2013 05:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRC-00043m-52 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRC-0007b4-1W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:26 +0000 Date: Wed, 13 Nov 2013 05:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add public interface for improved load/unload sub-ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5813737f8512b0c5ec9808e489f71b905d6c7c53 Author: David Vrabel AuthorDate: Tue Nov 12 11:39:29 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:39:29 2013 +0100 kexec: add public interface for improved load/unload sub-ops Add replacement KEXEC_CMD_load and KEXEC_CMD_unload sub-ops to the kexec hypercall. These new sub-ops allow a priviledged guest to provide the image data to be loaded into Xen memory or the crash region instead of guests loading the image data themselves and providing the relocation code and metadata. The old interface is provided to guests requesting an interface version prior to 4.4. Bump __XEN_LATEST_INTERFACE_VERSION__ to 0x00040400. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/common/kexec.c | 12 +++--- xen/include/public/kexec.h | 92 +++++++++++++++++++++++++++++++++++++-- xen/include/public/xen-compat.h | 2 +- 3 files changed, 95 insertions(+), 11 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7cd151f..7b23df0 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -734,7 +734,7 @@ static void crash_save_vmcoreinfo(void) #endif } -static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_t *load) +static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_v1_t *load) { xen_kexec_image_t *image; int base, bit, pos; @@ -781,7 +781,7 @@ static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_t *load) static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) { - xen_kexec_load_t load; + xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&load, uarg, 1)) ) return -EFAULT; @@ -793,8 +793,8 @@ static int kexec_load_unload_compat(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) { #ifdef CONFIG_COMPAT - compat_kexec_load_t compat_load; - xen_kexec_load_t load; + compat_kexec_load_v1_t compat_load; + xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&compat_load, uarg, 1)) ) return -EFAULT; @@ -866,8 +866,8 @@ static int do_kexec_op_internal(unsigned long op, else ret = kexec_get_range(uarg); break; - case KEXEC_CMD_kexec_load: - case KEXEC_CMD_kexec_unload: + case KEXEC_CMD_kexec_load_v1: + case KEXEC_CMD_kexec_unload_v1: spin_lock_irqsave(&kexec_lock, flags); if (!test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags)) { diff --git a/xen/include/public/kexec.h b/xen/include/public/kexec.h index 36409ff..a6a0a88 100644 --- a/xen/include/public/kexec.h +++ b/xen/include/public/kexec.h @@ -105,6 +105,20 @@ typedef struct xen_kexec_image { * Perform kexec having previously loaded a kexec or kdump kernel * as appropriate. * type == KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH [in] + * + * Control is transferred to the image entry point with the host in + * the following state. + * + * - The image may be executed on any PCPU and all other PCPUs are + * stopped. + * + * - Local interrupts are disabled. + * + * - Register values are undefined. + * + * - The image segments have writeable 1:1 virtual to machine + * mappings. The location of any page tables is undefined and these + * page table frames are not be mapped. */ #define KEXEC_CMD_kexec 0 typedef struct xen_kexec_exec { @@ -116,12 +130,12 @@ typedef struct xen_kexec_exec { * type == KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH [in] * image == relocation information for kexec (ignored for unload) [in] */ -#define KEXEC_CMD_kexec_load 1 -#define KEXEC_CMD_kexec_unload 2 -typedef struct xen_kexec_load { +#define KEXEC_CMD_kexec_load_v1 1 /* obsolete since 0x00040400 */ +#define KEXEC_CMD_kexec_unload_v1 2 /* obsolete since 0x00040400 */ +typedef struct xen_kexec_load_v1 { int type; xen_kexec_image_t image; -} xen_kexec_load_t; +} xen_kexec_load_v1_t; #define KEXEC_RANGE_MA_CRASH 0 /* machine address and size of crash area */ #define KEXEC_RANGE_MA_XEN 1 /* machine address and size of Xen itself */ @@ -152,6 +166,76 @@ typedef struct xen_kexec_range { unsigned long start; } xen_kexec_range_t; +#if __XEN_INTERFACE_VERSION__ >= 0x00040400 +/* + * A contiguous chunk of a kexec image and it's destination machine + * address. + */ +typedef struct xen_kexec_segment { + union { + XEN_GUEST_HANDLE(const_void) h; + uint64_t _pad; + } buf; + uint64_t buf_size; + uint64_t dest_maddr; + uint64_t dest_size; +} xen_kexec_segment_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_segment_t); + +/* + * Load a kexec image into memory. + * + * For KEXEC_TYPE_DEFAULT images, the segments may be anywhere in RAM. + * The image is relocated prior to being executed. + * + * For KEXEC_TYPE_CRASH images, each segment of the image must reside + * in the memory region reserved for kexec (KEXEC_RANGE_MA_CRASH) and + * the entry point must be within the image. The caller is responsible + * for ensuring that multiple images do not overlap. + * + * All image segments will be loaded to their destination machine + * addresses prior to being executed. The trailing portion of any + * segments with a source buffer (from dest_maddr + buf_size to + * dest_maddr + dest_size) will be zeroed. + * + * Segments with no source buffer will be accessible to the image when + * it is executed. + */ + +#define KEXEC_CMD_kexec_load 4 +typedef struct xen_kexec_load { + uint8_t type; /* One of KEXEC_TYPE_* */ + uint8_t _pad; + uint16_t arch; /* ELF machine type (EM_*). */ + uint32_t nr_segments; + union { + XEN_GUEST_HANDLE(xen_kexec_segment_t) h; + uint64_t _pad; + } segments; + uint64_t entry_maddr; /* image entry point machine address. */ +} xen_kexec_load_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_load_t); + +/* + * Unload a kexec image. + * + * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH. + */ +#define KEXEC_CMD_kexec_unload 5 +typedef struct xen_kexec_unload { + uint8_t type; +} xen_kexec_unload_t; +DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t); + +#else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */ + +#define KEXEC_CMD_kexec_load KEXEC_CMD_kexec_load_v1 +#define KEXEC_CMD_kexec_unload KEXEC_CMD_kexec_unload_v1 +#define xen_kexec_load xen_kexec_load_v1 +#define xen_kexec_load_t xen_kexec_load_v1_t + +#endif + #endif /* _XEN_PUBLIC_KEXEC_H */ /* diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index 69141c4..3eb80a0 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -27,7 +27,7 @@ #ifndef __XEN_PUBLIC_XEN_COMPAT_H__ #define __XEN_PUBLIC_XEN_COMPAT_H__ -#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040300 +#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400 #if defined(__XEN__) || defined(__XEN_TOOLS__) /* Xen is built with matching headers and implements the latest interface. */ -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:56:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRR-0006jH-BK; Wed, 13 Nov 2013 05:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRQ-0006iu-1T for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:40 +0000 Received: from [85.158.143.35:37413] by server-2.bemta-4.messagelabs.com id 4E/ED-11386-79413825; Wed, 13 Nov 2013 05:56:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384322196!2817093!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26979 invoked from network); 13 Nov 2013 05:56:37 -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; 13 Nov 2013 05:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRM-00043r-AS for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRM-0007bU-99 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:36 +0000 Date: Wed, 13 Nov 2013 05:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add infrastructure for handling kexec images X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ee51c59d74168ff28b8c5a311d9c17c53f7fe6b Author: David Vrabel AuthorDate: Tue Nov 12 11:41:02 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:41:02 2013 +0100 kexec: add infrastructure for handling kexec images Add the code needed to handle and load kexec images into Xen memory or into the crash region. This is needed for the new KEXEC_CMD_load and KEXEC_CMD_unload hypercall sub-ops. Much of this code is derived from the Linux kernel. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/common/Makefile | 1 + xen/common/kimage.c | 820 ++++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/kimage.h | 62 ++++ 3 files changed, 883 insertions(+), 0 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 686f7a1..3683ae3 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -13,6 +13,7 @@ obj-y += irq.o obj-y += kernel.o obj-y += keyhandler.o obj-$(HAS_KEXEC) += kexec.o +obj-$(HAS_KEXEC) += kimage.o obj-y += lib.o obj-y += memory.o obj-y += multicall.o diff --git a/xen/common/kimage.c b/xen/common/kimage.c new file mode 100644 index 0000000..cba4458 --- /dev/null +++ b/xen/common/kimage.c @@ -0,0 +1,820 @@ +/* + * Kexec Image + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Derived from kernel/kexec.c from Linux: + * + * Copyright (C) 2002-2004 Eric Biederman + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * When kexec transitions to the new kernel there is a one-to-one + * mapping between physical and virtual addresses. On processors + * where you can disable the MMU this is trivial, and easy. For + * others it is still a simple predictable page table to setup. + * + * The code for the transition from the current kernel to the the new + * kernel is placed in the page-size control_code_buffer. This memory + * must be identity mapped in the transition from virtual to physical + * addresses. + * + * The assembly stub in the control code buffer is passed a linked list + * of descriptor pages detailing the source pages of the new kernel, + * and the destination addresses of those source pages. As this data + * structure is not used in the context of the current OS, it must + * be self-contained. + * + * The code has been made to work with highmem pages and will use a + * destination page in its final resting place (if it happens + * to allocate it). The end product of this is that most of the + * physical address space, and most of RAM can be used. + * + * Future directions include: + * - allocating a page table with the control code buffer identity + * mapped, to simplify machine_kexec and make kexec_on_panic more + * reliable. + */ + +/* + * KIMAGE_NO_DEST is an impossible destination address..., for + * allocating pages whose destination address we do not care about. + */ +#define KIMAGE_NO_DEST (-1UL) + +/* + * Offset of the last entry in an indirection page. + */ +#define KIMAGE_LAST_ENTRY (PAGE_SIZE/sizeof(kimage_entry_t) - 1) + + +static int kimage_is_destination_range(struct kexec_image *image, + paddr_t start, paddr_t end); +static struct page_info *kimage_alloc_page(struct kexec_image *image, + paddr_t dest); + +static struct page_info *kimage_alloc_zeroed_page(unsigned memflags) +{ + struct page_info *page; + + page = alloc_domheap_page(NULL, memflags); + if ( !page ) + return NULL; + + clear_domain_page(page_to_mfn(page)); + + return page; +} + +static int do_kimage_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments, uint8_t type) +{ + struct kexec_image *image; + unsigned long i; + int result; + + /* Allocate a controlling structure */ + result = -ENOMEM; + image = xzalloc(typeof(*image)); + if ( !image ) + goto out; + + image->entry_maddr = entry; + image->type = type; + image->nr_segments = nr_segments; + image->segments = segments; + + image->next_crash_page = kexec_crash_area.start; + + INIT_PAGE_LIST_HEAD(&image->control_pages); + INIT_PAGE_LIST_HEAD(&image->dest_pages); + INIT_PAGE_LIST_HEAD(&image->unusable_pages); + + /* + * Verify we have good destination addresses. The caller is + * responsible for making certain we don't attempt to load the new + * image into invalid or reserved areas of RAM. This just + * verifies it is an address we can use. + * + * Since the kernel does everything in page size chunks ensure the + * destination addresses are page aligned. Too many special cases + * crop of when we don't do this. The most insidious is getting + * overlapping destination addresses simply because addresses are + * changed to page size granularity. + */ + result = -EADDRNOTAVAIL; + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (mstart & ~PAGE_MASK) || (mend & ~PAGE_MASK) ) + goto out; + } + + /* + * Verify our destination addresses do not overlap. If we allowed + * overlapping destination addresses through very weird things can + * happen with no easy explanation as one segment stops on + * another. + */ + result = -EINVAL; + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + unsigned long j; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + for (j = 0; j < i; j++ ) + { + paddr_t pstart, pend; + pstart = image->segments[j].dest_maddr; + pend = pstart + image->segments[j].dest_size; + /* Do the segments overlap? */ + if ( (mend > pstart) && (mstart < pend) ) + goto out; + } + } + + /* + * Ensure our buffer sizes are strictly less than our memory + * sizes. This should always be the case, and it is easier to + * check up front than to be surprised later on. + */ + result = -EINVAL; + for ( i = 0; i < nr_segments; i++ ) + { + if ( image->segments[i].buf_size > image->segments[i].dest_size ) + goto out; + } + + /* + * Page for the relocation code must still be accessible after the + * processor has switched to 32-bit mode. + */ + result = -ENOMEM; + image->control_code_page = kimage_alloc_control_page(image, MEMF_bits(32)); + if ( !image->control_code_page ) + goto out; + + /* Add an empty indirection page. */ + image->entry_page = kimage_alloc_control_page(image, 0); + if ( !image->entry_page ) + goto out; + + image->head = page_to_maddr(image->entry_page); + + result = 0; +out: + if ( result == 0 ) + *rimage = image; + else if ( image ) + { + image->segments = NULL; /* caller frees segments after an error */ + kimage_free(image); + } + + return result; + +} + +static int kimage_normal_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments) +{ + return do_kimage_alloc(rimage, entry, nr_segments, segments, + KEXEC_TYPE_DEFAULT); +} + +static int kimage_crash_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments) +{ + unsigned long i; + + /* Verify we have a valid entry point */ + if ( (entry < kexec_crash_area.start) + || (entry > kexec_crash_area.start + kexec_crash_area.size)) + return -EADDRNOTAVAIL; + + /* + * Verify we have good destination addresses. Normally + * the caller is responsible for making certain we don't + * attempt to load the new image into invalid or reserved + * areas of RAM. But crash kernels are preloaded into a + * reserved area of ram. We must ensure the addresses + * are in the reserved area otherwise preloading the + * kernel could corrupt things. + */ + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + + if ( guest_handle_is_null(segments[i].buf.h) ) + continue; + + mstart = segments[i].dest_maddr; + mend = mstart + segments[i].dest_size; + /* Ensure we are within the crash kernel limits. */ + if ( (mstart < kexec_crash_area.start ) + || (mend > kexec_crash_area.start + kexec_crash_area.size)) + return -EADDRNOTAVAIL; + } + + /* Allocate and initialize a controlling structure. */ + return do_kimage_alloc(rimage, entry, nr_segments, segments, + KEXEC_TYPE_CRASH); +} + +static int kimage_is_destination_range(struct kexec_image *image, + paddr_t start, + paddr_t end) +{ + unsigned long i; + + for ( i = 0; i < image->nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (end > mstart) && (start < mend) ) + return 1; + } + + return 0; +} + +static void kimage_free_page_list(struct page_list_head *list) +{ + struct page_info *page, *next; + + page_list_for_each_safe(page, next, list) + { + page_list_del(page, list); + free_domheap_page(page); + } +} + +static struct page_info *kimage_alloc_normal_control_page( + struct kexec_image *image, unsigned memflags) +{ + /* + * Control pages are special, they are the intermediaries that are + * needed while we copy the rest of the pages to their final + * resting place. As such they must not conflict with either the + * destination addresses or memory the kernel is already using. + * + * The only case where we really need more than one of these are + * for architectures where we cannot disable the MMU and must + * instead generate an identity mapped page table for all of the + * memory. + * + * At worst this runs in O(N) of the image size. + */ + struct page_list_head extra_pages; + struct page_info *page = NULL; + + INIT_PAGE_LIST_HEAD(&extra_pages); + + /* + * Loop while I can allocate a page and the page allocated is a + * destination page. + */ + do { + unsigned long mfn, emfn; + paddr_t addr, eaddr; + + page = kimage_alloc_zeroed_page(memflags); + if ( !page ) + break; + mfn = page_to_mfn(page); + emfn = mfn + 1; + addr = page_to_maddr(page); + eaddr = addr + PAGE_SIZE; + if ( kimage_is_destination_range(image, addr, eaddr) ) + { + page_list_add(page, &extra_pages); + page = NULL; + } + } while ( !page ); + + if ( page ) + { + /* Remember the allocated page... */ + page_list_add(page, &image->control_pages); + + /* + * Because the page is already in it's destination location we + * will never allocate another page at that address. + * Therefore kimage_alloc_page will not return it (again) and + * we don't need to give it an entry in image->segments[]. + */ + } + /* + * Deal with the destination pages I have inadvertently allocated. + * + * Ideally I would convert multi-page allocations into single page + * allocations, and add everything to image->dest_pages. + * + * For now it is simpler to just free the pages. + */ + kimage_free_page_list(&extra_pages); + + return page; +} + +static struct page_info *kimage_alloc_crash_control_page(struct kexec_image *image) +{ + /* + * Control pages are special, they are the intermediaries that are + * needed while we copy the rest of the pages to their final + * resting place. As such they must not conflict with either the + * destination addresses or memory the kernel is already using. + * + * Control pages are also the only pags we must allocate when + * loading a crash kernel. All of the other pages are specified + * by the segments and we just memcpy into them directly. + * + * The only case where we really need more than one of these are + * for architectures where we cannot disable the MMU and must + * instead generate an identity mapped page table for all of the + * memory. + * + * Given the low demand this implements a very simple allocator + * that finds the first hole of the appropriate size in the + * reserved memory region, and allocates all of the memory up to + * and including the hole. + */ + paddr_t hole_start, hole_end; + struct page_info *page = NULL; + + hole_start = PAGE_ALIGN(image->next_crash_page); + hole_end = hole_start + PAGE_SIZE; + while ( hole_end <= kexec_crash_area.start + kexec_crash_area.size ) + { + unsigned long i; + + /* See if I overlap any of the segments. */ + for ( i = 0; i < image->nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (hole_end > mstart) && (hole_start < mend) ) + { + /* Advance the hole to the end of the segment. */ + hole_start = PAGE_ALIGN(mend); + hole_end = hole_start + PAGE_SIZE; + break; + } + } + /* If I don't overlap any segments I have found my hole! */ + if ( i == image->nr_segments ) + { + page = maddr_to_page(hole_start); + break; + } + } + if ( page ) + { + image->next_crash_page = hole_end; + clear_domain_page(page_to_mfn(page)); + } + + return page; +} + + +struct page_info *kimage_alloc_control_page(struct kexec_image *image, + unsigned memflags) +{ + struct page_info *pages = NULL; + + switch ( image->type ) + { + case KEXEC_TYPE_DEFAULT: + pages = kimage_alloc_normal_control_page(image, memflags); + break; + case KEXEC_TYPE_CRASH: + pages = kimage_alloc_crash_control_page(image); + break; + } + return pages; +} + +static int kimage_add_entry(struct kexec_image *image, kimage_entry_t entry) +{ + kimage_entry_t *entries; + + if ( image->next_entry == KIMAGE_LAST_ENTRY ) + { + struct page_info *page; + + page = kimage_alloc_page(image, KIMAGE_NO_DEST); + if ( !page ) + return -ENOMEM; + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = page_to_maddr(page) | IND_INDIRECTION; + unmap_domain_page(entries); + + image->entry_page = page; + image->next_entry = 0; + } + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = entry; + image->next_entry++; + unmap_domain_page(entries); + + return 0; +} + +static int kimage_set_destination(struct kexec_image *image, + paddr_t destination) +{ + return kimage_add_entry(image, (destination & PAGE_MASK) | IND_DESTINATION); +} + + +static int kimage_add_page(struct kexec_image *image, paddr_t maddr) +{ + return kimage_add_entry(image, (maddr & PAGE_MASK) | IND_SOURCE); +} + + +static void kimage_free_extra_pages(struct kexec_image *image) +{ + kimage_free_page_list(&image->dest_pages); + kimage_free_page_list(&image->unusable_pages); +} + +static void kimage_terminate(struct kexec_image *image) +{ + kimage_entry_t *entries; + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = IND_DONE; + unmap_domain_page(entries); +} + +/* + * Iterate over all the entries in the indirection pages. + * + * Call unmap_domain_page(ptr) after the loop exits. + */ +#define for_each_kimage_entry(image, ptr, entry) \ + for ( ptr = map_domain_page(image->head >> PAGE_SHIFT); \ + (entry = *ptr) && !(entry & IND_DONE); \ + ptr = (entry & IND_INDIRECTION) ? \ + (unmap_domain_page(ptr), map_domain_page(entry >> PAGE_SHIFT)) \ + : ptr + 1 ) + +static void kimage_free_entry(kimage_entry_t entry) +{ + struct page_info *page; + + page = mfn_to_page(entry >> PAGE_SHIFT); + free_domheap_page(page); +} + +static void kimage_free_all_entries(struct kexec_image *image) +{ + kimage_entry_t *ptr, entry; + kimage_entry_t ind = 0; + + if ( !image->head ) + return; + + for_each_kimage_entry(image, ptr, entry) + { + if ( entry & IND_INDIRECTION ) + { + /* Free the previous indirection page */ + if ( ind & IND_INDIRECTION ) + kimage_free_entry(ind); + /* Save this indirection page until we are done with it. */ + ind = entry; + } + else if ( entry & IND_SOURCE ) + kimage_free_entry(entry); + } + unmap_domain_page(ptr); + + /* Free the final indirection page. */ + if ( ind & IND_INDIRECTION ) + kimage_free_entry(ind); +} + +void kimage_free(struct kexec_image *image) +{ + if ( !image ) + return; + + kimage_free_extra_pages(image); + kimage_free_all_entries(image); + kimage_free_page_list(&image->control_pages); + xfree(image->segments); + xfree(image); +} + +static kimage_entry_t *kimage_dst_used(struct kexec_image *image, + paddr_t maddr) +{ + kimage_entry_t *ptr, entry; + unsigned long destination = 0; + + for_each_kimage_entry(image, ptr, entry) + { + if ( entry & IND_DESTINATION ) + destination = entry & PAGE_MASK; + else if ( entry & IND_SOURCE ) + { + if ( maddr == destination ) + return ptr; + destination += PAGE_SIZE; + } + } + unmap_domain_page(ptr); + + return NULL; +} + +static struct page_info *kimage_alloc_page(struct kexec_image *image, + paddr_t destination) +{ + /* + * Here we implement safeguards to ensure that a source page is + * not copied to its destination page before the data on the + * destination page is no longer useful. + * + * To do this we maintain the invariant that a source page is + * either its own destination page, or it is not a destination + * page at all. + * + * That is slightly stronger than required, but the proof that no + * problems will not occur is trivial, and the implementation is + * simply to verify. + * + * When allocating all pages normally this algorithm will run in + * O(N) time, but in the worst case it will run in O(N^2) time. + * If the runtime is a problem the data structures can be fixed. + */ + struct page_info *page; + paddr_t addr; + + /* + * Walk through the list of destination pages, and see if I have a + * match. + */ + page_list_for_each(page, &image->dest_pages) + { + addr = page_to_maddr(page); + if ( addr == destination ) + { + page_list_del(page, &image->dest_pages); + return page; + } + } + page = NULL; + for (;;) + { + kimage_entry_t *old; + + /* Allocate a page, if we run out of memory give up. */ + page = kimage_alloc_zeroed_page(0); + if ( !page ) + return NULL; + addr = page_to_maddr(page); + + /* If it is the destination page we want use it. */ + if ( addr == destination ) + break; + + /* If the page is not a destination page use it. */ + if ( !kimage_is_destination_range(image, addr, + addr + PAGE_SIZE) ) + break; + + /* + * I know that the page is someones destination page. See if + * there is already a source page for this destination page. + * And if so swap the source pages. + */ + old = kimage_dst_used(image, addr); + if ( old ) + { + /* If so move it. */ + unsigned long old_mfn = *old >> PAGE_SHIFT; + unsigned long mfn = addr >> PAGE_SHIFT; + + copy_domain_page(mfn, old_mfn); + clear_domain_page(old_mfn); + *old = (addr & ~PAGE_MASK) | IND_SOURCE; + unmap_domain_page(old); + + page = mfn_to_page(old_mfn); + break; + } + else + { + /* + * Place the page on the destination list; I will use it + * later. + */ + page_list_add(page, &image->dest_pages); + } + } + return page; +} + +static int kimage_load_normal_segment(struct kexec_image *image, + xen_kexec_segment_t *segment) +{ + unsigned long to_copy; + unsigned long src_offset; + paddr_t dest, end; + int ret; + + to_copy = segment->buf_size; + src_offset = 0; + dest = segment->dest_maddr; + + ret = kimage_set_destination(image, dest); + if ( ret < 0 ) + return ret; + + while ( to_copy ) + { + unsigned long dest_mfn; + struct page_info *page; + void *dest_va; + size_t size; + + dest_mfn = dest >> PAGE_SHIFT; + + size = min_t(unsigned long, PAGE_SIZE, to_copy); + + page = kimage_alloc_page(image, dest); + if ( !page ) + return -ENOMEM; + ret = kimage_add_page(image, page_to_maddr(page)); + if ( ret < 0 ) + return ret; + + dest_va = __map_domain_page(page); + ret = copy_from_guest_offset(dest_va, segment->buf.h, src_offset, size); + unmap_domain_page(dest_va); + if ( ret ) + return -EFAULT; + + to_copy -= size; + src_offset += size; + dest += PAGE_SIZE; + } + + /* Remainder of the destination should be zeroed. */ + end = segment->dest_maddr + segment->dest_size; + for ( ; dest < end; dest += PAGE_SIZE ) + kimage_add_entry(image, IND_ZERO); + + return 0; +} + +static int kimage_load_crash_segment(struct kexec_image *image, + xen_kexec_segment_t *segment) +{ + /* + * For crash dumps kernels we simply copy the data from user space + * to it's destination. + */ + paddr_t dest; + unsigned long sbytes, dbytes; + int ret = 0; + unsigned long src_offset = 0; + + sbytes = segment->buf_size; + dbytes = segment->dest_size; + dest = segment->dest_maddr; + + while ( dbytes ) + { + unsigned long dest_mfn; + void *dest_va; + size_t schunk, dchunk; + + dest_mfn = dest >> PAGE_SHIFT; + + dchunk = PAGE_SIZE; + schunk = min(dchunk, sbytes); + + dest_va = map_domain_page(dest_mfn); + if ( !dest_va ) + return -EINVAL; + + ret = copy_from_guest_offset(dest_va, segment->buf.h, src_offset, schunk); + memset(dest_va + schunk, 0, dchunk - schunk); + + unmap_domain_page(dest_va); + if ( ret ) + return -EFAULT; + + dbytes -= dchunk; + sbytes -= schunk; + dest += dchunk; + src_offset += schunk; + } + + return 0; +} + +static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *segment) +{ + int result = -ENOMEM; + + if ( !guest_handle_is_null(segment->buf.h) ) + { + switch ( image->type ) + { + case KEXEC_TYPE_DEFAULT: + result = kimage_load_normal_segment(image, segment); + break; + case KEXEC_TYPE_CRASH: + result = kimage_load_crash_segment(image, segment); + break; + } + } + + return result; +} + +int kimage_alloc(struct kexec_image **rimage, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segment) +{ + int result; + + switch( type ) + { + case KEXEC_TYPE_DEFAULT: + result = kimage_normal_alloc(rimage, entry_maddr, nr_segments, segment); + break; + case KEXEC_TYPE_CRASH: + result = kimage_crash_alloc(rimage, entry_maddr, nr_segments, segment); + break; + default: + result = -EINVAL; + break; + } + if ( result < 0 ) + return result; + + (*rimage)->arch = arch; + + return result; +} + +int kimage_load_segments(struct kexec_image *image) +{ + int s; + int result; + + for ( s = 0; s < image->nr_segments; s++ ) { + result = kimage_load_segment(image, &image->segments[s]); + if ( result < 0 ) + return result; + } + kimage_terminate(image); + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/kimage.h b/xen/include/xen/kimage.h new file mode 100644 index 0000000..0ebd37a --- /dev/null +++ b/xen/include/xen/kimage.h @@ -0,0 +1,62 @@ +#ifndef __XEN_KIMAGE_H__ +#define __XEN_KIMAGE_H__ + +#define IND_DESTINATION 0x1 +#define IND_INDIRECTION 0x2 +#define IND_DONE 0x4 +#define IND_SOURCE 0x8 +#define IND_ZERO 0x10 + +#ifndef __ASSEMBLY__ + +#include +#include +#include + +#define KEXEC_SEGMENT_MAX 16 + +typedef paddr_t kimage_entry_t; + +struct kexec_image { + uint8_t type; + uint16_t arch; + uint64_t entry_maddr; + uint32_t nr_segments; + xen_kexec_segment_t *segments; + + kimage_entry_t head; + struct page_info *entry_page; + unsigned next_entry; + + struct page_info *control_code_page; + struct page_info *aux_page; + + struct page_list_head control_pages; + struct page_list_head dest_pages; + struct page_list_head unusable_pages; + + /* Address of next control page to allocate for crash kernels. */ + paddr_t next_crash_page; +}; + +int kimage_alloc(struct kexec_image **rimage, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segment); +void kimage_free(struct kexec_image *image); +int kimage_load_segments(struct kexec_image *image); +struct page_info *kimage_alloc_control_page(struct kexec_image *image, + unsigned memflags); + +#endif /* __ASSEMBLY__ */ + +#endif /* __XEN_KIMAGE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRR-0006jH-BK; Wed, 13 Nov 2013 05:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRQ-0006iu-1T for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:40 +0000 Received: from [85.158.143.35:37413] by server-2.bemta-4.messagelabs.com id 4E/ED-11386-79413825; Wed, 13 Nov 2013 05:56:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1384322196!2817093!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26979 invoked from network); 13 Nov 2013 05:56:37 -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; 13 Nov 2013 05:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRM-00043r-AS for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRM-0007bU-99 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:36 +0000 Date: Wed, 13 Nov 2013 05:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: add infrastructure for handling kexec images X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ee51c59d74168ff28b8c5a311d9c17c53f7fe6b Author: David Vrabel AuthorDate: Tue Nov 12 11:41:02 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:41:02 2013 +0100 kexec: add infrastructure for handling kexec images Add the code needed to handle and load kexec images into Xen memory or into the crash region. This is needed for the new KEXEC_CMD_load and KEXEC_CMD_unload hypercall sub-ops. Much of this code is derived from the Linux kernel. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/common/Makefile | 1 + xen/common/kimage.c | 820 ++++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/kimage.h | 62 ++++ 3 files changed, 883 insertions(+), 0 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index 686f7a1..3683ae3 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -13,6 +13,7 @@ obj-y += irq.o obj-y += kernel.o obj-y += keyhandler.o obj-$(HAS_KEXEC) += kexec.o +obj-$(HAS_KEXEC) += kimage.o obj-y += lib.o obj-y += memory.o obj-y += multicall.o diff --git a/xen/common/kimage.c b/xen/common/kimage.c new file mode 100644 index 0000000..cba4458 --- /dev/null +++ b/xen/common/kimage.c @@ -0,0 +1,820 @@ +/* + * Kexec Image + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Derived from kernel/kexec.c from Linux: + * + * Copyright (C) 2002-2004 Eric Biederman + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * When kexec transitions to the new kernel there is a one-to-one + * mapping between physical and virtual addresses. On processors + * where you can disable the MMU this is trivial, and easy. For + * others it is still a simple predictable page table to setup. + * + * The code for the transition from the current kernel to the the new + * kernel is placed in the page-size control_code_buffer. This memory + * must be identity mapped in the transition from virtual to physical + * addresses. + * + * The assembly stub in the control code buffer is passed a linked list + * of descriptor pages detailing the source pages of the new kernel, + * and the destination addresses of those source pages. As this data + * structure is not used in the context of the current OS, it must + * be self-contained. + * + * The code has been made to work with highmem pages and will use a + * destination page in its final resting place (if it happens + * to allocate it). The end product of this is that most of the + * physical address space, and most of RAM can be used. + * + * Future directions include: + * - allocating a page table with the control code buffer identity + * mapped, to simplify machine_kexec and make kexec_on_panic more + * reliable. + */ + +/* + * KIMAGE_NO_DEST is an impossible destination address..., for + * allocating pages whose destination address we do not care about. + */ +#define KIMAGE_NO_DEST (-1UL) + +/* + * Offset of the last entry in an indirection page. + */ +#define KIMAGE_LAST_ENTRY (PAGE_SIZE/sizeof(kimage_entry_t) - 1) + + +static int kimage_is_destination_range(struct kexec_image *image, + paddr_t start, paddr_t end); +static struct page_info *kimage_alloc_page(struct kexec_image *image, + paddr_t dest); + +static struct page_info *kimage_alloc_zeroed_page(unsigned memflags) +{ + struct page_info *page; + + page = alloc_domheap_page(NULL, memflags); + if ( !page ) + return NULL; + + clear_domain_page(page_to_mfn(page)); + + return page; +} + +static int do_kimage_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments, uint8_t type) +{ + struct kexec_image *image; + unsigned long i; + int result; + + /* Allocate a controlling structure */ + result = -ENOMEM; + image = xzalloc(typeof(*image)); + if ( !image ) + goto out; + + image->entry_maddr = entry; + image->type = type; + image->nr_segments = nr_segments; + image->segments = segments; + + image->next_crash_page = kexec_crash_area.start; + + INIT_PAGE_LIST_HEAD(&image->control_pages); + INIT_PAGE_LIST_HEAD(&image->dest_pages); + INIT_PAGE_LIST_HEAD(&image->unusable_pages); + + /* + * Verify we have good destination addresses. The caller is + * responsible for making certain we don't attempt to load the new + * image into invalid or reserved areas of RAM. This just + * verifies it is an address we can use. + * + * Since the kernel does everything in page size chunks ensure the + * destination addresses are page aligned. Too many special cases + * crop of when we don't do this. The most insidious is getting + * overlapping destination addresses simply because addresses are + * changed to page size granularity. + */ + result = -EADDRNOTAVAIL; + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (mstart & ~PAGE_MASK) || (mend & ~PAGE_MASK) ) + goto out; + } + + /* + * Verify our destination addresses do not overlap. If we allowed + * overlapping destination addresses through very weird things can + * happen with no easy explanation as one segment stops on + * another. + */ + result = -EINVAL; + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + unsigned long j; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + for (j = 0; j < i; j++ ) + { + paddr_t pstart, pend; + pstart = image->segments[j].dest_maddr; + pend = pstart + image->segments[j].dest_size; + /* Do the segments overlap? */ + if ( (mend > pstart) && (mstart < pend) ) + goto out; + } + } + + /* + * Ensure our buffer sizes are strictly less than our memory + * sizes. This should always be the case, and it is easier to + * check up front than to be surprised later on. + */ + result = -EINVAL; + for ( i = 0; i < nr_segments; i++ ) + { + if ( image->segments[i].buf_size > image->segments[i].dest_size ) + goto out; + } + + /* + * Page for the relocation code must still be accessible after the + * processor has switched to 32-bit mode. + */ + result = -ENOMEM; + image->control_code_page = kimage_alloc_control_page(image, MEMF_bits(32)); + if ( !image->control_code_page ) + goto out; + + /* Add an empty indirection page. */ + image->entry_page = kimage_alloc_control_page(image, 0); + if ( !image->entry_page ) + goto out; + + image->head = page_to_maddr(image->entry_page); + + result = 0; +out: + if ( result == 0 ) + *rimage = image; + else if ( image ) + { + image->segments = NULL; /* caller frees segments after an error */ + kimage_free(image); + } + + return result; + +} + +static int kimage_normal_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments) +{ + return do_kimage_alloc(rimage, entry, nr_segments, segments, + KEXEC_TYPE_DEFAULT); +} + +static int kimage_crash_alloc(struct kexec_image **rimage, paddr_t entry, + unsigned long nr_segments, + xen_kexec_segment_t *segments) +{ + unsigned long i; + + /* Verify we have a valid entry point */ + if ( (entry < kexec_crash_area.start) + || (entry > kexec_crash_area.start + kexec_crash_area.size)) + return -EADDRNOTAVAIL; + + /* + * Verify we have good destination addresses. Normally + * the caller is responsible for making certain we don't + * attempt to load the new image into invalid or reserved + * areas of RAM. But crash kernels are preloaded into a + * reserved area of ram. We must ensure the addresses + * are in the reserved area otherwise preloading the + * kernel could corrupt things. + */ + for ( i = 0; i < nr_segments; i++ ) + { + paddr_t mstart, mend; + + if ( guest_handle_is_null(segments[i].buf.h) ) + continue; + + mstart = segments[i].dest_maddr; + mend = mstart + segments[i].dest_size; + /* Ensure we are within the crash kernel limits. */ + if ( (mstart < kexec_crash_area.start ) + || (mend > kexec_crash_area.start + kexec_crash_area.size)) + return -EADDRNOTAVAIL; + } + + /* Allocate and initialize a controlling structure. */ + return do_kimage_alloc(rimage, entry, nr_segments, segments, + KEXEC_TYPE_CRASH); +} + +static int kimage_is_destination_range(struct kexec_image *image, + paddr_t start, + paddr_t end) +{ + unsigned long i; + + for ( i = 0; i < image->nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (end > mstart) && (start < mend) ) + return 1; + } + + return 0; +} + +static void kimage_free_page_list(struct page_list_head *list) +{ + struct page_info *page, *next; + + page_list_for_each_safe(page, next, list) + { + page_list_del(page, list); + free_domheap_page(page); + } +} + +static struct page_info *kimage_alloc_normal_control_page( + struct kexec_image *image, unsigned memflags) +{ + /* + * Control pages are special, they are the intermediaries that are + * needed while we copy the rest of the pages to their final + * resting place. As such they must not conflict with either the + * destination addresses or memory the kernel is already using. + * + * The only case where we really need more than one of these are + * for architectures where we cannot disable the MMU and must + * instead generate an identity mapped page table for all of the + * memory. + * + * At worst this runs in O(N) of the image size. + */ + struct page_list_head extra_pages; + struct page_info *page = NULL; + + INIT_PAGE_LIST_HEAD(&extra_pages); + + /* + * Loop while I can allocate a page and the page allocated is a + * destination page. + */ + do { + unsigned long mfn, emfn; + paddr_t addr, eaddr; + + page = kimage_alloc_zeroed_page(memflags); + if ( !page ) + break; + mfn = page_to_mfn(page); + emfn = mfn + 1; + addr = page_to_maddr(page); + eaddr = addr + PAGE_SIZE; + if ( kimage_is_destination_range(image, addr, eaddr) ) + { + page_list_add(page, &extra_pages); + page = NULL; + } + } while ( !page ); + + if ( page ) + { + /* Remember the allocated page... */ + page_list_add(page, &image->control_pages); + + /* + * Because the page is already in it's destination location we + * will never allocate another page at that address. + * Therefore kimage_alloc_page will not return it (again) and + * we don't need to give it an entry in image->segments[]. + */ + } + /* + * Deal with the destination pages I have inadvertently allocated. + * + * Ideally I would convert multi-page allocations into single page + * allocations, and add everything to image->dest_pages. + * + * For now it is simpler to just free the pages. + */ + kimage_free_page_list(&extra_pages); + + return page; +} + +static struct page_info *kimage_alloc_crash_control_page(struct kexec_image *image) +{ + /* + * Control pages are special, they are the intermediaries that are + * needed while we copy the rest of the pages to their final + * resting place. As such they must not conflict with either the + * destination addresses or memory the kernel is already using. + * + * Control pages are also the only pags we must allocate when + * loading a crash kernel. All of the other pages are specified + * by the segments and we just memcpy into them directly. + * + * The only case where we really need more than one of these are + * for architectures where we cannot disable the MMU and must + * instead generate an identity mapped page table for all of the + * memory. + * + * Given the low demand this implements a very simple allocator + * that finds the first hole of the appropriate size in the + * reserved memory region, and allocates all of the memory up to + * and including the hole. + */ + paddr_t hole_start, hole_end; + struct page_info *page = NULL; + + hole_start = PAGE_ALIGN(image->next_crash_page); + hole_end = hole_start + PAGE_SIZE; + while ( hole_end <= kexec_crash_area.start + kexec_crash_area.size ) + { + unsigned long i; + + /* See if I overlap any of the segments. */ + for ( i = 0; i < image->nr_segments; i++ ) + { + paddr_t mstart, mend; + + mstart = image->segments[i].dest_maddr; + mend = mstart + image->segments[i].dest_size; + if ( (hole_end > mstart) && (hole_start < mend) ) + { + /* Advance the hole to the end of the segment. */ + hole_start = PAGE_ALIGN(mend); + hole_end = hole_start + PAGE_SIZE; + break; + } + } + /* If I don't overlap any segments I have found my hole! */ + if ( i == image->nr_segments ) + { + page = maddr_to_page(hole_start); + break; + } + } + if ( page ) + { + image->next_crash_page = hole_end; + clear_domain_page(page_to_mfn(page)); + } + + return page; +} + + +struct page_info *kimage_alloc_control_page(struct kexec_image *image, + unsigned memflags) +{ + struct page_info *pages = NULL; + + switch ( image->type ) + { + case KEXEC_TYPE_DEFAULT: + pages = kimage_alloc_normal_control_page(image, memflags); + break; + case KEXEC_TYPE_CRASH: + pages = kimage_alloc_crash_control_page(image); + break; + } + return pages; +} + +static int kimage_add_entry(struct kexec_image *image, kimage_entry_t entry) +{ + kimage_entry_t *entries; + + if ( image->next_entry == KIMAGE_LAST_ENTRY ) + { + struct page_info *page; + + page = kimage_alloc_page(image, KIMAGE_NO_DEST); + if ( !page ) + return -ENOMEM; + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = page_to_maddr(page) | IND_INDIRECTION; + unmap_domain_page(entries); + + image->entry_page = page; + image->next_entry = 0; + } + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = entry; + image->next_entry++; + unmap_domain_page(entries); + + return 0; +} + +static int kimage_set_destination(struct kexec_image *image, + paddr_t destination) +{ + return kimage_add_entry(image, (destination & PAGE_MASK) | IND_DESTINATION); +} + + +static int kimage_add_page(struct kexec_image *image, paddr_t maddr) +{ + return kimage_add_entry(image, (maddr & PAGE_MASK) | IND_SOURCE); +} + + +static void kimage_free_extra_pages(struct kexec_image *image) +{ + kimage_free_page_list(&image->dest_pages); + kimage_free_page_list(&image->unusable_pages); +} + +static void kimage_terminate(struct kexec_image *image) +{ + kimage_entry_t *entries; + + entries = __map_domain_page(image->entry_page); + entries[image->next_entry] = IND_DONE; + unmap_domain_page(entries); +} + +/* + * Iterate over all the entries in the indirection pages. + * + * Call unmap_domain_page(ptr) after the loop exits. + */ +#define for_each_kimage_entry(image, ptr, entry) \ + for ( ptr = map_domain_page(image->head >> PAGE_SHIFT); \ + (entry = *ptr) && !(entry & IND_DONE); \ + ptr = (entry & IND_INDIRECTION) ? \ + (unmap_domain_page(ptr), map_domain_page(entry >> PAGE_SHIFT)) \ + : ptr + 1 ) + +static void kimage_free_entry(kimage_entry_t entry) +{ + struct page_info *page; + + page = mfn_to_page(entry >> PAGE_SHIFT); + free_domheap_page(page); +} + +static void kimage_free_all_entries(struct kexec_image *image) +{ + kimage_entry_t *ptr, entry; + kimage_entry_t ind = 0; + + if ( !image->head ) + return; + + for_each_kimage_entry(image, ptr, entry) + { + if ( entry & IND_INDIRECTION ) + { + /* Free the previous indirection page */ + if ( ind & IND_INDIRECTION ) + kimage_free_entry(ind); + /* Save this indirection page until we are done with it. */ + ind = entry; + } + else if ( entry & IND_SOURCE ) + kimage_free_entry(entry); + } + unmap_domain_page(ptr); + + /* Free the final indirection page. */ + if ( ind & IND_INDIRECTION ) + kimage_free_entry(ind); +} + +void kimage_free(struct kexec_image *image) +{ + if ( !image ) + return; + + kimage_free_extra_pages(image); + kimage_free_all_entries(image); + kimage_free_page_list(&image->control_pages); + xfree(image->segments); + xfree(image); +} + +static kimage_entry_t *kimage_dst_used(struct kexec_image *image, + paddr_t maddr) +{ + kimage_entry_t *ptr, entry; + unsigned long destination = 0; + + for_each_kimage_entry(image, ptr, entry) + { + if ( entry & IND_DESTINATION ) + destination = entry & PAGE_MASK; + else if ( entry & IND_SOURCE ) + { + if ( maddr == destination ) + return ptr; + destination += PAGE_SIZE; + } + } + unmap_domain_page(ptr); + + return NULL; +} + +static struct page_info *kimage_alloc_page(struct kexec_image *image, + paddr_t destination) +{ + /* + * Here we implement safeguards to ensure that a source page is + * not copied to its destination page before the data on the + * destination page is no longer useful. + * + * To do this we maintain the invariant that a source page is + * either its own destination page, or it is not a destination + * page at all. + * + * That is slightly stronger than required, but the proof that no + * problems will not occur is trivial, and the implementation is + * simply to verify. + * + * When allocating all pages normally this algorithm will run in + * O(N) time, but in the worst case it will run in O(N^2) time. + * If the runtime is a problem the data structures can be fixed. + */ + struct page_info *page; + paddr_t addr; + + /* + * Walk through the list of destination pages, and see if I have a + * match. + */ + page_list_for_each(page, &image->dest_pages) + { + addr = page_to_maddr(page); + if ( addr == destination ) + { + page_list_del(page, &image->dest_pages); + return page; + } + } + page = NULL; + for (;;) + { + kimage_entry_t *old; + + /* Allocate a page, if we run out of memory give up. */ + page = kimage_alloc_zeroed_page(0); + if ( !page ) + return NULL; + addr = page_to_maddr(page); + + /* If it is the destination page we want use it. */ + if ( addr == destination ) + break; + + /* If the page is not a destination page use it. */ + if ( !kimage_is_destination_range(image, addr, + addr + PAGE_SIZE) ) + break; + + /* + * I know that the page is someones destination page. See if + * there is already a source page for this destination page. + * And if so swap the source pages. + */ + old = kimage_dst_used(image, addr); + if ( old ) + { + /* If so move it. */ + unsigned long old_mfn = *old >> PAGE_SHIFT; + unsigned long mfn = addr >> PAGE_SHIFT; + + copy_domain_page(mfn, old_mfn); + clear_domain_page(old_mfn); + *old = (addr & ~PAGE_MASK) | IND_SOURCE; + unmap_domain_page(old); + + page = mfn_to_page(old_mfn); + break; + } + else + { + /* + * Place the page on the destination list; I will use it + * later. + */ + page_list_add(page, &image->dest_pages); + } + } + return page; +} + +static int kimage_load_normal_segment(struct kexec_image *image, + xen_kexec_segment_t *segment) +{ + unsigned long to_copy; + unsigned long src_offset; + paddr_t dest, end; + int ret; + + to_copy = segment->buf_size; + src_offset = 0; + dest = segment->dest_maddr; + + ret = kimage_set_destination(image, dest); + if ( ret < 0 ) + return ret; + + while ( to_copy ) + { + unsigned long dest_mfn; + struct page_info *page; + void *dest_va; + size_t size; + + dest_mfn = dest >> PAGE_SHIFT; + + size = min_t(unsigned long, PAGE_SIZE, to_copy); + + page = kimage_alloc_page(image, dest); + if ( !page ) + return -ENOMEM; + ret = kimage_add_page(image, page_to_maddr(page)); + if ( ret < 0 ) + return ret; + + dest_va = __map_domain_page(page); + ret = copy_from_guest_offset(dest_va, segment->buf.h, src_offset, size); + unmap_domain_page(dest_va); + if ( ret ) + return -EFAULT; + + to_copy -= size; + src_offset += size; + dest += PAGE_SIZE; + } + + /* Remainder of the destination should be zeroed. */ + end = segment->dest_maddr + segment->dest_size; + for ( ; dest < end; dest += PAGE_SIZE ) + kimage_add_entry(image, IND_ZERO); + + return 0; +} + +static int kimage_load_crash_segment(struct kexec_image *image, + xen_kexec_segment_t *segment) +{ + /* + * For crash dumps kernels we simply copy the data from user space + * to it's destination. + */ + paddr_t dest; + unsigned long sbytes, dbytes; + int ret = 0; + unsigned long src_offset = 0; + + sbytes = segment->buf_size; + dbytes = segment->dest_size; + dest = segment->dest_maddr; + + while ( dbytes ) + { + unsigned long dest_mfn; + void *dest_va; + size_t schunk, dchunk; + + dest_mfn = dest >> PAGE_SHIFT; + + dchunk = PAGE_SIZE; + schunk = min(dchunk, sbytes); + + dest_va = map_domain_page(dest_mfn); + if ( !dest_va ) + return -EINVAL; + + ret = copy_from_guest_offset(dest_va, segment->buf.h, src_offset, schunk); + memset(dest_va + schunk, 0, dchunk - schunk); + + unmap_domain_page(dest_va); + if ( ret ) + return -EFAULT; + + dbytes -= dchunk; + sbytes -= schunk; + dest += dchunk; + src_offset += schunk; + } + + return 0; +} + +static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *segment) +{ + int result = -ENOMEM; + + if ( !guest_handle_is_null(segment->buf.h) ) + { + switch ( image->type ) + { + case KEXEC_TYPE_DEFAULT: + result = kimage_load_normal_segment(image, segment); + break; + case KEXEC_TYPE_CRASH: + result = kimage_load_crash_segment(image, segment); + break; + } + } + + return result; +} + +int kimage_alloc(struct kexec_image **rimage, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segment) +{ + int result; + + switch( type ) + { + case KEXEC_TYPE_DEFAULT: + result = kimage_normal_alloc(rimage, entry_maddr, nr_segments, segment); + break; + case KEXEC_TYPE_CRASH: + result = kimage_crash_alloc(rimage, entry_maddr, nr_segments, segment); + break; + default: + result = -EINVAL; + break; + } + if ( result < 0 ) + return result; + + (*rimage)->arch = arch; + + return result; +} + +int kimage_load_segments(struct kexec_image *image) +{ + int s; + int result; + + for ( s = 0; s < image->nr_segments; s++ ) { + result = kimage_load_segment(image, &image->segments[s]); + if ( result < 0 ) + return result; + } + kimage_terminate(image); + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/kimage.h b/xen/include/xen/kimage.h new file mode 100644 index 0000000..0ebd37a --- /dev/null +++ b/xen/include/xen/kimage.h @@ -0,0 +1,62 @@ +#ifndef __XEN_KIMAGE_H__ +#define __XEN_KIMAGE_H__ + +#define IND_DESTINATION 0x1 +#define IND_INDIRECTION 0x2 +#define IND_DONE 0x4 +#define IND_SOURCE 0x8 +#define IND_ZERO 0x10 + +#ifndef __ASSEMBLY__ + +#include +#include +#include + +#define KEXEC_SEGMENT_MAX 16 + +typedef paddr_t kimage_entry_t; + +struct kexec_image { + uint8_t type; + uint16_t arch; + uint64_t entry_maddr; + uint32_t nr_segments; + xen_kexec_segment_t *segments; + + kimage_entry_t head; + struct page_info *entry_page; + unsigned next_entry; + + struct page_info *control_code_page; + struct page_info *aux_page; + + struct page_list_head control_pages; + struct page_list_head dest_pages; + struct page_list_head unusable_pages; + + /* Address of next control page to allocate for crash kernels. */ + paddr_t next_crash_page; +}; + +int kimage_alloc(struct kexec_image **rimage, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segment); +void kimage_free(struct kexec_image *image); +int kimage_load_segments(struct kexec_image *image); +struct page_info *kimage_alloc_control_page(struct kexec_image *image, + unsigned memflags); + +#endif /* __ASSEMBLY__ */ + +#endif /* __XEN_KIMAGE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRd-0006lr-HL; Wed, 13 Nov 2013 05:56:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRc-0006lQ-1g for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:52 +0000 Received: from [85.158.139.211:2793] by server-1.bemta-5.messagelabs.com id FA/CF-16887-3A413825; Wed, 13 Nov 2013 05:56:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384322206!1644777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 602 invoked from network); 13 Nov 2013 05:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRW-000442-GC for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRW-0007cM-Eo for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:46 +0000 Date: Wed, 13 Nov 2013 05:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: extend hypercall with improved load/unload ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a82d5cf352d8693a6088763ea7ab2f1a0983d71 Author: David Vrabel AuthorDate: Tue Nov 12 11:44:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:44:41 2013 +0100 kexec: extend hypercall with improved load/unload ops In the existing kexec hypercall, the load and unload ops depend on internals of the Linux kernel (the page list and code page provided by the kernel). The code page is used to transition between Xen context and the image so using kernel code doesn't make sense and will not work for PVH guests. Add replacement KEXEC_CMD_kexec_load and KEXEC_CMD_kexec_unload ops that no longer require a code page to be provided by the guest -- Xen now provides the code for calling the image directly. The new load op looks similar to the Linux kexec_load system call and allows the guest to provide the image data to be loaded. The guest specifies the architecture of the image which may be a 32-bit subarch of the hypervisor's architecture (i.e., an EM_386 image on an EM_X86_64 hypervisor). The toolstack can now load images without kernel involvement. This is required for supporting kexec when using a dom0 with an upstream kernel. Crash images are copied directly into the crash region on load. Default images are copied into domheap pages and a list of source and destination machine addresses is created. This is list is used in kexec_reloc() to relocate the image to its destination. The old load and unload sub-ops are still available (as KEXEC_CMD_load_v1 and KEXEC_CMD_unload_v1) and are implemented on top of the new infrastructure. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/arch/x86/machine_kexec.c | 192 +++++++++++------ xen/arch/x86/x86_64/Makefile | 2 +- xen/arch/x86/x86_64/compat_kexec.S | 187 ---------------- xen/arch/x86/x86_64/kexec_reloc.S | 198 +++++++++++++++++ xen/common/kexec.c | 398 +++++++++++++++++++++++++++++------ xen/common/kimage.c | 122 +++++++++++- xen/include/asm-x86/fixmap.h | 3 - xen/include/asm-x86/machine_kexec.h | 16 ++ xen/include/xen/kexec.h | 16 +- xen/include/xen/kimage.h | 6 + 10 files changed, 804 insertions(+), 336 deletions(-) diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c index 68b9705..b70d5a6 100644 --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -1,9 +1,18 @@ /****************************************************************************** * machine_kexec.c * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Portions derived from Linux's arch/x86/kernel/machine_kexec_64.c. + * + * Copyright (C) 2002-2005 Eric Biederman + * * Xen port written by: * - Simon 'Horms' Horman * - Magnus Damm + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. */ #include @@ -11,63 +20,124 @@ #include #include #include +#include +#include -typedef void (*relocate_new_kernel_t)( - unsigned long indirection_page, - unsigned long *page_list, - unsigned long start_address, - unsigned int preserve_context); - -int machine_kexec_load(int type, int slot, xen_kexec_image_t *image) +/* + * Add a mapping for a page to the page tables used during kexec. + */ +int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, + unsigned long maddr) { - unsigned long prev_ma = 0; - int fix_base = FIX_KEXEC_BASE_0 + (slot * (KEXEC_XEN_NO_PAGES >> 1)); - int k; + struct page_info *l4_page; + struct page_info *l3_page; + struct page_info *l2_page; + struct page_info *l1_page; + l4_pgentry_t *l4 = NULL; + l3_pgentry_t *l3 = NULL; + l2_pgentry_t *l2 = NULL; + l1_pgentry_t *l1 = NULL; + int ret = -ENOMEM; + + l4_page = image->aux_page; + if ( !l4_page ) + { + l4_page = kimage_alloc_control_page(image, 0); + if ( !l4_page ) + goto out; + image->aux_page = l4_page; + } - /* setup fixmap to point to our pages and record the virtual address - * in every odd index in page_list[]. - */ + l4 = __map_domain_page(l4_page); + l4 += l4_table_offset(vaddr); + if ( !(l4e_get_flags(*l4) & _PAGE_PRESENT) ) + { + l3_page = kimage_alloc_control_page(image, 0); + if ( !l3_page ) + goto out; + l4e_write(l4, l4e_from_page(l3_page, __PAGE_HYPERVISOR)); + } + else + l3_page = l4e_get_page(*l4); + + l3 = __map_domain_page(l3_page); + l3 += l3_table_offset(vaddr); + if ( !(l3e_get_flags(*l3) & _PAGE_PRESENT) ) + { + l2_page = kimage_alloc_control_page(image, 0); + if ( !l2_page ) + goto out; + l3e_write(l3, l3e_from_page(l2_page, __PAGE_HYPERVISOR)); + } + else + l2_page = l3e_get_page(*l3); + + l2 = __map_domain_page(l2_page); + l2 += l2_table_offset(vaddr); + if ( !(l2e_get_flags(*l2) & _PAGE_PRESENT) ) + { + l1_page = kimage_alloc_control_page(image, 0); + if ( !l1_page ) + goto out; + l2e_write(l2, l2e_from_page(l1_page, __PAGE_HYPERVISOR)); + } + else + l1_page = l2e_get_page(*l2); + + l1 = __map_domain_page(l1_page); + l1 += l1_table_offset(vaddr); + l1e_write(l1, l1e_from_pfn(maddr >> PAGE_SHIFT, __PAGE_HYPERVISOR)); + + ret = 0; +out: + if ( l1 ) + unmap_domain_page(l1); + if ( l2 ) + unmap_domain_page(l2); + if ( l3 ) + unmap_domain_page(l3); + if ( l4 ) + unmap_domain_page(l4); + return ret; +} - for ( k = 0; k < KEXEC_XEN_NO_PAGES; k++ ) +int machine_kexec_load(struct kexec_image *image) +{ + void *code_page; + int ret; + + switch ( image->arch ) { - if ( (k & 1) == 0 ) - { - /* Even pages: machine address. */ - prev_ma = image->page_list[k]; - } - else - { - /* Odd pages: va for previous ma. */ - if ( is_pv_32on64_domain(dom0) ) - { - /* - * The compatability bounce code sets up a page table - * with a 1-1 mapping of the first 1G of memory so - * VA==PA here. - * - * This Linux purgatory code still sets up separate - * high and low mappings on the control page (entries - * 0 and 1) but it is harmless if they are equal since - * that PT is not live at the time. - */ - image->page_list[k] = prev_ma; - } - else - { - set_fixmap(fix_base + (k >> 1), prev_ma); - image->page_list[k] = fix_to_virt(fix_base + (k >> 1)); - } - } + case EM_386: + case EM_X86_64: + break; + default: + return -EINVAL; } + code_page = __map_domain_page(image->control_code_page); + memcpy(code_page, kexec_reloc, kexec_reloc_size); + unmap_domain_page(code_page); + + /* + * Add a mapping for the control code page to the same virtual + * address as kexec_reloc. This allows us to keep running after + * these page tables are loaded in kexec_reloc. + */ + ret = machine_kexec_add_page(image, (unsigned long)kexec_reloc, + page_to_maddr(image->control_code_page)); + if ( ret < 0 ) + return ret; + return 0; } -void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image) +void machine_kexec_unload(struct kexec_image *image) { + /* no-op. kimage_free() frees all control pages. */ } -void machine_reboot_kexec(xen_kexec_image_t *image) +void machine_reboot_kexec(struct kexec_image *image) { BUG_ON(smp_processor_id() != 0); smp_send_stop(); @@ -75,13 +145,10 @@ void machine_reboot_kexec(xen_kexec_image_t *image) BUG(); } -void machine_kexec(xen_kexec_image_t *image) +void machine_kexec(struct kexec_image *image) { - struct desc_ptr gdt_desc = { - .base = (unsigned long)(boot_cpu_gdt_table - FIRST_RESERVED_GDT_ENTRY), - .limit = LAST_RESERVED_GDT_BYTE - }; int i; + unsigned long reloc_flags = 0; /* We are about to permenantly jump out of the Xen context into the kexec * purgatory code. We really dont want to be still servicing interupts. @@ -109,29 +176,12 @@ void machine_kexec(xen_kexec_image_t *image) * not like running with NMIs disabled. */ enable_nmis(); - /* - * compat_machine_kexec() returns to idle pagetables, which requires us - * to be running on a static GDT mapping (idle pagetables have no GDT - * mappings in their per-domain mapping area). - */ - asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); + if ( image->arch == EM_386 ) + reloc_flags |= KEXEC_RELOC_FLAG_COMPAT; - if ( is_pv_32on64_domain(dom0) ) - { - compat_machine_kexec(image->page_list[1], - image->indirection_page, - image->page_list, - image->start_address); - } - else - { - relocate_new_kernel_t rnk; - - rnk = (relocate_new_kernel_t) image->page_list[1]; - (*rnk)(image->indirection_page, image->page_list, - image->start_address, - 0 /* preserve_context */); - } + kexec_reloc(page_to_maddr(image->control_code_page), + page_to_maddr(image->aux_page), + image->head, image->entry_maddr, reloc_flags); } int machine_kexec_get(xen_kexec_range_t *range) diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index d56e12d..7f8fb3d 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -11,11 +11,11 @@ obj-y += mmconf-fam10h.o obj-y += mmconfig_64.o obj-y += mmconfig-shared.o obj-y += compat.o -obj-bin-y += compat_kexec.o obj-y += domain.o obj-y += physdev.o obj-y += platform_hypercall.o obj-y += cpu_idle.o obj-y += cpufreq.o +obj-bin-y += kexec_reloc.o obj-$(crash_debug) += gdbstub.o diff --git a/xen/arch/x86/x86_64/compat_kexec.S b/xen/arch/x86/x86_64/compat_kexec.S deleted file mode 100644 index fc92af9..0000000 --- a/xen/arch/x86/x86_64/compat_kexec.S +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Compatibility kexec handler. - */ - -/* - * NOTE: We rely on Xen not relocating itself above the 4G boundary. This is - * currently true but if it ever changes then compat_pg_table will - * need to be moved back below 4G at run time. - */ - -#include - -#include -#include -#include - -/* The unrelocated physical address of a symbol. */ -#define SYM_PHYS(sym) ((sym) - __XEN_VIRT_START) - -/* Load physical address of symbol into register and relocate it. */ -#define RELOCATE_SYM(sym,reg) mov $SYM_PHYS(sym), reg ; \ - add xen_phys_start(%rip), reg - -/* - * Relocate a physical address in memory. Size of temporary register - * determines size of the value to relocate. - */ -#define RELOCATE_MEM(addr,reg) mov addr(%rip), reg ; \ - add xen_phys_start(%rip), reg ; \ - mov reg, addr(%rip) - - .text - - .code64 - -ENTRY(compat_machine_kexec) - /* x86/64 x86/32 */ - /* %rdi - relocate_new_kernel_t CALL */ - /* %rsi - indirection page 4(%esp) */ - /* %rdx - page_list 8(%esp) */ - /* %rcx - start address 12(%esp) */ - /* cpu has pae 16(%esp) */ - - /* Shim the 64 bit page_list into a 32 bit page_list. */ - mov $12,%r9 - lea compat_page_list(%rip), %rbx -1: dec %r9 - movl (%rdx,%r9,8),%eax - movl %eax,(%rbx,%r9,4) - test %r9,%r9 - jnz 1b - - RELOCATE_SYM(compat_page_list,%rdx) - - /* Relocate compatibility mode entry point address. */ - RELOCATE_MEM(compatibility_mode_far,%eax) - - /* Relocate compat_pg_table. */ - RELOCATE_MEM(compat_pg_table, %rax) - RELOCATE_MEM(compat_pg_table+0x8, %rax) - RELOCATE_MEM(compat_pg_table+0x10,%rax) - RELOCATE_MEM(compat_pg_table+0x18,%rax) - - /* - * Setup an identity mapped region in PML4[0] of idle page - * table. - */ - RELOCATE_SYM(l3_identmap,%rax) - or $0x63,%rax - mov %rax, idle_pg_table(%rip) - - /* Switch to idle page table. */ - RELOCATE_SYM(idle_pg_table,%rax) - movq %rax, %cr3 - - /* Switch to identity mapped compatibility stack. */ - RELOCATE_SYM(compat_stack,%rax) - movq %rax, %rsp - - /* Save xen_phys_start for 32 bit code. */ - movq xen_phys_start(%rip), %rbx - - /* Jump to low identity mapping in compatibility mode. */ - ljmp *compatibility_mode_far(%rip) - ud2 - -compatibility_mode_far: - .long SYM_PHYS(compatibility_mode) - .long __HYPERVISOR_CS32 - - /* - * We use 5 words of stack for the arguments passed to the kernel. The - * kernel only uses 1 word before switching to its own stack. Allocate - * 16 words to give "plenty" of room. - */ - .fill 16,4,0 -compat_stack: - - .code32 - -#undef RELOCATE_SYM -#undef RELOCATE_MEM - -/* - * Load physical address of symbol into register and relocate it. %rbx - * contains xen_phys_start(%rip) saved before jump to compatibility - * mode. - */ -#define RELOCATE_SYM(sym,reg) mov $SYM_PHYS(sym), reg ; \ - add %ebx, reg - -compatibility_mode: - /* Setup some sane segments. */ - movl $__HYPERVISOR_DS32, %eax - movl %eax, %ds - movl %eax, %es - movl %eax, %fs - movl %eax, %gs - movl %eax, %ss - - /* Push arguments onto stack. */ - pushl $0 /* 20(%esp) - preserve context */ - pushl $1 /* 16(%esp) - cpu has pae */ - pushl %ecx /* 12(%esp) - start address */ - pushl %edx /* 8(%esp) - page list */ - pushl %esi /* 4(%esp) - indirection page */ - pushl %edi /* 0(%esp) - CALL */ - - /* Disable paging and therefore leave 64 bit mode. */ - movl %cr0, %eax - andl $~X86_CR0_PG, %eax - movl %eax, %cr0 - - /* Switch to 32 bit page table. */ - RELOCATE_SYM(compat_pg_table, %eax) - movl %eax, %cr3 - - /* Clear MSR_EFER[LME], disabling long mode */ - movl $MSR_EFER,%ecx - rdmsr - btcl $_EFER_LME,%eax - wrmsr - - /* Re-enable paging, but only 32 bit mode now. */ - movl %cr0, %eax - orl $X86_CR0_PG, %eax - movl %eax, %cr0 - jmp 1f -1: - - popl %eax - call *%eax - ud2 - - .data - .align 4 -compat_page_list: - .fill 12,4,0 - - .align 32,0 - - /* - * These compat page tables contain an identity mapping of the - * first 4G of the physical address space. - */ -compat_pg_table: - .long SYM_PHYS(compat_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0 - - .section .data.page_aligned, "aw", @progbits - .align PAGE_SIZE,0 -compat_pg_table_l2: - .macro identmap from=0, count=512 - .if \count-1 - identmap "(\from+0)","(\count/2)" - identmap "(\from+(0x200000*(\count/2)))","(\count/2)" - .else - .quad 0x00000000000000e3 + \from - .endif - .endm - - identmap 0x00000000 - identmap 0x40000000 - identmap 0x80000000 - identmap 0xc0000000 diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S new file mode 100644 index 0000000..7a16c85 --- /dev/null +++ b/xen/arch/x86/x86_64/kexec_reloc.S @@ -0,0 +1,198 @@ +/* + * Relocate a kexec_image to its destination and call it. + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Portions derived from Linux's arch/x86/kernel/relocate_kernel_64.S. + * + * Copyright (C) 2002-2005 Eric Biederman + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ +#include +#include + +#include +#include +#include +#include + + .text + .align PAGE_SIZE + .code64 + +ENTRY(kexec_reloc) + /* %rdi - code page maddr */ + /* %rsi - page table maddr */ + /* %rdx - indirection page maddr */ + /* %rcx - entry maddr (%rbp) */ + /* %r8 - flags */ + + movq %rcx, %rbp + + /* Setup stack. */ + leaq (reloc_stack - kexec_reloc)(%rdi), %rsp + + /* Load reloc page table. */ + movq %rsi, %cr3 + + /* Jump to identity mapped code. */ + leaq (identity_mapped - kexec_reloc)(%rdi), %rax + jmpq *%rax + +identity_mapped: + /* + * Set cr0 to a known state: + * - Paging enabled + * - Alignment check disabled + * - Write protect disabled + * - No task switch + * - Don't do FP software emulation. + * - Protected mode enabled + */ + movq %cr0, %rax + andl $~(X86_CR0_AM | X86_CR0_WP | X86_CR0_TS | X86_CR0_EM), %eax + orl $(X86_CR0_PG | X86_CR0_PE), %eax + movq %rax, %cr0 + + /* + * Set cr4 to a known state: + * - physical address extension enabled + */ + movl $X86_CR4_PAE, %eax + movq %rax, %cr4 + + movq %rdx, %rdi + call relocate_pages + + /* Need to switch to 32-bit mode? */ + testq $KEXEC_RELOC_FLAG_COMPAT, %r8 + jnz call_32_bit + +call_64_bit: + /* Call the image entry point. This should never return. */ + callq *%rbp + ud2 + +call_32_bit: + /* Setup IDT. */ + lidt compat_mode_idt(%rip) + + /* Load compat GDT. */ + leaq compat_mode_gdt(%rip), %rax + movq %rax, (compat_mode_gdt_desc + 2)(%rip) + lgdt compat_mode_gdt_desc(%rip) + + /* Relocate compatibility mode entry point address. */ + leal compatibility_mode(%rip), %eax + movl %eax, compatibility_mode_far(%rip) + + /* Enter compatibility mode. */ + ljmp *compatibility_mode_far(%rip) + +relocate_pages: + /* %rdi - indirection page maddr */ + pushq %rbx + + cld + movq %rdi, %rbx + xorl %edi, %edi + xorl %esi, %esi + +next_entry: /* top, read another word for the indirection page */ + + movq (%rbx), %rcx + addq $8, %rbx +is_dest: + testb $IND_DESTINATION, %cl + jz is_ind + movq %rcx, %rdi + andq $PAGE_MASK, %rdi + jmp next_entry +is_ind: + testb $IND_INDIRECTION, %cl + jz is_done + movq %rcx, %rbx + andq $PAGE_MASK, %rbx + jmp next_entry +is_done: + testb $IND_DONE, %cl + jnz done +is_source: + testb $IND_SOURCE, %cl + jz is_zero + movq %rcx, %rsi /* For every source page do a copy */ + andq $PAGE_MASK, %rsi + movl $(PAGE_SIZE / 8), %ecx + rep movsq + jmp next_entry +is_zero: + testb $IND_ZERO, %cl + jz next_entry + movl $(PAGE_SIZE / 8), %ecx /* Zero the destination page. */ + xorl %eax, %eax + rep stosq + jmp next_entry +done: + popq %rbx + ret + + .code32 + +compatibility_mode: + /* Setup some sane segments. */ + movl $0x0008, %eax + movl %eax, %ds + movl %eax, %es + movl %eax, %fs + movl %eax, %gs + movl %eax, %ss + + /* Disable paging and therefore leave 64 bit mode. */ + movl %cr0, %eax + andl $~X86_CR0_PG, %eax + movl %eax, %cr0 + + /* Disable long mode */ + movl $MSR_EFER, %ecx + rdmsr + andl $~EFER_LME, %eax + wrmsr + + /* Clear cr4 to disable PAE. */ + xorl %eax, %eax + movl %eax, %cr4 + + /* Call the image entry point. This should never return. */ + call *%ebp + ud2 + + .align 4 +compatibility_mode_far: + .long 0x00000000 /* set in call_32_bit above */ + .word 0x0010 + +compat_mode_gdt_desc: + .word (3*8)-1 + .quad 0x0000000000000000 /* set in call_32_bit above */ + + .align 8 +compat_mode_gdt: + .quad 0x0000000000000000 /* null */ + .quad 0x00cf92000000ffff /* 0x0008 ring 0 data */ + .quad 0x00cf9a000000ffff /* 0x0010 ring 0 code, compatibility */ + +compat_mode_idt: + .word 0 /* limit */ + .long 0 /* base */ + + /* + * 16 words of stack are more than enough. + */ + .fill 16,8,0 +reloc_stack: + + .globl kexec_reloc_size +kexec_reloc_size: + .long . - kexec_reloc diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7b23df0..c5450ba 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +48,7 @@ static Elf_Note *xen_crash_note; static cpumask_t crash_saved_cpus; -static xen_kexec_image_t kexec_image[KEXEC_IMAGE_NR]; +static struct kexec_image *kexec_image[KEXEC_IMAGE_NR]; #define KEXEC_FLAG_DEFAULT_POS (KEXEC_IMAGE_NR + 0) #define KEXEC_FLAG_CRASH_POS (KEXEC_IMAGE_NR + 1) @@ -55,8 +56,6 @@ static xen_kexec_image_t kexec_image[KEXEC_IMAGE_NR]; static unsigned long kexec_flags = 0; /* the lowest bits are for KEXEC_IMAGE... */ -static spinlock_t kexec_lock = SPIN_LOCK_UNLOCKED; - static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES]; static size_t vmcoreinfo_size = 0; @@ -311,14 +310,14 @@ void kexec_crash(void) kexec_common_shutdown(); kexec_crash_save_cpu(); machine_crash_shutdown(); - machine_kexec(&kexec_image[KEXEC_IMAGE_CRASH_BASE + pos]); + machine_kexec(kexec_image[KEXEC_IMAGE_CRASH_BASE + pos]); BUG(); } static long kexec_reboot(void *_image) { - xen_kexec_image_t *image = _image; + struct kexec_image *image = _image; kexecing = TRUE; @@ -734,63 +733,264 @@ static void crash_save_vmcoreinfo(void) #endif } -static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_v1_t *load) +static void kexec_unload_image(struct kexec_image *image) { - xen_kexec_image_t *image; + if ( !image ) + return; + + machine_kexec_unload(image); + kimage_free(image); +} + +static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_exec_t exec; + struct kexec_image *image; + int base, bit, pos, ret = -EINVAL; + + if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) + return -EFAULT; + + if ( kexec_load_get_bits(exec.type, &base, &bit) ) + return -EINVAL; + + pos = (test_bit(bit, &kexec_flags) != 0); + + /* Only allow kexec/kdump into loaded images */ + if ( !test_bit(base + pos, &kexec_flags) ) + return -ENOENT; + + switch (exec.type) + { + case KEXEC_TYPE_DEFAULT: + image = kexec_image[base + pos]; + ret = continue_hypercall_on_cpu(0, kexec_reboot, image); + break; + case KEXEC_TYPE_CRASH: + kexec_crash(); /* Does not return */ + break; + } + + return -EINVAL; /* never reached */ +} + +static int kexec_swap_images(int type, struct kexec_image *new, + struct kexec_image **old) +{ + static DEFINE_SPINLOCK(kexec_lock); int base, bit, pos; - int ret = 0; + int new_slot, old_slot; + + *old = NULL; + + spin_lock(&kexec_lock); + + if ( test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) + { + spin_unlock(&kexec_lock); + return -EBUSY; + } - if ( kexec_load_get_bits(load->type, &base, &bit) ) + if ( kexec_load_get_bits(type, &base, &bit) ) return -EINVAL; pos = (test_bit(bit, &kexec_flags) != 0); + old_slot = base + pos; + new_slot = base + !pos; - /* Load the user data into an unused image */ - if ( op == KEXEC_CMD_kexec_load ) + if ( new ) { - image = &kexec_image[base + !pos]; + kexec_image[new_slot] = new; + set_bit(new_slot, &kexec_flags); + } + change_bit(bit, &kexec_flags); - BUG_ON(test_bit((base + !pos), &kexec_flags)); /* must be free */ + clear_bit(old_slot, &kexec_flags); + *old = kexec_image[old_slot]; - memcpy(image, &load->image, sizeof(*image)); + spin_unlock(&kexec_lock); - if ( !(ret = machine_kexec_load(load->type, base + !pos, image)) ) - { - /* Set image present bit */ - set_bit((base + !pos), &kexec_flags); + return 0; +} - /* Make new image the active one */ - change_bit(bit, &kexec_flags); - } +static int kexec_load_slot(struct kexec_image *kimage) +{ + struct kexec_image *old_kimage; + int ret = -ENOMEM; + + ret = machine_kexec_load(kimage); + if ( ret < 0 ) + return ret; + + crash_save_vmcoreinfo(); + + ret = kexec_swap_images(kimage->type, kimage, &old_kimage); + if ( ret < 0 ) + return ret; + + kexec_unload_image(old_kimage); + + return 0; +} + +static uint16_t kexec_load_v1_arch(void) +{ +#ifdef CONFIG_X86 + return is_pv_32on64_domain(dom0) ? EM_386 : EM_X86_64; +#else + return EM_NONE; +#endif +} - crash_save_vmcoreinfo(); +static int kexec_segments_add_segment( + unsigned int *nr_segments, xen_kexec_segment_t *segments, + unsigned long mfn) +{ + paddr_t maddr = (paddr_t)mfn << PAGE_SHIFT; + unsigned int n = *nr_segments; + + /* Need a new segment? */ + if ( n == 0 + || segments[n-1].dest_maddr + segments[n-1].dest_size != maddr ) + { + n++; + if ( n > KEXEC_SEGMENT_MAX ) + return -EINVAL; + *nr_segments = n; + + set_xen_guest_handle(segments[n-1].buf.h, NULL); + segments[n-1].buf_size = 0; + segments[n-1].dest_maddr = maddr; + segments[n-1].dest_size = 0; } - /* Unload the old image if present and load successful */ - if ( ret == 0 && !test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) + return 0; +} + +static int kexec_segments_from_ind_page(unsigned long mfn, + unsigned int *nr_segments, + xen_kexec_segment_t *segments, + bool_t compat) +{ + void *page; + kimage_entry_t *entry; + int ret = 0; + + page = map_domain_page(mfn); + + /* + * Walk the indirection page list, adding destination pages to the + * segments. + */ + for ( entry = page; ; ) { - if ( test_and_clear_bit((base + pos), &kexec_flags) ) + unsigned long ind; + + ind = kimage_entry_ind(entry, compat); + mfn = kimage_entry_mfn(entry, compat); + + switch ( ind ) { - image = &kexec_image[base + pos]; - machine_kexec_unload(load->type, base + pos, image); + case IND_DESTINATION: + ret = kexec_segments_add_segment(nr_segments, segments, mfn); + if ( ret < 0 ) + goto done; + break; + case IND_INDIRECTION: + unmap_domain_page(page); + entry = page = map_domain_page(mfn); + continue; + case IND_DONE: + goto done; + case IND_SOURCE: + if ( *nr_segments == 0 ) + { + ret = -EINVAL; + goto done; + } + segments[*nr_segments-1].dest_size += PAGE_SIZE; + break; + default: + ret = -EINVAL; + goto done; } + entry = kimage_entry_next(entry, compat); } +done: + unmap_domain_page(page); + return ret; +} +static int kexec_do_load_v1(xen_kexec_load_v1_t *load, int compat) +{ + struct kexec_image *kimage = NULL; + xen_kexec_segment_t *segments; + uint16_t arch; + unsigned int nr_segments = 0; + unsigned long ind_mfn = load->image.indirection_page >> PAGE_SHIFT; + int ret; + + arch = kexec_load_v1_arch(); + if ( arch == EM_NONE ) + return -ENOSYS; + + segments = xmalloc_array(xen_kexec_segment_t, KEXEC_SEGMENT_MAX); + if ( segments == NULL ) + return -ENOMEM; + + /* + * Work out the image segments (destination only) from the + * indirection pages. + * + * This is needed so we don't allocate pages that will overlap + * with the destination when building the new set of indirection + * pages below. + */ + ret = kexec_segments_from_ind_page(ind_mfn, &nr_segments, segments, compat); + if ( ret < 0 ) + goto error; + + ret = kimage_alloc(&kimage, load->type, arch, load->image.start_address, + nr_segments, segments); + if ( ret < 0 ) + goto error; + + /* + * Build a new set of indirection pages in the native format. + * + * This walks the guest provided indirection pages a second time. + * The guest could have altered then, invalidating the segment + * information constructed above. This will only result in the + * resulting image being potentially unrelocatable. + */ + ret = kimage_build_ind(kimage, ind_mfn, compat); + if ( ret < 0 ) + goto error; + + ret = kexec_load_slot(kimage); + if ( ret < 0 ) + goto error; + + return 0; + +error: + if ( !kimage ) + xfree(segments); + kimage_free(kimage); return ret; } -static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load_v1(XEN_GUEST_HANDLE_PARAM(void) uarg) { xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&load, uarg, 1)) ) return -EFAULT; - return kexec_load_unload_internal(op, &load); + return kexec_do_load_v1(&load, 0); } -static int kexec_load_unload_compat(unsigned long op, - XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load_v1_compat(XEN_GUEST_HANDLE_PARAM(void) uarg) { #ifdef CONFIG_COMPAT compat_kexec_load_v1_t compat_load; @@ -809,49 +1009,113 @@ static int kexec_load_unload_compat(unsigned long op, load.type = compat_load.type; XLAT_kexec_image(&load.image, &compat_load.image); - return kexec_load_unload_internal(op, &load); -#else /* CONFIG_COMPAT */ + return kexec_do_load_v1(&load, 1); +#else return 0; -#endif /* CONFIG_COMPAT */ +#endif } -static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load(XEN_GUEST_HANDLE_PARAM(void) uarg) { - xen_kexec_exec_t exec; - xen_kexec_image_t *image; - int base, bit, pos, ret = -EINVAL; + xen_kexec_load_t load; + xen_kexec_segment_t *segments; + struct kexec_image *kimage = NULL; + int ret; - if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) + if ( copy_from_guest(&load, uarg, 1) ) return -EFAULT; - if ( kexec_load_get_bits(exec.type, &base, &bit) ) + if ( load.nr_segments >= KEXEC_SEGMENT_MAX ) return -EINVAL; - pos = (test_bit(bit, &kexec_flags) != 0); - - /* Only allow kexec/kdump into loaded images */ - if ( !test_bit(base + pos, &kexec_flags) ) - return -ENOENT; + segments = xmalloc_array(xen_kexec_segment_t, load.nr_segments); + if ( segments == NULL ) + return -ENOMEM; - switch (exec.type) + if ( copy_from_guest(segments, load.segments.h, load.nr_segments) ) { - case KEXEC_TYPE_DEFAULT: - image = &kexec_image[base + pos]; - ret = continue_hypercall_on_cpu(0, kexec_reboot, image); - break; - case KEXEC_TYPE_CRASH: - kexec_crash(); /* Does not return */ - break; + ret = -EFAULT; + goto error; } - return -EINVAL; /* never reached */ + ret = kimage_alloc(&kimage, load.type, load.arch, load.entry_maddr, + load.nr_segments, segments); + if ( ret < 0 ) + goto error; + + ret = kimage_load_segments(kimage); + if ( ret < 0 ) + goto error; + + ret = kexec_load_slot(kimage); + if ( ret < 0 ) + goto error; + + return 0; + +error: + if ( ! kimage ) + xfree(segments); + kimage_free(kimage); + return ret; +} + +static int kexec_do_unload(xen_kexec_unload_t *unload) +{ + struct kexec_image *old_kimage; + int ret; + + ret = kexec_swap_images(unload->type, NULL, &old_kimage); + if ( ret < 0 ) + return ret; + + kexec_unload_image(old_kimage); + + return 0; +} + +static int kexec_unload_v1(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_load_v1_t load; + xen_kexec_unload_t unload; + + if ( copy_from_guest(&load, uarg, 1) ) + return -EFAULT; + + unload.type = load.type; + return kexec_do_unload(&unload); +} + +static int kexec_unload_v1_compat(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ +#ifdef CONFIG_COMPAT + compat_kexec_load_v1_t compat_load; + xen_kexec_unload_t unload; + + if ( copy_from_guest(&compat_load, uarg, 1) ) + return -EFAULT; + + unload.type = compat_load.type; + return kexec_do_unload(&unload); +#else + return 0; +#endif +} + +static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_unload_t unload; + + if ( unlikely(copy_from_guest(&unload, uarg, 1)) ) + return -EFAULT; + + return kexec_do_unload(&unload); } static int do_kexec_op_internal(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg, bool_t compat) { - unsigned long flags; int ret = -EINVAL; ret = xsm_kexec(XSM_PRIV); @@ -867,20 +1131,26 @@ static int do_kexec_op_internal(unsigned long op, ret = kexec_get_range(uarg); break; case KEXEC_CMD_kexec_load_v1: + if ( compat ) + ret = kexec_load_v1_compat(uarg); + else + ret = kexec_load_v1(uarg); + break; case KEXEC_CMD_kexec_unload_v1: - spin_lock_irqsave(&kexec_lock, flags); - if (!test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags)) - { - if (compat) - ret = kexec_load_unload_compat(op, uarg); - else - ret = kexec_load_unload(op, uarg); - } - spin_unlock_irqrestore(&kexec_lock, flags); + if ( compat ) + ret = kexec_unload_v1_compat(uarg); + else + ret = kexec_unload_v1(uarg); break; case KEXEC_CMD_kexec: ret = kexec_exec(uarg); break; + case KEXEC_CMD_kexec_load: + ret = kexec_load(uarg); + break; + case KEXEC_CMD_kexec_unload: + ret = kexec_unload(uarg); + break; } return ret; diff --git a/xen/common/kimage.c b/xen/common/kimage.c index cba4458..5c3e3b3 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -175,11 +175,20 @@ static int do_kimage_alloc(struct kexec_image **rimage, paddr_t entry, image->control_code_page = kimage_alloc_control_page(image, MEMF_bits(32)); if ( !image->control_code_page ) goto out; + result = machine_kexec_add_page(image, + page_to_maddr(image->control_code_page), + page_to_maddr(image->control_code_page)); + if ( result < 0 ) + goto out; /* Add an empty indirection page. */ image->entry_page = kimage_alloc_control_page(image, 0); if ( !image->entry_page ) goto out; + result = machine_kexec_add_page(image, page_to_maddr(image->entry_page), + page_to_maddr(image->entry_page)); + if ( result < 0 ) + goto out; image->head = page_to_maddr(image->entry_page); @@ -594,7 +603,7 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, if ( addr == destination ) { page_list_del(page, &image->dest_pages); - return page; + goto found; } } page = NULL; @@ -646,6 +655,8 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, page_list_add(page, &image->dest_pages); } } +found: + machine_kexec_add_page(image, page_to_maddr(page), page_to_maddr(page)); return page; } @@ -752,6 +763,7 @@ static int kimage_load_crash_segment(struct kexec_image *image, static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *segment) { int result = -ENOMEM; + paddr_t addr; if ( !guest_handle_is_null(segment->buf.h) ) { @@ -766,6 +778,14 @@ static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *s } } + for ( addr = segment->dest_maddr & PAGE_MASK; + addr < segment->dest_maddr + segment->dest_size; addr += PAGE_SIZE ) + { + result = machine_kexec_add_page(image, addr, addr); + if ( result < 0 ) + break; + } + return result; } @@ -809,6 +829,106 @@ int kimage_load_segments(struct kexec_image *image) return 0; } +kimage_entry_t *kimage_entry_next(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return (kimage_entry_t *)((uint32_t *)entry + 1); + return entry + 1; +} + +unsigned long kimage_entry_mfn(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return *(uint32_t *)entry >> PAGE_SHIFT; + return *entry >> PAGE_SHIFT; +} + +unsigned long kimage_entry_ind(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return *(uint32_t *)entry & 0xf; + return *entry & 0xf; +} + +int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, + bool_t compat) +{ + void *page; + kimage_entry_t *entry; + int ret = 0; + paddr_t dest = KIMAGE_NO_DEST; + + page = map_domain_page(ind_mfn); + if ( !page ) + return -ENOMEM; + + /* + * Walk the guest-supplied indirection pages, adding entries to + * the image's indirection pages. + */ + for ( entry = page; ; ) + { + unsigned long ind; + unsigned long mfn; + + ind = kimage_entry_ind(entry, compat); + mfn = kimage_entry_mfn(entry, compat); + + switch ( ind ) + { + case IND_DESTINATION: + dest = (paddr_t)mfn << PAGE_SHIFT; + ret = kimage_set_destination(image, dest); + if ( ret < 0 ) + goto done; + break; + case IND_INDIRECTION: + unmap_domain_page(page); + page = map_domain_page(mfn); + entry = page; + continue; + case IND_DONE: + kimage_terminate(image); + goto done; + case IND_SOURCE: + { + struct page_info *guest_page, *xen_page; + + guest_page = mfn_to_page(mfn); + if ( !get_page(guest_page, current->domain) ) + { + ret = -EFAULT; + goto done; + } + + xen_page = kimage_alloc_page(image, dest); + if ( !xen_page ) + { + put_page(guest_page); + ret = -ENOMEM; + goto done; + } + + copy_domain_page(page_to_mfn(xen_page), mfn); + put_page(guest_page); + + ret = kimage_add_page(image, page_to_maddr(xen_page)); + if ( ret < 0 ) + goto done; + dest += PAGE_SIZE; + break; + } + default: + ret = -EINVAL; + goto done; + } + entry = kimage_entry_next(entry, compat); + } +done: + unmap_domain_page(page); + return ret; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 8b4266d..48c5676 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -56,9 +56,6 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, FIX_HPET_BASE, - FIX_KEXEC_BASE_0, - FIX_KEXEC_BASE_END = FIX_KEXEC_BASE_0 \ - + ((KEXEC_XEN_NO_PAGES >> 1) * KEXEC_IMAGE_NR) - 1, FIX_TBOOT_SHARED_BASE, FIX_MSIX_IO_RESERV_BASE, FIX_MSIX_IO_RESERV_END = FIX_MSIX_IO_RESERV_BASE + FIX_MSIX_MAX_PAGES -1, diff --git a/xen/include/asm-x86/machine_kexec.h b/xen/include/asm-x86/machine_kexec.h new file mode 100644 index 0000000..ba0d469 --- /dev/null +++ b/xen/include/asm-x86/machine_kexec.h @@ -0,0 +1,16 @@ +#ifndef __X86_MACHINE_KEXEC_H__ +#define __X86_MACHINE_KEXEC_H__ + +#define KEXEC_RELOC_FLAG_COMPAT 0x1 /* 32-bit image */ + +#ifndef __ASSEMBLY__ + +extern void kexec_reloc(unsigned long reloc_code, unsigned long reloc_pt, + unsigned long ind_maddr, unsigned long entry_maddr, + unsigned long flags); + +extern unsigned int kexec_reloc_size; + +#endif + +#endif /* __X86_MACHINE_KEXEC_H__ */ diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index 1a5dda1..bd17747 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -6,6 +6,7 @@ #include #include #include +#include typedef struct xen_kexec_reserve { unsigned long size; @@ -40,11 +41,13 @@ extern enum low_crashinfo low_crashinfo_mode; extern paddr_t crashinfo_maxaddr_bits; void kexec_early_calculations(void); -int machine_kexec_load(int type, int slot, xen_kexec_image_t *image); -void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image); +int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, + unsigned long maddr); +int machine_kexec_load(struct kexec_image *image); +void machine_kexec_unload(struct kexec_image *image); void machine_kexec_reserved(xen_kexec_reserve_t *reservation); -void machine_reboot_kexec(xen_kexec_image_t *image); -void machine_kexec(xen_kexec_image_t *image); +void machine_reboot_kexec(struct kexec_image *image); +void machine_kexec(struct kexec_image *image); void kexec_crash(void); void kexec_crash_save_cpu(void); crash_xen_info_t *kexec_crash_save_info(void); @@ -52,11 +55,6 @@ void machine_crash_shutdown(void); int machine_kexec_get(xen_kexec_range_t *range); int machine_kexec_get_xen(xen_kexec_range_t *range); -void compat_machine_kexec(unsigned long rnk, - unsigned long indirection_page, - unsigned long *page_list, - unsigned long start_address); - /* vmcoreinfo stuff */ #define VMCOREINFO_BYTES (4096) #define VMCOREINFO_NOTE_NAME "VMCOREINFO_XEN" diff --git a/xen/include/xen/kimage.h b/xen/include/xen/kimage.h index 0ebd37a..d10ebf7 100644 --- a/xen/include/xen/kimage.h +++ b/xen/include/xen/kimage.h @@ -47,6 +47,12 @@ int kimage_load_segments(struct kexec_image *image); struct page_info *kimage_alloc_control_page(struct kexec_image *image, unsigned memflags); +kimage_entry_t *kimage_entry_next(kimage_entry_t *entry, bool_t compat); +unsigned long kimage_entry_mfn(kimage_entry_t *entry, bool_t compat); +unsigned long kimage_entry_ind(kimage_entry_t *entry, bool_t compat); +int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, + bool_t compat); + #endif /* __ASSEMBLY__ */ #endif /* __XEN_KIMAGE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:56:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:56:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRd-0006lr-HL; Wed, 13 Nov 2013 05:56:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRc-0006lQ-1g for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:52 +0000 Received: from [85.158.139.211:2793] by server-1.bemta-5.messagelabs.com id FA/CF-16887-3A413825; Wed, 13 Nov 2013 05:56:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384322206!1644777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 602 invoked from network); 13 Nov 2013 05:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRW-000442-GC for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRW-0007cM-Eo for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:46 +0000 Date: Wed, 13 Nov 2013 05:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: extend hypercall with improved load/unload ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a82d5cf352d8693a6088763ea7ab2f1a0983d71 Author: David Vrabel AuthorDate: Tue Nov 12 11:44:41 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:44:41 2013 +0100 kexec: extend hypercall with improved load/unload ops In the existing kexec hypercall, the load and unload ops depend on internals of the Linux kernel (the page list and code page provided by the kernel). The code page is used to transition between Xen context and the image so using kernel code doesn't make sense and will not work for PVH guests. Add replacement KEXEC_CMD_kexec_load and KEXEC_CMD_kexec_unload ops that no longer require a code page to be provided by the guest -- Xen now provides the code for calling the image directly. The new load op looks similar to the Linux kexec_load system call and allows the guest to provide the image data to be loaded. The guest specifies the architecture of the image which may be a 32-bit subarch of the hypervisor's architecture (i.e., an EM_386 image on an EM_X86_64 hypervisor). The toolstack can now load images without kernel involvement. This is required for supporting kexec when using a dom0 with an upstream kernel. Crash images are copied directly into the crash region on load. Default images are copied into domheap pages and a list of source and destination machine addresses is created. This is list is used in kexec_reloc() to relocate the image to its destination. The old load and unload sub-ops are still available (as KEXEC_CMD_load_v1 and KEXEC_CMD_unload_v1) and are implemented on top of the new infrastructure. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/arch/x86/machine_kexec.c | 192 +++++++++++------ xen/arch/x86/x86_64/Makefile | 2 +- xen/arch/x86/x86_64/compat_kexec.S | 187 ---------------- xen/arch/x86/x86_64/kexec_reloc.S | 198 +++++++++++++++++ xen/common/kexec.c | 398 +++++++++++++++++++++++++++++------ xen/common/kimage.c | 122 +++++++++++- xen/include/asm-x86/fixmap.h | 3 - xen/include/asm-x86/machine_kexec.h | 16 ++ xen/include/xen/kexec.h | 16 +- xen/include/xen/kimage.h | 6 + 10 files changed, 804 insertions(+), 336 deletions(-) diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c index 68b9705..b70d5a6 100644 --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -1,9 +1,18 @@ /****************************************************************************** * machine_kexec.c * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Portions derived from Linux's arch/x86/kernel/machine_kexec_64.c. + * + * Copyright (C) 2002-2005 Eric Biederman + * * Xen port written by: * - Simon 'Horms' Horman * - Magnus Damm + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. */ #include @@ -11,63 +20,124 @@ #include #include #include +#include +#include -typedef void (*relocate_new_kernel_t)( - unsigned long indirection_page, - unsigned long *page_list, - unsigned long start_address, - unsigned int preserve_context); - -int machine_kexec_load(int type, int slot, xen_kexec_image_t *image) +/* + * Add a mapping for a page to the page tables used during kexec. + */ +int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, + unsigned long maddr) { - unsigned long prev_ma = 0; - int fix_base = FIX_KEXEC_BASE_0 + (slot * (KEXEC_XEN_NO_PAGES >> 1)); - int k; + struct page_info *l4_page; + struct page_info *l3_page; + struct page_info *l2_page; + struct page_info *l1_page; + l4_pgentry_t *l4 = NULL; + l3_pgentry_t *l3 = NULL; + l2_pgentry_t *l2 = NULL; + l1_pgentry_t *l1 = NULL; + int ret = -ENOMEM; + + l4_page = image->aux_page; + if ( !l4_page ) + { + l4_page = kimage_alloc_control_page(image, 0); + if ( !l4_page ) + goto out; + image->aux_page = l4_page; + } - /* setup fixmap to point to our pages and record the virtual address - * in every odd index in page_list[]. - */ + l4 = __map_domain_page(l4_page); + l4 += l4_table_offset(vaddr); + if ( !(l4e_get_flags(*l4) & _PAGE_PRESENT) ) + { + l3_page = kimage_alloc_control_page(image, 0); + if ( !l3_page ) + goto out; + l4e_write(l4, l4e_from_page(l3_page, __PAGE_HYPERVISOR)); + } + else + l3_page = l4e_get_page(*l4); + + l3 = __map_domain_page(l3_page); + l3 += l3_table_offset(vaddr); + if ( !(l3e_get_flags(*l3) & _PAGE_PRESENT) ) + { + l2_page = kimage_alloc_control_page(image, 0); + if ( !l2_page ) + goto out; + l3e_write(l3, l3e_from_page(l2_page, __PAGE_HYPERVISOR)); + } + else + l2_page = l3e_get_page(*l3); + + l2 = __map_domain_page(l2_page); + l2 += l2_table_offset(vaddr); + if ( !(l2e_get_flags(*l2) & _PAGE_PRESENT) ) + { + l1_page = kimage_alloc_control_page(image, 0); + if ( !l1_page ) + goto out; + l2e_write(l2, l2e_from_page(l1_page, __PAGE_HYPERVISOR)); + } + else + l1_page = l2e_get_page(*l2); + + l1 = __map_domain_page(l1_page); + l1 += l1_table_offset(vaddr); + l1e_write(l1, l1e_from_pfn(maddr >> PAGE_SHIFT, __PAGE_HYPERVISOR)); + + ret = 0; +out: + if ( l1 ) + unmap_domain_page(l1); + if ( l2 ) + unmap_domain_page(l2); + if ( l3 ) + unmap_domain_page(l3); + if ( l4 ) + unmap_domain_page(l4); + return ret; +} - for ( k = 0; k < KEXEC_XEN_NO_PAGES; k++ ) +int machine_kexec_load(struct kexec_image *image) +{ + void *code_page; + int ret; + + switch ( image->arch ) { - if ( (k & 1) == 0 ) - { - /* Even pages: machine address. */ - prev_ma = image->page_list[k]; - } - else - { - /* Odd pages: va for previous ma. */ - if ( is_pv_32on64_domain(dom0) ) - { - /* - * The compatability bounce code sets up a page table - * with a 1-1 mapping of the first 1G of memory so - * VA==PA here. - * - * This Linux purgatory code still sets up separate - * high and low mappings on the control page (entries - * 0 and 1) but it is harmless if they are equal since - * that PT is not live at the time. - */ - image->page_list[k] = prev_ma; - } - else - { - set_fixmap(fix_base + (k >> 1), prev_ma); - image->page_list[k] = fix_to_virt(fix_base + (k >> 1)); - } - } + case EM_386: + case EM_X86_64: + break; + default: + return -EINVAL; } + code_page = __map_domain_page(image->control_code_page); + memcpy(code_page, kexec_reloc, kexec_reloc_size); + unmap_domain_page(code_page); + + /* + * Add a mapping for the control code page to the same virtual + * address as kexec_reloc. This allows us to keep running after + * these page tables are loaded in kexec_reloc. + */ + ret = machine_kexec_add_page(image, (unsigned long)kexec_reloc, + page_to_maddr(image->control_code_page)); + if ( ret < 0 ) + return ret; + return 0; } -void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image) +void machine_kexec_unload(struct kexec_image *image) { + /* no-op. kimage_free() frees all control pages. */ } -void machine_reboot_kexec(xen_kexec_image_t *image) +void machine_reboot_kexec(struct kexec_image *image) { BUG_ON(smp_processor_id() != 0); smp_send_stop(); @@ -75,13 +145,10 @@ void machine_reboot_kexec(xen_kexec_image_t *image) BUG(); } -void machine_kexec(xen_kexec_image_t *image) +void machine_kexec(struct kexec_image *image) { - struct desc_ptr gdt_desc = { - .base = (unsigned long)(boot_cpu_gdt_table - FIRST_RESERVED_GDT_ENTRY), - .limit = LAST_RESERVED_GDT_BYTE - }; int i; + unsigned long reloc_flags = 0; /* We are about to permenantly jump out of the Xen context into the kexec * purgatory code. We really dont want to be still servicing interupts. @@ -109,29 +176,12 @@ void machine_kexec(xen_kexec_image_t *image) * not like running with NMIs disabled. */ enable_nmis(); - /* - * compat_machine_kexec() returns to idle pagetables, which requires us - * to be running on a static GDT mapping (idle pagetables have no GDT - * mappings in their per-domain mapping area). - */ - asm volatile ( "lgdt %0" : : "m" (gdt_desc) ); + if ( image->arch == EM_386 ) + reloc_flags |= KEXEC_RELOC_FLAG_COMPAT; - if ( is_pv_32on64_domain(dom0) ) - { - compat_machine_kexec(image->page_list[1], - image->indirection_page, - image->page_list, - image->start_address); - } - else - { - relocate_new_kernel_t rnk; - - rnk = (relocate_new_kernel_t) image->page_list[1]; - (*rnk)(image->indirection_page, image->page_list, - image->start_address, - 0 /* preserve_context */); - } + kexec_reloc(page_to_maddr(image->control_code_page), + page_to_maddr(image->aux_page), + image->head, image->entry_maddr, reloc_flags); } int machine_kexec_get(xen_kexec_range_t *range) diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index d56e12d..7f8fb3d 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -11,11 +11,11 @@ obj-y += mmconf-fam10h.o obj-y += mmconfig_64.o obj-y += mmconfig-shared.o obj-y += compat.o -obj-bin-y += compat_kexec.o obj-y += domain.o obj-y += physdev.o obj-y += platform_hypercall.o obj-y += cpu_idle.o obj-y += cpufreq.o +obj-bin-y += kexec_reloc.o obj-$(crash_debug) += gdbstub.o diff --git a/xen/arch/x86/x86_64/compat_kexec.S b/xen/arch/x86/x86_64/compat_kexec.S deleted file mode 100644 index fc92af9..0000000 --- a/xen/arch/x86/x86_64/compat_kexec.S +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Compatibility kexec handler. - */ - -/* - * NOTE: We rely on Xen not relocating itself above the 4G boundary. This is - * currently true but if it ever changes then compat_pg_table will - * need to be moved back below 4G at run time. - */ - -#include - -#include -#include -#include - -/* The unrelocated physical address of a symbol. */ -#define SYM_PHYS(sym) ((sym) - __XEN_VIRT_START) - -/* Load physical address of symbol into register and relocate it. */ -#define RELOCATE_SYM(sym,reg) mov $SYM_PHYS(sym), reg ; \ - add xen_phys_start(%rip), reg - -/* - * Relocate a physical address in memory. Size of temporary register - * determines size of the value to relocate. - */ -#define RELOCATE_MEM(addr,reg) mov addr(%rip), reg ; \ - add xen_phys_start(%rip), reg ; \ - mov reg, addr(%rip) - - .text - - .code64 - -ENTRY(compat_machine_kexec) - /* x86/64 x86/32 */ - /* %rdi - relocate_new_kernel_t CALL */ - /* %rsi - indirection page 4(%esp) */ - /* %rdx - page_list 8(%esp) */ - /* %rcx - start address 12(%esp) */ - /* cpu has pae 16(%esp) */ - - /* Shim the 64 bit page_list into a 32 bit page_list. */ - mov $12,%r9 - lea compat_page_list(%rip), %rbx -1: dec %r9 - movl (%rdx,%r9,8),%eax - movl %eax,(%rbx,%r9,4) - test %r9,%r9 - jnz 1b - - RELOCATE_SYM(compat_page_list,%rdx) - - /* Relocate compatibility mode entry point address. */ - RELOCATE_MEM(compatibility_mode_far,%eax) - - /* Relocate compat_pg_table. */ - RELOCATE_MEM(compat_pg_table, %rax) - RELOCATE_MEM(compat_pg_table+0x8, %rax) - RELOCATE_MEM(compat_pg_table+0x10,%rax) - RELOCATE_MEM(compat_pg_table+0x18,%rax) - - /* - * Setup an identity mapped region in PML4[0] of idle page - * table. - */ - RELOCATE_SYM(l3_identmap,%rax) - or $0x63,%rax - mov %rax, idle_pg_table(%rip) - - /* Switch to idle page table. */ - RELOCATE_SYM(idle_pg_table,%rax) - movq %rax, %cr3 - - /* Switch to identity mapped compatibility stack. */ - RELOCATE_SYM(compat_stack,%rax) - movq %rax, %rsp - - /* Save xen_phys_start for 32 bit code. */ - movq xen_phys_start(%rip), %rbx - - /* Jump to low identity mapping in compatibility mode. */ - ljmp *compatibility_mode_far(%rip) - ud2 - -compatibility_mode_far: - .long SYM_PHYS(compatibility_mode) - .long __HYPERVISOR_CS32 - - /* - * We use 5 words of stack for the arguments passed to the kernel. The - * kernel only uses 1 word before switching to its own stack. Allocate - * 16 words to give "plenty" of room. - */ - .fill 16,4,0 -compat_stack: - - .code32 - -#undef RELOCATE_SYM -#undef RELOCATE_MEM - -/* - * Load physical address of symbol into register and relocate it. %rbx - * contains xen_phys_start(%rip) saved before jump to compatibility - * mode. - */ -#define RELOCATE_SYM(sym,reg) mov $SYM_PHYS(sym), reg ; \ - add %ebx, reg - -compatibility_mode: - /* Setup some sane segments. */ - movl $__HYPERVISOR_DS32, %eax - movl %eax, %ds - movl %eax, %es - movl %eax, %fs - movl %eax, %gs - movl %eax, %ss - - /* Push arguments onto stack. */ - pushl $0 /* 20(%esp) - preserve context */ - pushl $1 /* 16(%esp) - cpu has pae */ - pushl %ecx /* 12(%esp) - start address */ - pushl %edx /* 8(%esp) - page list */ - pushl %esi /* 4(%esp) - indirection page */ - pushl %edi /* 0(%esp) - CALL */ - - /* Disable paging and therefore leave 64 bit mode. */ - movl %cr0, %eax - andl $~X86_CR0_PG, %eax - movl %eax, %cr0 - - /* Switch to 32 bit page table. */ - RELOCATE_SYM(compat_pg_table, %eax) - movl %eax, %cr3 - - /* Clear MSR_EFER[LME], disabling long mode */ - movl $MSR_EFER,%ecx - rdmsr - btcl $_EFER_LME,%eax - wrmsr - - /* Re-enable paging, but only 32 bit mode now. */ - movl %cr0, %eax - orl $X86_CR0_PG, %eax - movl %eax, %cr0 - jmp 1f -1: - - popl %eax - call *%eax - ud2 - - .data - .align 4 -compat_page_list: - .fill 12,4,0 - - .align 32,0 - - /* - * These compat page tables contain an identity mapping of the - * first 4G of the physical address space. - */ -compat_pg_table: - .long SYM_PHYS(compat_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0 - .long SYM_PHYS(compat_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0 - - .section .data.page_aligned, "aw", @progbits - .align PAGE_SIZE,0 -compat_pg_table_l2: - .macro identmap from=0, count=512 - .if \count-1 - identmap "(\from+0)","(\count/2)" - identmap "(\from+(0x200000*(\count/2)))","(\count/2)" - .else - .quad 0x00000000000000e3 + \from - .endif - .endm - - identmap 0x00000000 - identmap 0x40000000 - identmap 0x80000000 - identmap 0xc0000000 diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S new file mode 100644 index 0000000..7a16c85 --- /dev/null +++ b/xen/arch/x86/x86_64/kexec_reloc.S @@ -0,0 +1,198 @@ +/* + * Relocate a kexec_image to its destination and call it. + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + * + * Portions derived from Linux's arch/x86/kernel/relocate_kernel_64.S. + * + * Copyright (C) 2002-2005 Eric Biederman + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ +#include +#include + +#include +#include +#include +#include + + .text + .align PAGE_SIZE + .code64 + +ENTRY(kexec_reloc) + /* %rdi - code page maddr */ + /* %rsi - page table maddr */ + /* %rdx - indirection page maddr */ + /* %rcx - entry maddr (%rbp) */ + /* %r8 - flags */ + + movq %rcx, %rbp + + /* Setup stack. */ + leaq (reloc_stack - kexec_reloc)(%rdi), %rsp + + /* Load reloc page table. */ + movq %rsi, %cr3 + + /* Jump to identity mapped code. */ + leaq (identity_mapped - kexec_reloc)(%rdi), %rax + jmpq *%rax + +identity_mapped: + /* + * Set cr0 to a known state: + * - Paging enabled + * - Alignment check disabled + * - Write protect disabled + * - No task switch + * - Don't do FP software emulation. + * - Protected mode enabled + */ + movq %cr0, %rax + andl $~(X86_CR0_AM | X86_CR0_WP | X86_CR0_TS | X86_CR0_EM), %eax + orl $(X86_CR0_PG | X86_CR0_PE), %eax + movq %rax, %cr0 + + /* + * Set cr4 to a known state: + * - physical address extension enabled + */ + movl $X86_CR4_PAE, %eax + movq %rax, %cr4 + + movq %rdx, %rdi + call relocate_pages + + /* Need to switch to 32-bit mode? */ + testq $KEXEC_RELOC_FLAG_COMPAT, %r8 + jnz call_32_bit + +call_64_bit: + /* Call the image entry point. This should never return. */ + callq *%rbp + ud2 + +call_32_bit: + /* Setup IDT. */ + lidt compat_mode_idt(%rip) + + /* Load compat GDT. */ + leaq compat_mode_gdt(%rip), %rax + movq %rax, (compat_mode_gdt_desc + 2)(%rip) + lgdt compat_mode_gdt_desc(%rip) + + /* Relocate compatibility mode entry point address. */ + leal compatibility_mode(%rip), %eax + movl %eax, compatibility_mode_far(%rip) + + /* Enter compatibility mode. */ + ljmp *compatibility_mode_far(%rip) + +relocate_pages: + /* %rdi - indirection page maddr */ + pushq %rbx + + cld + movq %rdi, %rbx + xorl %edi, %edi + xorl %esi, %esi + +next_entry: /* top, read another word for the indirection page */ + + movq (%rbx), %rcx + addq $8, %rbx +is_dest: + testb $IND_DESTINATION, %cl + jz is_ind + movq %rcx, %rdi + andq $PAGE_MASK, %rdi + jmp next_entry +is_ind: + testb $IND_INDIRECTION, %cl + jz is_done + movq %rcx, %rbx + andq $PAGE_MASK, %rbx + jmp next_entry +is_done: + testb $IND_DONE, %cl + jnz done +is_source: + testb $IND_SOURCE, %cl + jz is_zero + movq %rcx, %rsi /* For every source page do a copy */ + andq $PAGE_MASK, %rsi + movl $(PAGE_SIZE / 8), %ecx + rep movsq + jmp next_entry +is_zero: + testb $IND_ZERO, %cl + jz next_entry + movl $(PAGE_SIZE / 8), %ecx /* Zero the destination page. */ + xorl %eax, %eax + rep stosq + jmp next_entry +done: + popq %rbx + ret + + .code32 + +compatibility_mode: + /* Setup some sane segments. */ + movl $0x0008, %eax + movl %eax, %ds + movl %eax, %es + movl %eax, %fs + movl %eax, %gs + movl %eax, %ss + + /* Disable paging and therefore leave 64 bit mode. */ + movl %cr0, %eax + andl $~X86_CR0_PG, %eax + movl %eax, %cr0 + + /* Disable long mode */ + movl $MSR_EFER, %ecx + rdmsr + andl $~EFER_LME, %eax + wrmsr + + /* Clear cr4 to disable PAE. */ + xorl %eax, %eax + movl %eax, %cr4 + + /* Call the image entry point. This should never return. */ + call *%ebp + ud2 + + .align 4 +compatibility_mode_far: + .long 0x00000000 /* set in call_32_bit above */ + .word 0x0010 + +compat_mode_gdt_desc: + .word (3*8)-1 + .quad 0x0000000000000000 /* set in call_32_bit above */ + + .align 8 +compat_mode_gdt: + .quad 0x0000000000000000 /* null */ + .quad 0x00cf92000000ffff /* 0x0008 ring 0 data */ + .quad 0x00cf9a000000ffff /* 0x0010 ring 0 code, compatibility */ + +compat_mode_idt: + .word 0 /* limit */ + .long 0 /* base */ + + /* + * 16 words of stack are more than enough. + */ + .fill 16,8,0 +reloc_stack: + + .globl kexec_reloc_size +kexec_reloc_size: + .long . - kexec_reloc diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 7b23df0..c5450ba 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +48,7 @@ static Elf_Note *xen_crash_note; static cpumask_t crash_saved_cpus; -static xen_kexec_image_t kexec_image[KEXEC_IMAGE_NR]; +static struct kexec_image *kexec_image[KEXEC_IMAGE_NR]; #define KEXEC_FLAG_DEFAULT_POS (KEXEC_IMAGE_NR + 0) #define KEXEC_FLAG_CRASH_POS (KEXEC_IMAGE_NR + 1) @@ -55,8 +56,6 @@ static xen_kexec_image_t kexec_image[KEXEC_IMAGE_NR]; static unsigned long kexec_flags = 0; /* the lowest bits are for KEXEC_IMAGE... */ -static spinlock_t kexec_lock = SPIN_LOCK_UNLOCKED; - static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES]; static size_t vmcoreinfo_size = 0; @@ -311,14 +310,14 @@ void kexec_crash(void) kexec_common_shutdown(); kexec_crash_save_cpu(); machine_crash_shutdown(); - machine_kexec(&kexec_image[KEXEC_IMAGE_CRASH_BASE + pos]); + machine_kexec(kexec_image[KEXEC_IMAGE_CRASH_BASE + pos]); BUG(); } static long kexec_reboot(void *_image) { - xen_kexec_image_t *image = _image; + struct kexec_image *image = _image; kexecing = TRUE; @@ -734,63 +733,264 @@ static void crash_save_vmcoreinfo(void) #endif } -static int kexec_load_unload_internal(unsigned long op, xen_kexec_load_v1_t *load) +static void kexec_unload_image(struct kexec_image *image) { - xen_kexec_image_t *image; + if ( !image ) + return; + + machine_kexec_unload(image); + kimage_free(image); +} + +static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_exec_t exec; + struct kexec_image *image; + int base, bit, pos, ret = -EINVAL; + + if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) + return -EFAULT; + + if ( kexec_load_get_bits(exec.type, &base, &bit) ) + return -EINVAL; + + pos = (test_bit(bit, &kexec_flags) != 0); + + /* Only allow kexec/kdump into loaded images */ + if ( !test_bit(base + pos, &kexec_flags) ) + return -ENOENT; + + switch (exec.type) + { + case KEXEC_TYPE_DEFAULT: + image = kexec_image[base + pos]; + ret = continue_hypercall_on_cpu(0, kexec_reboot, image); + break; + case KEXEC_TYPE_CRASH: + kexec_crash(); /* Does not return */ + break; + } + + return -EINVAL; /* never reached */ +} + +static int kexec_swap_images(int type, struct kexec_image *new, + struct kexec_image **old) +{ + static DEFINE_SPINLOCK(kexec_lock); int base, bit, pos; - int ret = 0; + int new_slot, old_slot; + + *old = NULL; + + spin_lock(&kexec_lock); + + if ( test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) + { + spin_unlock(&kexec_lock); + return -EBUSY; + } - if ( kexec_load_get_bits(load->type, &base, &bit) ) + if ( kexec_load_get_bits(type, &base, &bit) ) return -EINVAL; pos = (test_bit(bit, &kexec_flags) != 0); + old_slot = base + pos; + new_slot = base + !pos; - /* Load the user data into an unused image */ - if ( op == KEXEC_CMD_kexec_load ) + if ( new ) { - image = &kexec_image[base + !pos]; + kexec_image[new_slot] = new; + set_bit(new_slot, &kexec_flags); + } + change_bit(bit, &kexec_flags); - BUG_ON(test_bit((base + !pos), &kexec_flags)); /* must be free */ + clear_bit(old_slot, &kexec_flags); + *old = kexec_image[old_slot]; - memcpy(image, &load->image, sizeof(*image)); + spin_unlock(&kexec_lock); - if ( !(ret = machine_kexec_load(load->type, base + !pos, image)) ) - { - /* Set image present bit */ - set_bit((base + !pos), &kexec_flags); + return 0; +} - /* Make new image the active one */ - change_bit(bit, &kexec_flags); - } +static int kexec_load_slot(struct kexec_image *kimage) +{ + struct kexec_image *old_kimage; + int ret = -ENOMEM; + + ret = machine_kexec_load(kimage); + if ( ret < 0 ) + return ret; + + crash_save_vmcoreinfo(); + + ret = kexec_swap_images(kimage->type, kimage, &old_kimage); + if ( ret < 0 ) + return ret; + + kexec_unload_image(old_kimage); + + return 0; +} + +static uint16_t kexec_load_v1_arch(void) +{ +#ifdef CONFIG_X86 + return is_pv_32on64_domain(dom0) ? EM_386 : EM_X86_64; +#else + return EM_NONE; +#endif +} - crash_save_vmcoreinfo(); +static int kexec_segments_add_segment( + unsigned int *nr_segments, xen_kexec_segment_t *segments, + unsigned long mfn) +{ + paddr_t maddr = (paddr_t)mfn << PAGE_SHIFT; + unsigned int n = *nr_segments; + + /* Need a new segment? */ + if ( n == 0 + || segments[n-1].dest_maddr + segments[n-1].dest_size != maddr ) + { + n++; + if ( n > KEXEC_SEGMENT_MAX ) + return -EINVAL; + *nr_segments = n; + + set_xen_guest_handle(segments[n-1].buf.h, NULL); + segments[n-1].buf_size = 0; + segments[n-1].dest_maddr = maddr; + segments[n-1].dest_size = 0; } - /* Unload the old image if present and load successful */ - if ( ret == 0 && !test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) + return 0; +} + +static int kexec_segments_from_ind_page(unsigned long mfn, + unsigned int *nr_segments, + xen_kexec_segment_t *segments, + bool_t compat) +{ + void *page; + kimage_entry_t *entry; + int ret = 0; + + page = map_domain_page(mfn); + + /* + * Walk the indirection page list, adding destination pages to the + * segments. + */ + for ( entry = page; ; ) { - if ( test_and_clear_bit((base + pos), &kexec_flags) ) + unsigned long ind; + + ind = kimage_entry_ind(entry, compat); + mfn = kimage_entry_mfn(entry, compat); + + switch ( ind ) { - image = &kexec_image[base + pos]; - machine_kexec_unload(load->type, base + pos, image); + case IND_DESTINATION: + ret = kexec_segments_add_segment(nr_segments, segments, mfn); + if ( ret < 0 ) + goto done; + break; + case IND_INDIRECTION: + unmap_domain_page(page); + entry = page = map_domain_page(mfn); + continue; + case IND_DONE: + goto done; + case IND_SOURCE: + if ( *nr_segments == 0 ) + { + ret = -EINVAL; + goto done; + } + segments[*nr_segments-1].dest_size += PAGE_SIZE; + break; + default: + ret = -EINVAL; + goto done; } + entry = kimage_entry_next(entry, compat); } +done: + unmap_domain_page(page); + return ret; +} +static int kexec_do_load_v1(xen_kexec_load_v1_t *load, int compat) +{ + struct kexec_image *kimage = NULL; + xen_kexec_segment_t *segments; + uint16_t arch; + unsigned int nr_segments = 0; + unsigned long ind_mfn = load->image.indirection_page >> PAGE_SHIFT; + int ret; + + arch = kexec_load_v1_arch(); + if ( arch == EM_NONE ) + return -ENOSYS; + + segments = xmalloc_array(xen_kexec_segment_t, KEXEC_SEGMENT_MAX); + if ( segments == NULL ) + return -ENOMEM; + + /* + * Work out the image segments (destination only) from the + * indirection pages. + * + * This is needed so we don't allocate pages that will overlap + * with the destination when building the new set of indirection + * pages below. + */ + ret = kexec_segments_from_ind_page(ind_mfn, &nr_segments, segments, compat); + if ( ret < 0 ) + goto error; + + ret = kimage_alloc(&kimage, load->type, arch, load->image.start_address, + nr_segments, segments); + if ( ret < 0 ) + goto error; + + /* + * Build a new set of indirection pages in the native format. + * + * This walks the guest provided indirection pages a second time. + * The guest could have altered then, invalidating the segment + * information constructed above. This will only result in the + * resulting image being potentially unrelocatable. + */ + ret = kimage_build_ind(kimage, ind_mfn, compat); + if ( ret < 0 ) + goto error; + + ret = kexec_load_slot(kimage); + if ( ret < 0 ) + goto error; + + return 0; + +error: + if ( !kimage ) + xfree(segments); + kimage_free(kimage); return ret; } -static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load_v1(XEN_GUEST_HANDLE_PARAM(void) uarg) { xen_kexec_load_v1_t load; if ( unlikely(copy_from_guest(&load, uarg, 1)) ) return -EFAULT; - return kexec_load_unload_internal(op, &load); + return kexec_do_load_v1(&load, 0); } -static int kexec_load_unload_compat(unsigned long op, - XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load_v1_compat(XEN_GUEST_HANDLE_PARAM(void) uarg) { #ifdef CONFIG_COMPAT compat_kexec_load_v1_t compat_load; @@ -809,49 +1009,113 @@ static int kexec_load_unload_compat(unsigned long op, load.type = compat_load.type; XLAT_kexec_image(&load.image, &compat_load.image); - return kexec_load_unload_internal(op, &load); -#else /* CONFIG_COMPAT */ + return kexec_do_load_v1(&load, 1); +#else return 0; -#endif /* CONFIG_COMPAT */ +#endif } -static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) +static int kexec_load(XEN_GUEST_HANDLE_PARAM(void) uarg) { - xen_kexec_exec_t exec; - xen_kexec_image_t *image; - int base, bit, pos, ret = -EINVAL; + xen_kexec_load_t load; + xen_kexec_segment_t *segments; + struct kexec_image *kimage = NULL; + int ret; - if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) + if ( copy_from_guest(&load, uarg, 1) ) return -EFAULT; - if ( kexec_load_get_bits(exec.type, &base, &bit) ) + if ( load.nr_segments >= KEXEC_SEGMENT_MAX ) return -EINVAL; - pos = (test_bit(bit, &kexec_flags) != 0); - - /* Only allow kexec/kdump into loaded images */ - if ( !test_bit(base + pos, &kexec_flags) ) - return -ENOENT; + segments = xmalloc_array(xen_kexec_segment_t, load.nr_segments); + if ( segments == NULL ) + return -ENOMEM; - switch (exec.type) + if ( copy_from_guest(segments, load.segments.h, load.nr_segments) ) { - case KEXEC_TYPE_DEFAULT: - image = &kexec_image[base + pos]; - ret = continue_hypercall_on_cpu(0, kexec_reboot, image); - break; - case KEXEC_TYPE_CRASH: - kexec_crash(); /* Does not return */ - break; + ret = -EFAULT; + goto error; } - return -EINVAL; /* never reached */ + ret = kimage_alloc(&kimage, load.type, load.arch, load.entry_maddr, + load.nr_segments, segments); + if ( ret < 0 ) + goto error; + + ret = kimage_load_segments(kimage); + if ( ret < 0 ) + goto error; + + ret = kexec_load_slot(kimage); + if ( ret < 0 ) + goto error; + + return 0; + +error: + if ( ! kimage ) + xfree(segments); + kimage_free(kimage); + return ret; +} + +static int kexec_do_unload(xen_kexec_unload_t *unload) +{ + struct kexec_image *old_kimage; + int ret; + + ret = kexec_swap_images(unload->type, NULL, &old_kimage); + if ( ret < 0 ) + return ret; + + kexec_unload_image(old_kimage); + + return 0; +} + +static int kexec_unload_v1(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_load_v1_t load; + xen_kexec_unload_t unload; + + if ( copy_from_guest(&load, uarg, 1) ) + return -EFAULT; + + unload.type = load.type; + return kexec_do_unload(&unload); +} + +static int kexec_unload_v1_compat(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ +#ifdef CONFIG_COMPAT + compat_kexec_load_v1_t compat_load; + xen_kexec_unload_t unload; + + if ( copy_from_guest(&compat_load, uarg, 1) ) + return -EFAULT; + + unload.type = compat_load.type; + return kexec_do_unload(&unload); +#else + return 0; +#endif +} + +static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) +{ + xen_kexec_unload_t unload; + + if ( unlikely(copy_from_guest(&unload, uarg, 1)) ) + return -EFAULT; + + return kexec_do_unload(&unload); } static int do_kexec_op_internal(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg, bool_t compat) { - unsigned long flags; int ret = -EINVAL; ret = xsm_kexec(XSM_PRIV); @@ -867,20 +1131,26 @@ static int do_kexec_op_internal(unsigned long op, ret = kexec_get_range(uarg); break; case KEXEC_CMD_kexec_load_v1: + if ( compat ) + ret = kexec_load_v1_compat(uarg); + else + ret = kexec_load_v1(uarg); + break; case KEXEC_CMD_kexec_unload_v1: - spin_lock_irqsave(&kexec_lock, flags); - if (!test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags)) - { - if (compat) - ret = kexec_load_unload_compat(op, uarg); - else - ret = kexec_load_unload(op, uarg); - } - spin_unlock_irqrestore(&kexec_lock, flags); + if ( compat ) + ret = kexec_unload_v1_compat(uarg); + else + ret = kexec_unload_v1(uarg); break; case KEXEC_CMD_kexec: ret = kexec_exec(uarg); break; + case KEXEC_CMD_kexec_load: + ret = kexec_load(uarg); + break; + case KEXEC_CMD_kexec_unload: + ret = kexec_unload(uarg); + break; } return ret; diff --git a/xen/common/kimage.c b/xen/common/kimage.c index cba4458..5c3e3b3 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -175,11 +175,20 @@ static int do_kimage_alloc(struct kexec_image **rimage, paddr_t entry, image->control_code_page = kimage_alloc_control_page(image, MEMF_bits(32)); if ( !image->control_code_page ) goto out; + result = machine_kexec_add_page(image, + page_to_maddr(image->control_code_page), + page_to_maddr(image->control_code_page)); + if ( result < 0 ) + goto out; /* Add an empty indirection page. */ image->entry_page = kimage_alloc_control_page(image, 0); if ( !image->entry_page ) goto out; + result = machine_kexec_add_page(image, page_to_maddr(image->entry_page), + page_to_maddr(image->entry_page)); + if ( result < 0 ) + goto out; image->head = page_to_maddr(image->entry_page); @@ -594,7 +603,7 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, if ( addr == destination ) { page_list_del(page, &image->dest_pages); - return page; + goto found; } } page = NULL; @@ -646,6 +655,8 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, page_list_add(page, &image->dest_pages); } } +found: + machine_kexec_add_page(image, page_to_maddr(page), page_to_maddr(page)); return page; } @@ -752,6 +763,7 @@ static int kimage_load_crash_segment(struct kexec_image *image, static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *segment) { int result = -ENOMEM; + paddr_t addr; if ( !guest_handle_is_null(segment->buf.h) ) { @@ -766,6 +778,14 @@ static int kimage_load_segment(struct kexec_image *image, xen_kexec_segment_t *s } } + for ( addr = segment->dest_maddr & PAGE_MASK; + addr < segment->dest_maddr + segment->dest_size; addr += PAGE_SIZE ) + { + result = machine_kexec_add_page(image, addr, addr); + if ( result < 0 ) + break; + } + return result; } @@ -809,6 +829,106 @@ int kimage_load_segments(struct kexec_image *image) return 0; } +kimage_entry_t *kimage_entry_next(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return (kimage_entry_t *)((uint32_t *)entry + 1); + return entry + 1; +} + +unsigned long kimage_entry_mfn(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return *(uint32_t *)entry >> PAGE_SHIFT; + return *entry >> PAGE_SHIFT; +} + +unsigned long kimage_entry_ind(kimage_entry_t *entry, bool_t compat) +{ + if ( compat ) + return *(uint32_t *)entry & 0xf; + return *entry & 0xf; +} + +int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, + bool_t compat) +{ + void *page; + kimage_entry_t *entry; + int ret = 0; + paddr_t dest = KIMAGE_NO_DEST; + + page = map_domain_page(ind_mfn); + if ( !page ) + return -ENOMEM; + + /* + * Walk the guest-supplied indirection pages, adding entries to + * the image's indirection pages. + */ + for ( entry = page; ; ) + { + unsigned long ind; + unsigned long mfn; + + ind = kimage_entry_ind(entry, compat); + mfn = kimage_entry_mfn(entry, compat); + + switch ( ind ) + { + case IND_DESTINATION: + dest = (paddr_t)mfn << PAGE_SHIFT; + ret = kimage_set_destination(image, dest); + if ( ret < 0 ) + goto done; + break; + case IND_INDIRECTION: + unmap_domain_page(page); + page = map_domain_page(mfn); + entry = page; + continue; + case IND_DONE: + kimage_terminate(image); + goto done; + case IND_SOURCE: + { + struct page_info *guest_page, *xen_page; + + guest_page = mfn_to_page(mfn); + if ( !get_page(guest_page, current->domain) ) + { + ret = -EFAULT; + goto done; + } + + xen_page = kimage_alloc_page(image, dest); + if ( !xen_page ) + { + put_page(guest_page); + ret = -ENOMEM; + goto done; + } + + copy_domain_page(page_to_mfn(xen_page), mfn); + put_page(guest_page); + + ret = kimage_add_page(image, page_to_maddr(xen_page)); + if ( ret < 0 ) + goto done; + dest += PAGE_SIZE; + break; + } + default: + ret = -EINVAL; + goto done; + } + entry = kimage_entry_next(entry, compat); + } +done: + unmap_domain_page(page); + return ret; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 8b4266d..48c5676 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -56,9 +56,6 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, FIX_HPET_BASE, - FIX_KEXEC_BASE_0, - FIX_KEXEC_BASE_END = FIX_KEXEC_BASE_0 \ - + ((KEXEC_XEN_NO_PAGES >> 1) * KEXEC_IMAGE_NR) - 1, FIX_TBOOT_SHARED_BASE, FIX_MSIX_IO_RESERV_BASE, FIX_MSIX_IO_RESERV_END = FIX_MSIX_IO_RESERV_BASE + FIX_MSIX_MAX_PAGES -1, diff --git a/xen/include/asm-x86/machine_kexec.h b/xen/include/asm-x86/machine_kexec.h new file mode 100644 index 0000000..ba0d469 --- /dev/null +++ b/xen/include/asm-x86/machine_kexec.h @@ -0,0 +1,16 @@ +#ifndef __X86_MACHINE_KEXEC_H__ +#define __X86_MACHINE_KEXEC_H__ + +#define KEXEC_RELOC_FLAG_COMPAT 0x1 /* 32-bit image */ + +#ifndef __ASSEMBLY__ + +extern void kexec_reloc(unsigned long reloc_code, unsigned long reloc_pt, + unsigned long ind_maddr, unsigned long entry_maddr, + unsigned long flags); + +extern unsigned int kexec_reloc_size; + +#endif + +#endif /* __X86_MACHINE_KEXEC_H__ */ diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index 1a5dda1..bd17747 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -6,6 +6,7 @@ #include #include #include +#include typedef struct xen_kexec_reserve { unsigned long size; @@ -40,11 +41,13 @@ extern enum low_crashinfo low_crashinfo_mode; extern paddr_t crashinfo_maxaddr_bits; void kexec_early_calculations(void); -int machine_kexec_load(int type, int slot, xen_kexec_image_t *image); -void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image); +int machine_kexec_add_page(struct kexec_image *image, unsigned long vaddr, + unsigned long maddr); +int machine_kexec_load(struct kexec_image *image); +void machine_kexec_unload(struct kexec_image *image); void machine_kexec_reserved(xen_kexec_reserve_t *reservation); -void machine_reboot_kexec(xen_kexec_image_t *image); -void machine_kexec(xen_kexec_image_t *image); +void machine_reboot_kexec(struct kexec_image *image); +void machine_kexec(struct kexec_image *image); void kexec_crash(void); void kexec_crash_save_cpu(void); crash_xen_info_t *kexec_crash_save_info(void); @@ -52,11 +55,6 @@ void machine_crash_shutdown(void); int machine_kexec_get(xen_kexec_range_t *range); int machine_kexec_get_xen(xen_kexec_range_t *range); -void compat_machine_kexec(unsigned long rnk, - unsigned long indirection_page, - unsigned long *page_list, - unsigned long start_address); - /* vmcoreinfo stuff */ #define VMCOREINFO_BYTES (4096) #define VMCOREINFO_NOTE_NAME "VMCOREINFO_XEN" diff --git a/xen/include/xen/kimage.h b/xen/include/xen/kimage.h index 0ebd37a..d10ebf7 100644 --- a/xen/include/xen/kimage.h +++ b/xen/include/xen/kimage.h @@ -47,6 +47,12 @@ int kimage_load_segments(struct kexec_image *image); struct page_info *kimage_alloc_control_page(struct kexec_image *image, unsigned memflags); +kimage_entry_t *kimage_entry_next(kimage_entry_t *entry, bool_t compat); +unsigned long kimage_entry_mfn(kimage_entry_t *entry, bool_t compat); +unsigned long kimage_entry_ind(kimage_entry_t *entry, bool_t compat); +int kimage_build_ind(struct kexec_image *image, unsigned long ind_mfn, + bool_t compat); + #endif /* __ASSEMBLY__ */ #endif /* __XEN_KIMAGE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:57:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRk-0006ne-MS; Wed, 13 Nov 2013 05:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRj-0006n0-JG for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:59 +0000 Received: from [85.158.137.68:9993] by server-17.bemta-3.messagelabs.com id 66/B4-06285-AA413825; Wed, 13 Nov 2013 05:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384322216!1112636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7613 invoked from network); 13 Nov 2013 05:56:58 -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; 13 Nov 2013 05:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRg-00044A-Mu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRg-0007cr-Ke for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:56 +0000 Date: Wed, 13 Nov 2013 05:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec crash image when dom0 crashes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d5cb49fb72d8a62433b350ccb18b0f86e11b78d1 Author: David Vrabel AuthorDate: Tue Nov 12 11:46:06 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:46:06 2013 +0100 kexec crash image when dom0 crashes Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- xen/common/kexec.c | 2 ++ xen/common/shutdown.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index c5450ba..9999bab 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -305,6 +305,8 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; + printk("Executing crash image\n"); + kexecing = TRUE; kexec_common_shutdown(); diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 20f04b0..9bccd34 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -47,6 +47,9 @@ void dom0_shutdown(u8 reason) { debugger_trap_immediate(); printk("Domain 0 crashed: "); +#ifdef CONFIG_KEXEC + kexec_crash(); +#endif maybe_reboot(); break; /* not reached */ } -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRk-0006ne-MS; Wed, 13 Nov 2013 05:57:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRj-0006n0-JG for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:59 +0000 Received: from [85.158.137.68:9993] by server-17.bemta-3.messagelabs.com id 66/B4-06285-AA413825; Wed, 13 Nov 2013 05:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384322216!1112636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7613 invoked from network); 13 Nov 2013 05:56:58 -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; 13 Nov 2013 05:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRg-00044A-Mu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRg-0007cr-Ke for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:56:56 +0000 Date: Wed, 13 Nov 2013 05:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec crash image when dom0 crashes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d5cb49fb72d8a62433b350ccb18b0f86e11b78d1 Author: David Vrabel AuthorDate: Tue Nov 12 11:46:06 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:46:06 2013 +0100 kexec crash image when dom0 crashes Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- xen/common/kexec.c | 2 ++ xen/common/shutdown.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index c5450ba..9999bab 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -305,6 +305,8 @@ void kexec_crash(void) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; + printk("Executing crash image\n"); + kexecing = TRUE; kexec_common_shutdown(); diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 20f04b0..9bccd34 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -47,6 +47,9 @@ void dom0_shutdown(u8 reason) { debugger_trap_immediate(); printk("Domain 0 crashed: "); +#ifdef CONFIG_KEXEC + kexec_crash(); +#endif maybe_reboot(); break; /* not reached */ } -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTRu-0006pe-Pc; Wed, 13 Nov 2013 05:57:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRt-0006pK-EZ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:09 +0000 Received: from [85.158.143.35:40594] by server-3.bemta-4.messagelabs.com id 32/EF-19578-4B413825; Wed, 13 Nov 2013 05:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1384322227!2807454!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2117 invoked from network); 13 Nov 2013 05:57:08 -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; 13 Nov 2013 05:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRq-00044m-Rs for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRq-0007dO-Qf for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:06 +0000 Date: Wed, 13 Nov 2013 05:57:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add hypercall buffer arrays X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e07d1cb67b61e60e2baf93725e0bd55a15372111 Author: David Vrabel AuthorDate: Tue Nov 12 11:46:39 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:46:39 2013 +0100 libxc: add hypercall buffer arrays Hypercall buffer arrays are used when a hypercall takes a variable length array of buffers. Signed-off-by: David Vrabel Acked-by: Ian Campbell Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- tools/libxc/xc_hcall_buf.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 27 ++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_hcall_buf.c b/tools/libxc/xc_hcall_buf.c index c354677..e762a93 100644 --- a/tools/libxc/xc_hcall_buf.c +++ b/tools/libxc/xc_hcall_buf.c @@ -228,6 +228,79 @@ void xc__hypercall_bounce_post(xc_interface *xch, xc_hypercall_buffer_t *b) xc__hypercall_buffer_free(xch, b); } +struct xc_hypercall_buffer_array { + unsigned max_bufs; + xc_hypercall_buffer_t *bufs; +}; + +xc_hypercall_buffer_array_t *xc_hypercall_buffer_array_create(xc_interface *xch, + unsigned n) +{ + xc_hypercall_buffer_array_t *array; + xc_hypercall_buffer_t *bufs = NULL; + + array = malloc(sizeof(*array)); + if ( array == NULL ) + goto error; + + bufs = calloc(n, sizeof(*bufs)); + if ( bufs == NULL ) + goto error; + + array->max_bufs = n; + array->bufs = bufs; + + return array; + +error: + free(bufs); + free(array); + return NULL; +} + +void *xc__hypercall_buffer_array_alloc(xc_interface *xch, + xc_hypercall_buffer_array_t *array, + unsigned index, + xc_hypercall_buffer_t *hbuf, + size_t size) +{ + void *buf; + + if ( index >= array->max_bufs || array->bufs[index].hbuf ) + abort(); + + buf = xc__hypercall_buffer_alloc(xch, hbuf, size); + if ( buf ) + array->bufs[index] = *hbuf; + return buf; +} + +void *xc__hypercall_buffer_array_get(xc_interface *xch, + xc_hypercall_buffer_array_t *array, + unsigned index, + xc_hypercall_buffer_t *hbuf) +{ + if ( index >= array->max_bufs || array->bufs[index].hbuf == NULL ) + abort(); + + *hbuf = array->bufs[index]; + return array->bufs[index].hbuf; +} + +void xc_hypercall_buffer_array_destroy(xc_interface *xc, + xc_hypercall_buffer_array_t *array) +{ + unsigned i; + + if ( array == NULL ) + return; + + for (i = 0; i < array->max_bufs; i++ ) + xc__hypercall_buffer_free(xc, &array->bufs[i]); + free(array->bufs); + free(array); +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 8cf3f3b..a7e8c31 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -321,6 +321,33 @@ void xc__hypercall_buffer_free_pages(xc_interface *xch, xc_hypercall_buffer_t *b #define xc_hypercall_buffer_free_pages(_xch, _name, _nr) xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), _nr) /* + * Array of hypercall buffers. + * + * Create an array with xc_hypercall_buffer_array_create() and + * populate it by declaring one hypercall buffer in a loop and + * allocating the buffer with xc_hypercall_buffer_array_alloc(). + * + * To access a previously allocated buffers, declare a new hypercall + * buffer and call xc_hypercall_buffer_array_get(). + * + * Destroy the array with xc_hypercall_buffer_array_destroy() to free + * the array and all its alocated hypercall buffers. + */ +struct xc_hypercall_buffer_array; +typedef struct xc_hypercall_buffer_array xc_hypercall_buffer_array_t; + +xc_hypercall_buffer_array_t *xc_hypercall_buffer_array_create(xc_interface *xch, unsigned n); +void *xc__hypercall_buffer_array_alloc(xc_interface *xch, xc_hypercall_buffer_array_t *array, + unsigned index, xc_hypercall_buffer_t *hbuf, size_t size); +#define xc_hypercall_buffer_array_alloc(_xch, _array, _index, _name, _size) \ + xc__hypercall_buffer_array_alloc(_xch, _array, _index, HYPERCALL_BUFFER(_name), _size) +void *xc__hypercall_buffer_array_get(xc_interface *xch, xc_hypercall_buffer_array_t *array, + unsigned index, xc_hypercall_buffer_t *hbuf); +#define xc_hypercall_buffer_array_get(_xch, _array, _index, _name, _size) \ + xc__hypercall_buffer_array_get(_xch, _array, _index, HYPERCALL_BUFFER(_name)) +void xc_hypercall_buffer_array_destroy(xc_interface *xc, xc_hypercall_buffer_array_t *array); + +/* * CPUMAP handling */ typedef uint8_t *xc_cpumap_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:57:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTRu-0006pe-Pc; Wed, 13 Nov 2013 05:57:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRt-0006pK-EZ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:09 +0000 Received: from [85.158.143.35:40594] by server-3.bemta-4.messagelabs.com id 32/EF-19578-4B413825; Wed, 13 Nov 2013 05:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1384322227!2807454!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2117 invoked from network); 13 Nov 2013 05:57:08 -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; 13 Nov 2013 05:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTRq-00044m-Rs for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTRq-0007dO-Qf for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:06 +0000 Date: Wed, 13 Nov 2013 05:57:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add hypercall buffer arrays X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e07d1cb67b61e60e2baf93725e0bd55a15372111 Author: David Vrabel AuthorDate: Tue Nov 12 11:46:39 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:46:39 2013 +0100 libxc: add hypercall buffer arrays Hypercall buffer arrays are used when a hypercall takes a variable length array of buffers. Signed-off-by: David Vrabel Acked-by: Ian Campbell Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- tools/libxc/xc_hcall_buf.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 27 ++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_hcall_buf.c b/tools/libxc/xc_hcall_buf.c index c354677..e762a93 100644 --- a/tools/libxc/xc_hcall_buf.c +++ b/tools/libxc/xc_hcall_buf.c @@ -228,6 +228,79 @@ void xc__hypercall_bounce_post(xc_interface *xch, xc_hypercall_buffer_t *b) xc__hypercall_buffer_free(xch, b); } +struct xc_hypercall_buffer_array { + unsigned max_bufs; + xc_hypercall_buffer_t *bufs; +}; + +xc_hypercall_buffer_array_t *xc_hypercall_buffer_array_create(xc_interface *xch, + unsigned n) +{ + xc_hypercall_buffer_array_t *array; + xc_hypercall_buffer_t *bufs = NULL; + + array = malloc(sizeof(*array)); + if ( array == NULL ) + goto error; + + bufs = calloc(n, sizeof(*bufs)); + if ( bufs == NULL ) + goto error; + + array->max_bufs = n; + array->bufs = bufs; + + return array; + +error: + free(bufs); + free(array); + return NULL; +} + +void *xc__hypercall_buffer_array_alloc(xc_interface *xch, + xc_hypercall_buffer_array_t *array, + unsigned index, + xc_hypercall_buffer_t *hbuf, + size_t size) +{ + void *buf; + + if ( index >= array->max_bufs || array->bufs[index].hbuf ) + abort(); + + buf = xc__hypercall_buffer_alloc(xch, hbuf, size); + if ( buf ) + array->bufs[index] = *hbuf; + return buf; +} + +void *xc__hypercall_buffer_array_get(xc_interface *xch, + xc_hypercall_buffer_array_t *array, + unsigned index, + xc_hypercall_buffer_t *hbuf) +{ + if ( index >= array->max_bufs || array->bufs[index].hbuf == NULL ) + abort(); + + *hbuf = array->bufs[index]; + return array->bufs[index].hbuf; +} + +void xc_hypercall_buffer_array_destroy(xc_interface *xc, + xc_hypercall_buffer_array_t *array) +{ + unsigned i; + + if ( array == NULL ) + return; + + for (i = 0; i < array->max_bufs; i++ ) + xc__hypercall_buffer_free(xc, &array->bufs[i]); + free(array->bufs); + free(array); +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 8cf3f3b..a7e8c31 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -321,6 +321,33 @@ void xc__hypercall_buffer_free_pages(xc_interface *xch, xc_hypercall_buffer_t *b #define xc_hypercall_buffer_free_pages(_xch, _name, _nr) xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), _nr) /* + * Array of hypercall buffers. + * + * Create an array with xc_hypercall_buffer_array_create() and + * populate it by declaring one hypercall buffer in a loop and + * allocating the buffer with xc_hypercall_buffer_array_alloc(). + * + * To access a previously allocated buffers, declare a new hypercall + * buffer and call xc_hypercall_buffer_array_get(). + * + * Destroy the array with xc_hypercall_buffer_array_destroy() to free + * the array and all its alocated hypercall buffers. + */ +struct xc_hypercall_buffer_array; +typedef struct xc_hypercall_buffer_array xc_hypercall_buffer_array_t; + +xc_hypercall_buffer_array_t *xc_hypercall_buffer_array_create(xc_interface *xch, unsigned n); +void *xc__hypercall_buffer_array_alloc(xc_interface *xch, xc_hypercall_buffer_array_t *array, + unsigned index, xc_hypercall_buffer_t *hbuf, size_t size); +#define xc_hypercall_buffer_array_alloc(_xch, _array, _index, _name, _size) \ + xc__hypercall_buffer_array_alloc(_xch, _array, _index, HYPERCALL_BUFFER(_name), _size) +void *xc__hypercall_buffer_array_get(xc_interface *xch, xc_hypercall_buffer_array_t *array, + unsigned index, xc_hypercall_buffer_t *hbuf); +#define xc_hypercall_buffer_array_get(_xch, _array, _index, _name, _size) \ + xc__hypercall_buffer_array_get(_xch, _array, _index, HYPERCALL_BUFFER(_name)) +void xc_hypercall_buffer_array_destroy(xc_interface *xc, xc_hypercall_buffer_array_t *array); + +/* * CPUMAP handling */ typedef uint8_t *xc_cpumap_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:57:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTS5-0006rf-SV; Wed, 13 Nov 2013 05:57:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTS4-0006rJ-AF for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:20 +0000 Received: from [85.158.137.68:10741] by server-13.bemta-3.messagelabs.com id 42/8B-02689-FB413825; Wed, 13 Nov 2013 05:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1384322237!1147205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13347 invoked from network); 13 Nov 2013 05:57:18 -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 Nov 2013 05:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTS1-00044p-2G for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTS0-0007dm-Vs for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:17 +0000 Date: Wed, 13 Nov 2013 05:57:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add API for kexec hypercall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19f46b09277ee4caca859b4b2a1944432ea41c21 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:07 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:07 2013 +0100 libxc: add API for kexec hypercall Add xc_kexec_exec(), xc_kexec_get_ranges(), xc_kexec_load(), and xc_kexec_unload(). The load and unload calls require the v2 load and unload ops. Signed-off-by: David Vrabel Acked-by: Ian Campbell Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- tools/libxc/Makefile | 1 + tools/libxc/xc_kexec.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 55 +++++++++++++++++++ 3 files changed, 196 insertions(+), 0 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 4c64c15..f2d6e56 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -31,6 +31,7 @@ CTRL_SRCS-y += xc_mem_access.c CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c +CTRL_SRCS-y += xc_kexec.c CTRL_SRCS-y += xtl_core.c CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c diff --git a/tools/libxc/xc_kexec.c b/tools/libxc/xc_kexec.c new file mode 100644 index 0000000..a49cffb --- /dev/null +++ b/tools/libxc/xc_kexec.c @@ -0,0 +1,140 @@ +/****************************************************************************** + * xc_kexec.c + * + * API for loading and executing kexec images. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + */ +#include "xc_private.h" + +int xc_kexec_exec(xc_interface *xch, int type) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_exec_t, exec); + int ret = -1; + + exec = xc_hypercall_buffer_alloc(xch, exec, sizeof(*exec)); + if ( exec == NULL ) + { + PERROR("Count not alloc bounce buffer for kexec_exec hypercall"); + goto out; + } + + exec->type = type; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(exec); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, exec); + + return ret; +} + +int xc_kexec_get_range(xc_interface *xch, int range, int nr, + uint64_t *size, uint64_t *start) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_range_t, get_range); + int ret = -1; + + get_range = xc_hypercall_buffer_alloc(xch, get_range, sizeof(*get_range)); + if ( get_range == NULL ) + { + PERROR("Could not alloc bounce buffer for kexec_get_range hypercall"); + goto out; + } + + get_range->range = range; + get_range->nr = nr; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_get_range; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(get_range); + + ret = do_xen_hypercall(xch, &hypercall); + + *size = get_range->size; + *start = get_range->start; + +out: + xc_hypercall_buffer_free(xch, get_range); + + return ret; +} + +int xc_kexec_load(xc_interface *xch, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segments) +{ + int ret = -1; + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BOUNCE(segments, sizeof(*segments) * nr_segments, + XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BUFFER(xen_kexec_load_t, load); + + if ( xc_hypercall_bounce_pre(xch, segments) ) + { + PERROR("Could not allocate bounce buffer for kexec load hypercall"); + goto out; + } + load = xc_hypercall_buffer_alloc(xch, load, sizeof(*load)); + if ( load == NULL ) + { + PERROR("Could not allocate buffer for kexec load hypercall"); + goto out; + } + + load->type = type; + load->arch = arch; + load->entry_maddr = entry_maddr; + load->nr_segments = nr_segments; + set_xen_guest_handle(load->segments.h, segments); + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_load; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(load); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, load); + xc_hypercall_bounce_post(xch, segments); + + return ret; +} + +int xc_kexec_unload(xc_interface *xch, int type) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_unload_t, unload); + int ret = -1; + + unload = xc_hypercall_buffer_alloc(xch, unload, sizeof(*unload)); + if ( unload == NULL ) + { + PERROR("Count not alloc buffer for kexec unload hypercall"); + goto out; + } + + unload->type = type; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_unload; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(unload); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, unload); + + return ret; +} diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index a7e8c31..4ac6b8a 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -46,6 +46,7 @@ #include #include #include +#include #include "xentoollog.h" @@ -2340,4 +2341,58 @@ int xc_compression_uncompress_page(xc_interface *xch, char *compbuf, unsigned long compbuf_size, unsigned long *compbuf_pos, char *dest); +/* + * Execute an image previously loaded with xc_kexec_load(). + * + * Does not return on success. + * + * Fails with: + * ENOENT if the specified image has not been loaded. + */ +int xc_kexec_exec(xc_interface *xch, int type); + +/* + * Find the machine address and size of certain memory areas. + * + * KEXEC_RANGE_MA_CRASH crash area + * KEXEC_RANGE_MA_XEN Xen itself + * KEXEC_RANGE_MA_CPU CPU note for CPU number 'nr' + * KEXEC_RANGE_MA_XENHEAP xenheap + * KEXEC_RANGE_MA_EFI_MEMMAP EFI Memory Map + * KEXEC_RANGE_MA_VMCOREINFO vmcoreinfo + * + * Fails with: + * EINVAL if the range or CPU number isn't valid. + */ +int xc_kexec_get_range(xc_interface *xch, int range, int nr, + uint64_t *size, uint64_t *start); + +/* + * Load a kexec image into memory. + * + * The image may be of type KEXEC_TYPE_DEFAULT (executed on request) + * or KEXEC_TYPE_CRASH (executed on a crash). + * + * The image architecture may be a 32-bit variant of the hypervisor + * architecture (e.g, EM_386 on a x86-64 hypervisor). + * + * Fails with: + * ENOMEM if there is insufficient memory for the new image. + * EINVAL if the image does not fit into the crash area or the entry + * point isn't within one of segments. + * EBUSY if another image is being executed. + */ +int xc_kexec_load(xc_interface *xch, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segments); + +/* + * Unload a kexec image. + * + * This prevents a KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH image from + * being executed. The crash images are not cleared from the crash + * region. + */ +int xc_kexec_unload(xc_interface *xch, int type); + #endif /* XENCTRL_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:57:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTS5-0006rf-SV; Wed, 13 Nov 2013 05:57:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTS4-0006rJ-AF for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:20 +0000 Received: from [85.158.137.68:10741] by server-13.bemta-3.messagelabs.com id 42/8B-02689-FB413825; Wed, 13 Nov 2013 05:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1384322237!1147205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13347 invoked from network); 13 Nov 2013 05:57:18 -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 Nov 2013 05:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTS1-00044p-2G for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTS0-0007dm-Vs for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:17 +0000 Date: Wed, 13 Nov 2013 05:57:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add API for kexec hypercall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19f46b09277ee4caca859b4b2a1944432ea41c21 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:07 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:07 2013 +0100 libxc: add API for kexec hypercall Add xc_kexec_exec(), xc_kexec_get_ranges(), xc_kexec_load(), and xc_kexec_unload(). The load and unload calls require the v2 load and unload ops. Signed-off-by: David Vrabel Acked-by: Ian Campbell Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Acked-by: Keir Fraser --- tools/libxc/Makefile | 1 + tools/libxc/xc_kexec.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 55 +++++++++++++++++++ 3 files changed, 196 insertions(+), 0 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 4c64c15..f2d6e56 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -31,6 +31,7 @@ CTRL_SRCS-y += xc_mem_access.c CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c +CTRL_SRCS-y += xc_kexec.c CTRL_SRCS-y += xtl_core.c CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c diff --git a/tools/libxc/xc_kexec.c b/tools/libxc/xc_kexec.c new file mode 100644 index 0000000..a49cffb --- /dev/null +++ b/tools/libxc/xc_kexec.c @@ -0,0 +1,140 @@ +/****************************************************************************** + * xc_kexec.c + * + * API for loading and executing kexec images. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * Copyright (C) 2013 Citrix Systems R&D Ltd. + */ +#include "xc_private.h" + +int xc_kexec_exec(xc_interface *xch, int type) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_exec_t, exec); + int ret = -1; + + exec = xc_hypercall_buffer_alloc(xch, exec, sizeof(*exec)); + if ( exec == NULL ) + { + PERROR("Count not alloc bounce buffer for kexec_exec hypercall"); + goto out; + } + + exec->type = type; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(exec); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, exec); + + return ret; +} + +int xc_kexec_get_range(xc_interface *xch, int range, int nr, + uint64_t *size, uint64_t *start) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_range_t, get_range); + int ret = -1; + + get_range = xc_hypercall_buffer_alloc(xch, get_range, sizeof(*get_range)); + if ( get_range == NULL ) + { + PERROR("Could not alloc bounce buffer for kexec_get_range hypercall"); + goto out; + } + + get_range->range = range; + get_range->nr = nr; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_get_range; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(get_range); + + ret = do_xen_hypercall(xch, &hypercall); + + *size = get_range->size; + *start = get_range->start; + +out: + xc_hypercall_buffer_free(xch, get_range); + + return ret; +} + +int xc_kexec_load(xc_interface *xch, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segments) +{ + int ret = -1; + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BOUNCE(segments, sizeof(*segments) * nr_segments, + XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BUFFER(xen_kexec_load_t, load); + + if ( xc_hypercall_bounce_pre(xch, segments) ) + { + PERROR("Could not allocate bounce buffer for kexec load hypercall"); + goto out; + } + load = xc_hypercall_buffer_alloc(xch, load, sizeof(*load)); + if ( load == NULL ) + { + PERROR("Could not allocate buffer for kexec load hypercall"); + goto out; + } + + load->type = type; + load->arch = arch; + load->entry_maddr = entry_maddr; + load->nr_segments = nr_segments; + set_xen_guest_handle(load->segments.h, segments); + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_load; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(load); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, load); + xc_hypercall_bounce_post(xch, segments); + + return ret; +} + +int xc_kexec_unload(xc_interface *xch, int type) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(xen_kexec_unload_t, unload); + int ret = -1; + + unload = xc_hypercall_buffer_alloc(xch, unload, sizeof(*unload)); + if ( unload == NULL ) + { + PERROR("Count not alloc buffer for kexec unload hypercall"); + goto out; + } + + unload->type = type; + + hypercall.op = __HYPERVISOR_kexec_op; + hypercall.arg[0] = KEXEC_CMD_kexec_unload; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(unload); + + ret = do_xen_hypercall(xch, &hypercall); + +out: + xc_hypercall_buffer_free(xch, unload); + + return ret; +} diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index a7e8c31..4ac6b8a 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -46,6 +46,7 @@ #include #include #include +#include #include "xentoollog.h" @@ -2340,4 +2341,58 @@ int xc_compression_uncompress_page(xc_interface *xch, char *compbuf, unsigned long compbuf_size, unsigned long *compbuf_pos, char *dest); +/* + * Execute an image previously loaded with xc_kexec_load(). + * + * Does not return on success. + * + * Fails with: + * ENOENT if the specified image has not been loaded. + */ +int xc_kexec_exec(xc_interface *xch, int type); + +/* + * Find the machine address and size of certain memory areas. + * + * KEXEC_RANGE_MA_CRASH crash area + * KEXEC_RANGE_MA_XEN Xen itself + * KEXEC_RANGE_MA_CPU CPU note for CPU number 'nr' + * KEXEC_RANGE_MA_XENHEAP xenheap + * KEXEC_RANGE_MA_EFI_MEMMAP EFI Memory Map + * KEXEC_RANGE_MA_VMCOREINFO vmcoreinfo + * + * Fails with: + * EINVAL if the range or CPU number isn't valid. + */ +int xc_kexec_get_range(xc_interface *xch, int range, int nr, + uint64_t *size, uint64_t *start); + +/* + * Load a kexec image into memory. + * + * The image may be of type KEXEC_TYPE_DEFAULT (executed on request) + * or KEXEC_TYPE_CRASH (executed on a crash). + * + * The image architecture may be a 32-bit variant of the hypervisor + * architecture (e.g, EM_386 on a x86-64 hypervisor). + * + * Fails with: + * ENOMEM if there is insufficient memory for the new image. + * EINVAL if the image does not fit into the crash area or the entry + * point isn't within one of segments. + * EBUSY if another image is being executed. + */ +int xc_kexec_load(xc_interface *xch, uint8_t type, uint16_t arch, + uint64_t entry_maddr, + uint32_t nr_segments, xen_kexec_segment_t *segments); + +/* + * Unload a kexec image. + * + * This prevents a KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH image from + * being executed. The crash images are not cleared from the crash + * region. + */ +int xc_kexec_unload(xc_interface *xch, int type); + #endif /* XENCTRL_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:57:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSE-0006tX-VV; Wed, 13 Nov 2013 05:57:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSE-0006tH-3b for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:30 +0000 Received: from [85.158.137.68:14980] by server-7.bemta-3.messagelabs.com id 0A/D7-13052-9C413825; Wed, 13 Nov 2013 05:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384322247!1164997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 13 Nov 2013 05:57:28 -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; 13 Nov 2013 05:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSB-00044v-9W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSB-0007e8-69 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:27 +0000 Date: Wed, 13 Nov 2013 05:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: check kexec relocation code fits in a 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 1fab023d3f58ed2b40c90c0d9cd078c3afcbcfc7 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:26 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:26 2013 +0100 x86: check kexec relocation code fits in a page The kexec relocation (control) code must fit in a single page so add a link time check for this. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/arch/x86/xen.lds.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9600cdf..17db361 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -198,3 +198,5 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSE-0006tX-VV; Wed, 13 Nov 2013 05:57:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSE-0006tH-3b for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:30 +0000 Received: from [85.158.137.68:14980] by server-7.bemta-3.messagelabs.com id 0A/D7-13052-9C413825; Wed, 13 Nov 2013 05:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384322247!1164997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 13 Nov 2013 05:57:28 -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; 13 Nov 2013 05:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSB-00044v-9W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSB-0007e8-69 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:27 +0000 Date: Wed, 13 Nov 2013 05:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: check kexec relocation code fits in a 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 1fab023d3f58ed2b40c90c0d9cd078c3afcbcfc7 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:26 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:26 2013 +0100 x86: check kexec relocation code fits in a page The kexec relocation (control) code must fit in a single page so add a link time check for this. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Reviewed-by: Don Slutz Tested-by: Don Slutz Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper Acked-by: Keir Fraser --- xen/arch/x86/xen.lds.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9600cdf..17db361 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -198,3 +198,5 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTSP-0006vV-25; Wed, 13 Nov 2013 05:57:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSO-0006vB-3Q for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:40 +0000 Received: from [193.109.254.147:64654] by server-16.bemta-14.messagelabs.com id 4C/78-03396-3D413825; Wed, 13 Nov 2013 05:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384322257!2386343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26097 invoked from network); 13 Nov 2013 05:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSL-000456-G2 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSL-0007eY-DT for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:37 +0000 Date: Wed, 13 Nov 2013 05:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add KEXEC maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3227f77f380bdc4c0a309547629cfa6fc10e3e10 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:36 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:36 2013 +0100 MAINTAINERS: Add KEXEC maintainer Signed-off-by: David Vrabel Acked-by: Keir Fraser --- MAINTAINERS | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 01a8aea..33130e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -201,6 +201,14 @@ X: xen/drivers/passthrough/amd/ X: xen/drivers/passthrough/vtd/ F: xen/include/xen/iommu.h +KEXEC +M: David Vrabel +S: Supported +F: xen/common/{kexec,kimage}.c +F: xen/include/{kexec,kimage}.h +F: xen/arch/x86/machine_kexec.c +F: xen/arch/x86/x86_64/kexec_reloc.S + LINUX (PV_OPS) M: Konrad Rzeszutek Wilk S: Supported -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTSP-0006vV-25; Wed, 13 Nov 2013 05:57:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSO-0006vB-3Q for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:40 +0000 Received: from [193.109.254.147:64654] by server-16.bemta-14.messagelabs.com id 4C/78-03396-3D413825; Wed, 13 Nov 2013 05:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384322257!2386343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26097 invoked from network); 13 Nov 2013 05:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSL-000456-G2 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSL-0007eY-DT for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:37 +0000 Date: Wed, 13 Nov 2013 05:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Add KEXEC maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3227f77f380bdc4c0a309547629cfa6fc10e3e10 Author: David Vrabel AuthorDate: Tue Nov 12 11:47:36 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:47:36 2013 +0100 MAINTAINERS: Add KEXEC maintainer Signed-off-by: David Vrabel Acked-by: Keir Fraser --- MAINTAINERS | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 01a8aea..33130e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -201,6 +201,14 @@ X: xen/drivers/passthrough/amd/ X: xen/drivers/passthrough/vtd/ F: xen/include/xen/iommu.h +KEXEC +M: David Vrabel +S: Supported +F: xen/common/{kexec,kimage}.c +F: xen/include/{kexec,kimage}.h +F: xen/arch/x86/machine_kexec.c +F: xen/arch/x86/x86_64/kexec_reloc.S + LINUX (PV_OPS) M: Konrad Rzeszutek Wilk S: Supported -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTSa-0006xk-56; Wed, 13 Nov 2013 05:57:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSY-0006xO-Jd for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:50 +0000 Received: from [85.158.139.211:10649] by server-4.bemta-5.messagelabs.com id 17/D7-10224-DD413825; Wed, 13 Nov 2013 05:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384322267!1627476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12996 invoked from network); 13 Nov 2013 05:57:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSV-000459-Mx for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSV-0007fd-Kt for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:47 +0000 Date: Wed, 13 Nov 2013 05:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested SVM: adjust guest handling of structure mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1e87805bf37b446dade93a7eb922bb7d1269756 Author: Jan Beulich AuthorDate: Tue Nov 12 11:51:15 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:51:15 2013 +0100 nested SVM: adjust guest handling of structure mappings For one, nestedsvm_vmcb_map() error checking must not consist of using assertions: Global (permanent) mappings can fail, and hence failure needs to be dealt with properly. And non-global (transient) mappings can't fail anyway. And then the I/O port access bitmap handling was broken: It checked only to first of the accessed ports rather than each of them. Signed-off-by: Jan Beulich Reviewed-by: Christoph Egger Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/arch/x86/hvm/svm/nestedsvm.c | 59 +++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 705b653..be5797a 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -342,7 +342,7 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) unsigned int i; enum hvm_copy_result ret; unsigned long *ns_viomap; - bool_t ioport_80, ioport_ed; + bool_t ioport_80 = 1, ioport_ed = 1; ns_msrpm_ptr = (unsigned long *)svm->ns_cached_msrpm; @@ -360,10 +360,12 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) svm->ns_iomap_pa = ns_vmcb->_iopm_base_pa; ns_viomap = hvm_map_guest_frame_ro(svm->ns_iomap_pa >> PAGE_SHIFT, 0); - ASSERT(ns_viomap != NULL); - ioport_80 = test_bit(0x80, ns_viomap); - ioport_ed = test_bit(0xed, ns_viomap); - hvm_unmap_guest_frame(ns_viomap, 0); + if ( ns_viomap ) + { + ioport_80 = test_bit(0x80, ns_viomap); + ioport_ed = test_bit(0xed, ns_viomap); + hvm_unmap_guest_frame(ns_viomap, 0); + } svm->ns_iomap = nestedhvm_vcpu_iomap_get(ioport_80, ioport_ed); @@ -865,40 +867,45 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, static int nsvm_vmcb_guest_intercepts_ioio(paddr_t iopm_pa, uint64_t exitinfo1) { - unsigned long iopm_gfn = iopm_pa >> PAGE_SHIFT; - unsigned long *io_bitmap = NULL; + unsigned long gfn = iopm_pa >> PAGE_SHIFT; + unsigned long *io_bitmap; ioio_info_t ioinfo; uint16_t port; + unsigned int size; bool_t enabled; - unsigned long gfn = 0; /* gcc ... */ ioinfo.bytes = exitinfo1; port = ioinfo.fields.port; + size = ioinfo.fields.sz32 ? 4 : ioinfo.fields.sz16 ? 2 : 1; - switch (port) { - case 0 ... 32767: /* first 4KB page */ - gfn = iopm_gfn; + switch ( port ) + { + case 0 ... 8 * PAGE_SIZE - 1: /* first 4KB page */ break; - case 32768 ... 65535: /* second 4KB page */ - port -= 32768; - gfn = iopm_gfn + 1; + case 8 * PAGE_SIZE ... 2 * 8 * PAGE_SIZE - 1: /* second 4KB page */ + port -= 8 * PAGE_SIZE; + ++gfn; break; default: BUG(); break; } - io_bitmap = hvm_map_guest_frame_ro(gfn, 0); - if (io_bitmap == NULL) { - gdprintk(XENLOG_ERR, - "IOIO intercept: mapping of permission map failed\n"); - return NESTEDHVM_VMEXIT_ERROR; + for ( io_bitmap = hvm_map_guest_frame_ro(gfn, 0); ; ) + { + enabled = io_bitmap && test_bit(port, io_bitmap); + if ( !enabled || !--size ) + break; + if ( unlikely(++port == 8 * PAGE_SIZE) ) + { + hvm_unmap_guest_frame(io_bitmap, 0); + io_bitmap = hvm_map_guest_frame_ro(++gfn, 0); + port -= 8 * PAGE_SIZE; + } } - - enabled = test_bit(port, io_bitmap); hvm_unmap_guest_frame(io_bitmap, 0); - if (!enabled) + if ( !enabled ) return NESTEDHVM_VMEXIT_HOST; return NESTEDHVM_VMEXIT_INJECT; @@ -965,8 +972,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, switch (exitcode) { case VMEXIT_MSR: ASSERT(regs != NULL); - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_msr(svm->ns_cached_msrpm, regs->ecx, ns_vmcb->exitinfo1 != 0); @@ -974,8 +981,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, return 0; break; case VMEXIT_IOIO: - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_ioio(ns_vmcb->_iopm_base_pa, ns_vmcb->exitinfo1); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:57:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:57: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 1VgTSa-0006xk-56; Wed, 13 Nov 2013 05:57:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSY-0006xO-Jd for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:50 +0000 Received: from [85.158.139.211:10649] by server-4.bemta-5.messagelabs.com id 17/D7-10224-DD413825; Wed, 13 Nov 2013 05:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384322267!1627476!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12996 invoked from network); 13 Nov 2013 05:57:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSV-000459-Mx for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSV-0007fd-Kt for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:47 +0000 Date: Wed, 13 Nov 2013 05:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested SVM: adjust guest handling of structure mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b1e87805bf37b446dade93a7eb922bb7d1269756 Author: Jan Beulich AuthorDate: Tue Nov 12 11:51:15 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:51:15 2013 +0100 nested SVM: adjust guest handling of structure mappings For one, nestedsvm_vmcb_map() error checking must not consist of using assertions: Global (permanent) mappings can fail, and hence failure needs to be dealt with properly. And non-global (transient) mappings can't fail anyway. And then the I/O port access bitmap handling was broken: It checked only to first of the accessed ports rather than each of them. Signed-off-by: Jan Beulich Reviewed-by: Christoph Egger Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/arch/x86/hvm/svm/nestedsvm.c | 59 +++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 705b653..be5797a 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -342,7 +342,7 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) unsigned int i; enum hvm_copy_result ret; unsigned long *ns_viomap; - bool_t ioport_80, ioport_ed; + bool_t ioport_80 = 1, ioport_ed = 1; ns_msrpm_ptr = (unsigned long *)svm->ns_cached_msrpm; @@ -360,10 +360,12 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) svm->ns_iomap_pa = ns_vmcb->_iopm_base_pa; ns_viomap = hvm_map_guest_frame_ro(svm->ns_iomap_pa >> PAGE_SHIFT, 0); - ASSERT(ns_viomap != NULL); - ioport_80 = test_bit(0x80, ns_viomap); - ioport_ed = test_bit(0xed, ns_viomap); - hvm_unmap_guest_frame(ns_viomap, 0); + if ( ns_viomap ) + { + ioport_80 = test_bit(0x80, ns_viomap); + ioport_ed = test_bit(0xed, ns_viomap); + hvm_unmap_guest_frame(ns_viomap, 0); + } svm->ns_iomap = nestedhvm_vcpu_iomap_get(ioport_80, ioport_ed); @@ -865,40 +867,45 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, static int nsvm_vmcb_guest_intercepts_ioio(paddr_t iopm_pa, uint64_t exitinfo1) { - unsigned long iopm_gfn = iopm_pa >> PAGE_SHIFT; - unsigned long *io_bitmap = NULL; + unsigned long gfn = iopm_pa >> PAGE_SHIFT; + unsigned long *io_bitmap; ioio_info_t ioinfo; uint16_t port; + unsigned int size; bool_t enabled; - unsigned long gfn = 0; /* gcc ... */ ioinfo.bytes = exitinfo1; port = ioinfo.fields.port; + size = ioinfo.fields.sz32 ? 4 : ioinfo.fields.sz16 ? 2 : 1; - switch (port) { - case 0 ... 32767: /* first 4KB page */ - gfn = iopm_gfn; + switch ( port ) + { + case 0 ... 8 * PAGE_SIZE - 1: /* first 4KB page */ break; - case 32768 ... 65535: /* second 4KB page */ - port -= 32768; - gfn = iopm_gfn + 1; + case 8 * PAGE_SIZE ... 2 * 8 * PAGE_SIZE - 1: /* second 4KB page */ + port -= 8 * PAGE_SIZE; + ++gfn; break; default: BUG(); break; } - io_bitmap = hvm_map_guest_frame_ro(gfn, 0); - if (io_bitmap == NULL) { - gdprintk(XENLOG_ERR, - "IOIO intercept: mapping of permission map failed\n"); - return NESTEDHVM_VMEXIT_ERROR; + for ( io_bitmap = hvm_map_guest_frame_ro(gfn, 0); ; ) + { + enabled = io_bitmap && test_bit(port, io_bitmap); + if ( !enabled || !--size ) + break; + if ( unlikely(++port == 8 * PAGE_SIZE) ) + { + hvm_unmap_guest_frame(io_bitmap, 0); + io_bitmap = hvm_map_guest_frame_ro(++gfn, 0); + port -= 8 * PAGE_SIZE; + } } - - enabled = test_bit(port, io_bitmap); hvm_unmap_guest_frame(io_bitmap, 0); - if (!enabled) + if ( !enabled ) return NESTEDHVM_VMEXIT_HOST; return NESTEDHVM_VMEXIT_INJECT; @@ -965,8 +972,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, switch (exitcode) { case VMEXIT_MSR: ASSERT(regs != NULL); - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_msr(svm->ns_cached_msrpm, regs->ecx, ns_vmcb->exitinfo1 != 0); @@ -974,8 +981,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, return 0; break; case VMEXIT_IOIO: - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_ioio(ns_vmcb->_iopm_base_pa, ns_vmcb->exitinfo1); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:58:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTSk-0006zi-9o; Wed, 13 Nov 2013 05:58:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSi-0006zZ-OQ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:01 +0000 Received: from [85.158.137.68:20116] by server-5.bemta-3.messagelabs.com id CA/25-25946-7E413825; Wed, 13 Nov 2013 05:57:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384322278!1161434!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24567 invoked from network); 13 Nov 2013 05:57:59 -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; 13 Nov 2013 05:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSf-00045L-UF for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSf-0007g2-RP for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:57 +0000 Date: Wed, 13 Nov 2013 05:57:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58929248461ecadce13e92eb5a5d9ef718a7c88e Author: Jan Beulich AuthorDate: Tue Nov 12 11:52:19 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:52:19 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7a01b1f..19650ce 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -601,16 +601,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -633,6 +633,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a0ad37a..57a9caf 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -675,7 +675,27 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { unsigned long attr = 0, sel = 0, limit; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index b50352f..ebaba5c 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -144,6 +144,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:58:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTSk-0006zi-9o; Wed, 13 Nov 2013 05:58:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSi-0006zZ-OQ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:01 +0000 Received: from [85.158.137.68:20116] by server-5.bemta-3.messagelabs.com id CA/25-25946-7E413825; Wed, 13 Nov 2013 05:57:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384322278!1161434!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24567 invoked from network); 13 Nov 2013 05:57:59 -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; 13 Nov 2013 05:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSf-00045L-UF for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSf-0007g2-RP for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:57:57 +0000 Date: Wed, 13 Nov 2013 05:57:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58929248461ecadce13e92eb5a5d9ef718a7c88e Author: Jan Beulich AuthorDate: Tue Nov 12 11:52:19 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 11:52:19 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7a01b1f..19650ce 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -601,16 +601,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -633,6 +633,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a0ad37a..57a9caf 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -675,7 +675,27 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { unsigned long attr = 0, sel = 0, limit; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index b50352f..ebaba5c 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -144,6 +144,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:58:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSu-00071L-Cg; Wed, 13 Nov 2013 05:58:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSs-000712-Vu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:11 +0000 Received: from [85.158.139.211:48986] by server-3.bemta-5.messagelabs.com id AF/41-08905-2F413825; Wed, 13 Nov 2013 05:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384322288!1642491!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5223 invoked from network); 13 Nov 2013 05:58:09 -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; 13 Nov 2013 05:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSq-00045r-3E for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSq-0007ga-1V for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:08 +0000 Date: Wed, 13 Nov 2013 05:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn/fifo: don't spin indefinitely when setting LINK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dae2a1c5f9372be1b5d1e734ad3e51f67a1221aa Author: David Vrabel AuthorDate: Tue Nov 12 13:19:25 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 13:19:25 2013 +0100 evtchn/fifo: don't spin indefinitely when setting LINK A malicious or buggy guest can cause another domain to spin indefinitely by repeatedly writing to an event word when the other guest is trying to link a new event. The cmpxchg() in evtchn_fifo_set_link() will repeatedly fail and the loop may never terminate. Fixing this requires a change to the ABI which is documented in draft H of the design. http://xenbits.xen.org/people/dvrabel/event-channels-H.pdf Since a well-behaved guest only makes a limited set of state changes, the loop can terminate early if the guest makes an invalid state transition. The guest may: - clear LINKED and LINK. - clear PENDING - set MASKED - clear MASKED It is valid for the guest to mask and unmask an event at any time so specify that it is not valid for a guest to clear MASKED if Xen is trying to update LINK. Indicate this to the guest with an additional BUSY bit in the event word. The guest must not clear MASKED if BUSY is set and it should spin until BUSY is cleared. The remaining valid writes (clear LINKED, clear PENDING, set MASKED, clear MASKED by Xen) will limit the number of failures of the cmpxchg() to at most 4. A clear of LINKED will also terminate the loop early. Therefore, the loop can then be limited to at most 4 iterations. If the buggy or malicious guest does cause the loop to exit with LINKED set and LINK unset then that buggy guest will lose events. Reported-by: Anthony Liguori Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_fifo.c | 75 +++++++++++++++++++++++++++++------ xen/include/public/event_channel.h | 1 + 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 64dbfff..9106c55 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -34,19 +34,67 @@ static inline event_word_t *evtchn_fifo_word_from_port(struct domain *d, return d->evtchn_fifo->event_array[p] + w; } -static bool_t evtchn_fifo_set_link(event_word_t *word, uint32_t link) +static int try_set_link(event_word_t *word, event_word_t *w, uint32_t link) { - event_word_t n, o, w; + event_word_t new, old; - w = *word; + if ( !(*w & (1 << EVTCHN_FIFO_LINKED)) ) + return 0; - do { - if ( !(w & (1 << EVTCHN_FIFO_LINKED)) ) - return 0; - o = w; - n = (w & ~EVTCHN_FIFO_LINK_MASK) | link; - } while ( (w = cmpxchg(word, o, n)) != o ); + old = *w; + new = (old & ~((1 << EVTCHN_FIFO_BUSY) | EVTCHN_FIFO_LINK_MASK)) | link; + *w = cmpxchg(word, old, new); + if ( *w == old ) + return 1; + return -EAGAIN; +} + +/* + * Atomically set the LINK field iff it is still LINKED. + * + * The guest is only permitted to make the following changes to a + * LINKED event. + * + * - set MASKED + * - clear MASKED + * - clear PENDING + * - clear LINKED (and LINK) + * + * We block unmasking by the guest by marking the tail word as BUSY, + * therefore, the cmpxchg() may fail at most 4 times. + */ +static bool_t evtchn_fifo_set_link(const struct domain *d, event_word_t *word, + uint32_t link) +{ + event_word_t w; + unsigned int try; + int ret; + + w = read_atomic(word); + + ret = try_set_link(word, &w, link); + if ( ret >= 0 ) + return ret; + + /* Lock the word to prevent guest unmasking. */ + set_bit(EVTCHN_FIFO_BUSY, word); + + w = read_atomic(word); + + for ( try = 0; try < 4; try++ ) + { + ret = try_set_link(word, &w, link); + if ( ret >= 0 ) + { + if ( ret == 0 ) + clear_bit(EVTCHN_FIFO_BUSY, word); + return ret; + } + } + gdprintk(XENLOG_WARNING, "domain %d, port %d not linked\n", + d->domain_id, link); + clear_bit(EVTCHN_FIFO_BUSY, word); return 1; } @@ -105,7 +153,7 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) if ( port != q->tail ) { tail_word = evtchn_fifo_word_from_port(d, q->tail); - linked = evtchn_fifo_set_link(tail_word, port); + linked = evtchn_fifo_set_link(d, tail_word, port); } if ( !linked ) write_atomic(q->head, port); @@ -202,11 +250,12 @@ static void evtchn_fifo_print_state(struct domain *d, word = evtchn_fifo_word_from_port(d, evtchn->port); if ( !word ) - printk("? "); + printk("? "); else if ( test_bit(EVTCHN_FIFO_LINKED, word) ) - printk("%-4u", *word & EVTCHN_FIFO_LINK_MASK); + printk("%c %-4u", test_bit(EVTCHN_FIFO_BUSY, word) ? 'B' : ' ', + *word & EVTCHN_FIFO_LINK_MASK); else - printk("- "); + printk("%c - ", test_bit(EVTCHN_FIFO_BUSY, word) ? 'B' : ' '); } static const struct evtchn_port_ops evtchn_port_ops_fifo = diff --git a/xen/include/public/event_channel.h b/xen/include/public/event_channel.h index 4a53484..b78ee32 100644 --- a/xen/include/public/event_channel.h +++ b/xen/include/public/event_channel.h @@ -343,6 +343,7 @@ typedef uint32_t event_word_t; #define EVTCHN_FIFO_PENDING 31 #define EVTCHN_FIFO_MASKED 30 #define EVTCHN_FIFO_LINKED 29 +#define EVTCHN_FIFO_BUSY 28 #define EVTCHN_FIFO_LINK_BITS 17 #define EVTCHN_FIFO_LINK_MASK ((1 << EVTCHN_FIFO_LINK_BITS) - 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 Nov 13 05:58:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSu-00071L-Cg; Wed, 13 Nov 2013 05:58:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSs-000712-Vu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:11 +0000 Received: from [85.158.139.211:48986] by server-3.bemta-5.messagelabs.com id AF/41-08905-2F413825; Wed, 13 Nov 2013 05:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384322288!1642491!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5223 invoked from network); 13 Nov 2013 05:58:09 -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; 13 Nov 2013 05:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTSq-00045r-3E for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTSq-0007ga-1V for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:08 +0000 Date: Wed, 13 Nov 2013 05:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn/fifo: don't spin indefinitely when setting LINK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dae2a1c5f9372be1b5d1e734ad3e51f67a1221aa Author: David Vrabel AuthorDate: Tue Nov 12 13:19:25 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 13:19:25 2013 +0100 evtchn/fifo: don't spin indefinitely when setting LINK A malicious or buggy guest can cause another domain to spin indefinitely by repeatedly writing to an event word when the other guest is trying to link a new event. The cmpxchg() in evtchn_fifo_set_link() will repeatedly fail and the loop may never terminate. Fixing this requires a change to the ABI which is documented in draft H of the design. http://xenbits.xen.org/people/dvrabel/event-channels-H.pdf Since a well-behaved guest only makes a limited set of state changes, the loop can terminate early if the guest makes an invalid state transition. The guest may: - clear LINKED and LINK. - clear PENDING - set MASKED - clear MASKED It is valid for the guest to mask and unmask an event at any time so specify that it is not valid for a guest to clear MASKED if Xen is trying to update LINK. Indicate this to the guest with an additional BUSY bit in the event word. The guest must not clear MASKED if BUSY is set and it should spin until BUSY is cleared. The remaining valid writes (clear LINKED, clear PENDING, set MASKED, clear MASKED by Xen) will limit the number of failures of the cmpxchg() to at most 4. A clear of LINKED will also terminate the loop early. Therefore, the loop can then be limited to at most 4 iterations. If the buggy or malicious guest does cause the loop to exit with LINKED set and LINK unset then that buggy guest will lose events. Reported-by: Anthony Liguori Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_fifo.c | 75 +++++++++++++++++++++++++++++------ xen/include/public/event_channel.h | 1 + 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 64dbfff..9106c55 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -34,19 +34,67 @@ static inline event_word_t *evtchn_fifo_word_from_port(struct domain *d, return d->evtchn_fifo->event_array[p] + w; } -static bool_t evtchn_fifo_set_link(event_word_t *word, uint32_t link) +static int try_set_link(event_word_t *word, event_word_t *w, uint32_t link) { - event_word_t n, o, w; + event_word_t new, old; - w = *word; + if ( !(*w & (1 << EVTCHN_FIFO_LINKED)) ) + return 0; - do { - if ( !(w & (1 << EVTCHN_FIFO_LINKED)) ) - return 0; - o = w; - n = (w & ~EVTCHN_FIFO_LINK_MASK) | link; - } while ( (w = cmpxchg(word, o, n)) != o ); + old = *w; + new = (old & ~((1 << EVTCHN_FIFO_BUSY) | EVTCHN_FIFO_LINK_MASK)) | link; + *w = cmpxchg(word, old, new); + if ( *w == old ) + return 1; + return -EAGAIN; +} + +/* + * Atomically set the LINK field iff it is still LINKED. + * + * The guest is only permitted to make the following changes to a + * LINKED event. + * + * - set MASKED + * - clear MASKED + * - clear PENDING + * - clear LINKED (and LINK) + * + * We block unmasking by the guest by marking the tail word as BUSY, + * therefore, the cmpxchg() may fail at most 4 times. + */ +static bool_t evtchn_fifo_set_link(const struct domain *d, event_word_t *word, + uint32_t link) +{ + event_word_t w; + unsigned int try; + int ret; + + w = read_atomic(word); + + ret = try_set_link(word, &w, link); + if ( ret >= 0 ) + return ret; + + /* Lock the word to prevent guest unmasking. */ + set_bit(EVTCHN_FIFO_BUSY, word); + + w = read_atomic(word); + + for ( try = 0; try < 4; try++ ) + { + ret = try_set_link(word, &w, link); + if ( ret >= 0 ) + { + if ( ret == 0 ) + clear_bit(EVTCHN_FIFO_BUSY, word); + return ret; + } + } + gdprintk(XENLOG_WARNING, "domain %d, port %d not linked\n", + d->domain_id, link); + clear_bit(EVTCHN_FIFO_BUSY, word); return 1; } @@ -105,7 +153,7 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) if ( port != q->tail ) { tail_word = evtchn_fifo_word_from_port(d, q->tail); - linked = evtchn_fifo_set_link(tail_word, port); + linked = evtchn_fifo_set_link(d, tail_word, port); } if ( !linked ) write_atomic(q->head, port); @@ -202,11 +250,12 @@ static void evtchn_fifo_print_state(struct domain *d, word = evtchn_fifo_word_from_port(d, evtchn->port); if ( !word ) - printk("? "); + printk("? "); else if ( test_bit(EVTCHN_FIFO_LINKED, word) ) - printk("%-4u", *word & EVTCHN_FIFO_LINK_MASK); + printk("%c %-4u", test_bit(EVTCHN_FIFO_BUSY, word) ? 'B' : ' ', + *word & EVTCHN_FIFO_LINK_MASK); else - printk("- "); + printk("%c - ", test_bit(EVTCHN_FIFO_BUSY, word) ? 'B' : ' '); } static const struct evtchn_port_ops evtchn_port_ops_fifo = diff --git a/xen/include/public/event_channel.h b/xen/include/public/event_channel.h index 4a53484..b78ee32 100644 --- a/xen/include/public/event_channel.h +++ b/xen/include/public/event_channel.h @@ -343,6 +343,7 @@ typedef uint32_t event_word_t; #define EVTCHN_FIFO_PENDING 31 #define EVTCHN_FIFO_MASKED 30 #define EVTCHN_FIFO_LINKED 29 +#define EVTCHN_FIFO_BUSY 28 #define EVTCHN_FIFO_LINK_BITS 17 #define EVTCHN_FIFO_LINK_MASK ((1 << EVTCHN_FIFO_LINK_BITS) - 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 Nov 13 05:58:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTT4-0007JN-FP; Wed, 13 Nov 2013 05:58:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTT3-0007E2-3r for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:21 +0000 Received: from [85.158.139.211:49374] by server-8.bemta-5.messagelabs.com id 22/3C-32206-CF413825; Wed, 13 Nov 2013 05:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1384322298!1650331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20323 invoked from network); 13 Nov 2013 05:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTT0-000460-9u for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTT0-0007hC-6z for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:18 +0000 Date: Wed, 13 Nov 2013 05:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 Author: Jan Beulich AuthorDate: Tue Nov 12 16:28:47 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 16:28:47 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 22a63a7..406d394 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1973,7 +1974,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 57a9caf..8e418c5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2236,10 +2237,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index e42651e..e4da850 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -316,7 +316,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTT4-0007JN-FP; Wed, 13 Nov 2013 05:58:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTT3-0007E2-3r for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:21 +0000 Received: from [85.158.139.211:49374] by server-8.bemta-5.messagelabs.com id 22/3C-32206-CF413825; Wed, 13 Nov 2013 05:58:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1384322298!1650331!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20323 invoked from network); 13 Nov 2013 05:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTT0-000460-9u for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTT0-0007hC-6z for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:18 +0000 Date: Wed, 13 Nov 2013 05:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 Author: Jan Beulich AuthorDate: Tue Nov 12 16:28:47 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 16:28:47 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 22a63a7..406d394 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1973,7 +1974,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 57a9caf..8e418c5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2236,10 +2237,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index e42651e..e4da850 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -316,7 +316,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTTF-0007fv-IJ; Wed, 13 Nov 2013 05:58:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTD-0007fK-E5 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:31 +0000 Received: from [85.158.139.211:28123] by server-10.bemta-5.messagelabs.com id A8/21-28640-60513825; Wed, 13 Nov 2013 05:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384322308!1640145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2721 invoked from network); 13 Nov 2013 05:58:29 -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; 13 Nov 2013 05:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTA-000465-GJ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTA-0007hg-Ej for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:28 +0000 Date: Wed, 13 Nov 2013 05:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 15:31:15 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(void) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTTF-0007fv-IJ; Wed, 13 Nov 2013 05:58:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTD-0007fK-E5 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:31 +0000 Received: from [85.158.139.211:28123] by server-10.bemta-5.messagelabs.com id A8/21-28640-60513825; Wed, 13 Nov 2013 05:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384322308!1640145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2721 invoked from network); 13 Nov 2013 05:58:29 -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; 13 Nov 2013 05:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTA-000465-GJ for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTA-0007hg-Ej for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:28 +0000 Date: Wed, 13 Nov 2013 05:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 15:31:15 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(void) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTTQ-0007hu-L4; Wed, 13 Nov 2013 05:58:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTO-0007hX-Hi for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:42 +0000 Received: from [193.109.254.147:9722] by server-7.bemta-14.messagelabs.com id 7D/93-14870-11513825; Wed, 13 Nov 2013 05:58:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384322318!2396230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14723 invoked from network); 13 Nov 2013 05:58:39 -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; 13 Nov 2013 05:58:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTK-00046E-MU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTK-0007ik-KU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:38 +0000 Date: Wed, 13 Nov 2013 05:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f15eacdd5a2170e8d870f4624278e1ea310c46c7 Author: Ian Jackson AuthorDate: Tue Nov 12 15:41:37 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 15:41:37 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cafe539..7eeed31 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 84411871262363200e70fa087d7b21647091a450 -# Wed Jul 31 16:16:16 2013 +0100 -# qemu-xen-traditional: allow build without blktap1 +QEMU_TAG ?= 832f9bde25542961ea4f768be6e00e4801484e3a +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58: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 1VgTTQ-0007hu-L4; Wed, 13 Nov 2013 05:58:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTO-0007hX-Hi for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:42 +0000 Received: from [193.109.254.147:9722] by server-7.bemta-14.messagelabs.com id 7D/93-14870-11513825; Wed, 13 Nov 2013 05:58:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384322318!2396230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14723 invoked from network); 13 Nov 2013 05:58:39 -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; 13 Nov 2013 05:58:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTK-00046E-MU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTK-0007ik-KU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:38 +0000 Date: Wed, 13 Nov 2013 05:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f15eacdd5a2170e8d870f4624278e1ea310c46c7 Author: Ian Jackson AuthorDate: Tue Nov 12 15:41:37 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 15:41:37 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cafe539..7eeed31 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 84411871262363200e70fa087d7b21647091a450 -# Wed Jul 31 16:16:16 2013 +0100 -# qemu-xen-traditional: allow build without blktap1 +QEMU_TAG ?= 832f9bde25542961ea4f768be6e00e4801484e3a +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTY-0007jS-OI; Wed, 13 Nov 2013 05:58:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTX-0007j6-J5 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:51 +0000 Received: from [85.158.137.68:19637] by server-3.bemta-3.messagelabs.com id 47/F0-03862-A1513825; Wed, 13 Nov 2013 05:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384322329!1146687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23897 invoked from network); 13 Nov 2013 05:58:50 -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 Nov 2013 05:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTU-00046H-Uu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTU-0007j6-S6 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:48 +0000 Date: Wed, 13 Nov 2013 05:58:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: fix signed->unsigned error, causing glacial performance X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddd48f0ea099621ef1e891f634b938dda76a5bba Author: Andrew Cooper AuthorDate: Tue Nov 12 17:20:34 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 17:20:34 2013 +0100 common/vsprintf: fix signed->unsigned error, causing glacial performance The original patch for c/s 67a3542c5bc356e6452d8305991617c875f87de4 "common/vsprintf: Refactor string() out of vsnprintf()" specifically used signed integers, identical to the code copied out of vsprintf. When committed, these had changed to unsigned integers, which causes a functional change. This causes glacial boot performance and an excessive quantity of spaces printed to the serial console, as we loop to the upper bound of a 32bit integer. Signed-off-by: Andrew Cooper --- xen/common/vsprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index e8f45eb..43dc392 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -239,7 +239,7 @@ static char *number( static char *string(char *str, char *end, const char *s, int field_width, int precision, int flags) { - unsigned int i, len = strnlen(s, precision); + int i, len = strnlen(s, precision); if (!(flags & LEFT)) { while (len < field_width--) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:58:52 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTY-0007jS-OI; Wed, 13 Nov 2013 05:58:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTX-0007j6-J5 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:51 +0000 Received: from [85.158.137.68:19637] by server-3.bemta-3.messagelabs.com id 47/F0-03862-A1513825; Wed, 13 Nov 2013 05:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384322329!1146687!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23897 invoked from network); 13 Nov 2013 05:58:50 -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 Nov 2013 05:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTU-00046H-Uu for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTU-0007j6-S6 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:48 +0000 Date: Wed, 13 Nov 2013 05:58:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] common/vsprintf: fix signed->unsigned error, causing glacial performance X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddd48f0ea099621ef1e891f634b938dda76a5bba Author: Andrew Cooper AuthorDate: Tue Nov 12 17:20:34 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 12 17:20:34 2013 +0100 common/vsprintf: fix signed->unsigned error, causing glacial performance The original patch for c/s 67a3542c5bc356e6452d8305991617c875f87de4 "common/vsprintf: Refactor string() out of vsnprintf()" specifically used signed integers, identical to the code copied out of vsprintf. When committed, these had changed to unsigned integers, which causes a functional change. This causes glacial boot performance and an excessive quantity of spaces printed to the serial console, as we loop to the upper bound of a 32bit integer. Signed-off-by: Andrew Cooper --- xen/common/vsprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index e8f45eb..43dc392 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -239,7 +239,7 @@ static char *number( static char *string(char *str, char *end, const char *s, int field_width, int precision, int flags) { - unsigned int i, len = strnlen(s, precision); + int i, len = strnlen(s, precision); if (!(flags & LEFT)) { while (len < field_width--) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTi-0007l9-RI; Wed, 13 Nov 2013 05:59:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTi-0007l0-4o for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:02 +0000 Received: from [85.158.139.211:55014] by server-14.bemta-5.messagelabs.com id A6/D4-29404-52513825; Wed, 13 Nov 2013 05:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1384322339!1650391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23113 invoked from network); 13 Nov 2013 05:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTf-00046W-5W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTf-0007jY-3u for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:59 +0000 Date: Wed, 13 Nov 2013 05:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce nested async operations (nested ao) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2118713207711053607==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2118713207711053607== Content-Type: text/plain commit 1581630f96a19c77a45f9410d0ca1f397d5bbc4e Author: Ian Jackson AuthorDate: Mon Nov 4 17:56:15 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 16:34:13 2013 +0000 libxl: Introduce nested async operations (nested ao) This allows a long-running ao to avoid accumulating memory. Each nested ao has its own gc. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Tested-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 35 +++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 25 ++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0fe4428..54d15db 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1572,6 +1572,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) LOG(DEBUG,"ao %p: complete, rc=%d",ao,rc); assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); + assert(!ao->nested); ao->complete = 1; ao->rc = rc; @@ -1736,6 +1737,7 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, const libxl_asyncprogress_how *how, libxl_event *ev) { AO_GC; + assert(!ao->nested); if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); libxl_event_free(CTX,ev); @@ -1756,6 +1758,39 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, } +/* nested ao */ + +_hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) +{ + /* We only use the parent to get the ctx. However, we require the + * caller to provide us with an ao, not just a ctx, to prove that + * they are already in an asynchronous operation. That will avoid + * people using this to (for example) make an ao in a non-ao_how + * function somewhere in the middle of libxl. */ + libxl__ao *child = NULL; + libxl_ctx *ctx = libxl__gc_owner(&parent->gc); + + assert(parent->magic == LIBXL__AO_MAGIC); + + child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); + child->magic = LIBXL__AO_MAGIC; + child->nested = 1; + LIBXL_INIT_GC(child->gc, ctx); + libxl__gc *gc = &child->gc; + + LOG(DEBUG,"ao %p: nested ao, parent %p", child, parent); + return child; +} + +_hidden void libxl__nested_ao_free(libxl__ao *child) +{ + assert(child->magic == LIBXL__AO_MAGIC); + assert(child->nested); + libxl_ctx *ctx = libxl__gc_owner(&child->gc); + libxl__ao__destroy(ctx, child); +} + + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4729566..0b20434 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -427,7 +427,7 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1, nested:1; int progress_reports_outstanding; int rc; libxl__gc gc; @@ -1780,6 +1780,29 @@ _hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); /* + * Short-lived sub-ao, aka "nested ao". + * + * Some asynchronous operations are very long-running. Generally, + * since an ao has a gc, any allocations made in that ao will live + * until the ao is completed. When this is not desirable, these + * functions may be used to manage a "sub-ao". + * + * The returned sub-ao is suitable for passing to gc-related functions + * and macros such as libxl__ao_inprogress_gc, AO_GC, and STATE_AO_GC. + * + * It MUST NOT be used with AO_INPROGRESS, AO_ABORT, + * libxl__ao_complete, libxl__ao_progress_report, and so on. + * + * The caller must ensure that all of the sub-ao's are freed before + * the parent is. Multiple levels of nesting are OK (although + * hopefully they won't be necessary). + */ + +_hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent); /* cannot fail */ +_hidden void libxl__nested_ao_free(libxl__ao *child); + + +/* * File descriptors and CLOEXEC */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2118713207711053607== 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 --===============2118713207711053607==-- From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTi-0007l9-RI; Wed, 13 Nov 2013 05:59:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTi-0007l0-4o for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:02 +0000 Received: from [85.158.139.211:55014] by server-14.bemta-5.messagelabs.com id A6/D4-29404-52513825; Wed, 13 Nov 2013 05:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1384322339!1650391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23113 invoked from network); 13 Nov 2013 05:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTf-00046W-5W for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTf-0007jY-3u for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:58:59 +0000 Date: Wed, 13 Nov 2013 05:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce nested async operations (nested ao) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2118713207711053607==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2118713207711053607== Content-Type: text/plain commit 1581630f96a19c77a45f9410d0ca1f397d5bbc4e Author: Ian Jackson AuthorDate: Mon Nov 4 17:56:15 2013 +0000 Commit: Ian Jackson CommitDate: Tue Nov 12 16:34:13 2013 +0000 libxl: Introduce nested async operations (nested ao) This allows a long-running ao to avoid accumulating memory. Each nested ao has its own gc. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Tested-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 35 +++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 25 ++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 0fe4428..54d15db 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1572,6 +1572,7 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) LOG(DEBUG,"ao %p: complete, rc=%d",ao,rc); assert(ao->magic == LIBXL__AO_MAGIC); assert(!ao->complete); + assert(!ao->nested); ao->complete = 1; ao->rc = rc; @@ -1736,6 +1737,7 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, const libxl_asyncprogress_how *how, libxl_event *ev) { AO_GC; + assert(!ao->nested); if (how->callback == dummy_asyncprogress_callback_ignore) { LOG(DEBUG,"ao %p: progress report: ignored",ao); libxl_event_free(CTX,ev); @@ -1756,6 +1758,39 @@ void libxl__ao_progress_report(libxl__egc *egc, libxl__ao *ao, } +/* nested ao */ + +_hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent) +{ + /* We only use the parent to get the ctx. However, we require the + * caller to provide us with an ao, not just a ctx, to prove that + * they are already in an asynchronous operation. That will avoid + * people using this to (for example) make an ao in a non-ao_how + * function somewhere in the middle of libxl. */ + libxl__ao *child = NULL; + libxl_ctx *ctx = libxl__gc_owner(&parent->gc); + + assert(parent->magic == LIBXL__AO_MAGIC); + + child = libxl__zalloc(&ctx->nogc_gc, sizeof(*child)); + child->magic = LIBXL__AO_MAGIC; + child->nested = 1; + LIBXL_INIT_GC(child->gc, ctx); + libxl__gc *gc = &child->gc; + + LOG(DEBUG,"ao %p: nested ao, parent %p", child, parent); + return child; +} + +_hidden void libxl__nested_ao_free(libxl__ao *child) +{ + assert(child->magic == LIBXL__AO_MAGIC); + assert(child->nested); + libxl_ctx *ctx = libxl__gc_owner(&child->gc); + libxl__ao__destroy(ctx, child); +} + + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4729566..0b20434 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -427,7 +427,7 @@ struct libxl__ao { * only in libxl__ao_complete.) */ uint32_t magic; - unsigned constructing:1, in_initiator:1, complete:1, notified:1; + unsigned constructing:1, in_initiator:1, complete:1, notified:1, nested:1; int progress_reports_outstanding; int rc; libxl__gc gc; @@ -1780,6 +1780,29 @@ _hidden void libxl__ao_complete_check_progress_reports(libxl__egc*, libxl__ao*); /* + * Short-lived sub-ao, aka "nested ao". + * + * Some asynchronous operations are very long-running. Generally, + * since an ao has a gc, any allocations made in that ao will live + * until the ao is completed. When this is not desirable, these + * functions may be used to manage a "sub-ao". + * + * The returned sub-ao is suitable for passing to gc-related functions + * and macros such as libxl__ao_inprogress_gc, AO_GC, and STATE_AO_GC. + * + * It MUST NOT be used with AO_INPROGRESS, AO_ABORT, + * libxl__ao_complete, libxl__ao_progress_report, and so on. + * + * The caller must ensure that all of the sub-ao's are freed before + * the parent is. Multiple levels of nesting are OK (although + * hopefully they won't be necessary). + */ + +_hidden libxl__ao *libxl__nested_ao_create(libxl__ao *parent); /* cannot fail */ +_hidden void libxl__nested_ao_free(libxl__ao *child); + + +/* * File descriptors and CLOEXEC */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2118713207711053607== 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 --===============2118713207711053607==-- From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTt-0007n3-0D; Wed, 13 Nov 2013 05:59:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTs-0007mo-DX for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:12 +0000 Received: from [85.158.139.211:29567] by server-17.bemta-5.messagelabs.com id 3A/A3-17059-F2513825; Wed, 13 Nov 2013 05:59:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384322349!1662717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3419 invoked from network); 13 Nov 2013 05:59:10 -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; 13 Nov 2013 05:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTp-000476-NS for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTp-0007kD-Jc for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:09 +0000 Date: Wed, 13 Nov 2013 05:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6d2a87f051456bddb7a47922c8cf60f37073063 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:24:51 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTt-0007n3-0D; Wed, 13 Nov 2013 05:59:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTs-0007mo-DX for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:12 +0000 Received: from [85.158.139.211:29567] by server-17.bemta-5.messagelabs.com id 3A/A3-17059-F2513825; Wed, 13 Nov 2013 05:59:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384322349!1662717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3419 invoked from network); 13 Nov 2013 05:59:10 -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; 13 Nov 2013 05:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTTp-000476-NS for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTTp-0007kD-Jc for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:09 +0000 Date: Wed, 13 Nov 2013 05:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6d2a87f051456bddb7a47922c8cf60f37073063 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:24:51 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59: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 1VgTU5-0007ov-38; Wed, 13 Nov 2013 05:59:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTU3-0007od-HU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:23 +0000 Received: from [85.158.137.68:22739] by server-4.bemta-3.messagelabs.com id FB/A4-08123-A3513825; Wed, 13 Nov 2013 05:59:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384322360!1161566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26888 invoked from network); 13 Nov 2013 05:59:21 -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; 13 Nov 2013 05:59:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTU0-00047F-Cm for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTU0-0007kZ-98 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:20 +0000 Date: Wed, 13 Nov 2013 05:59:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Deprecate synchronous waiting for the device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47cb2273b2bfc25279c917d0bb5a67dc2d9266bc Author: Ian Jackson AuthorDate: Mon Oct 14 17:26:01 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:27:09 2013 +0000 libxl: Deprecate synchronous waiting for the device model libxl__wait_for_device_model blocks, with the ctx lock held, waiting for a response from the device model. If the dm doesn't respond quickly (for example, because it has crashed), this may block the whole process. Explain this in a comment, rename the function to libxl__wait_for_device_model_deprecated, and explain what to use instead. libxl__wait_for_offspring is the core implementation for the above. Its name leads people to think it might be generally useful for waiting for children, which is far from the case. It only waits for xenstore. Also it has the problems described above. Explain this, rename it to libxl__xenstore_child_wait_deprecated, and explain what to use instead. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_device.c | 4 ++-- tools/libxl/libxl_dom.c | 4 ++-- tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_internal.h | 36 ++++++++++++++++++++++++++++-------- tools/libxl/libxl_pci.c | 8 ++++---- 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0f0f56c..9e623c8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -846,7 +846,7 @@ int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) state = libxl__xs_read(gc, XBT_NULL, path); if (state != NULL && !strcmp(state, "paused")) { libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model(gc, domid, "running", + libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL); } } diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 4e24ff4..cce9e32 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1057,7 +1057,7 @@ static void devices_remove_callback(libxl__egc *egc, return; } -int libxl__wait_for_device_model(libxl__gc *gc, +int libxl__wait_for_device_model_deprecated(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, int (*check_callback)(libxl__gc *gc, @@ -1068,7 +1068,7 @@ int libxl__wait_for_device_model(libxl__gc *gc, { char *path; path = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); - return libxl__wait_for_offspring(gc, domid, + return libxl__xenstore_child_wait_deprecated(gc, domid, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, state, spawning, check_callback, check_callback_userdata); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1812bdc..6cb39c1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -965,7 +965,7 @@ int libxl__domain_suspend_device_model(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { LOG(DEBUG, "Saving device model state to %s", filename); libxl__qemu_traditional_cmd(gc, domid, "save"); - libxl__wait_for_device_model(gc, domid, "paused", NULL, NULL, NULL); + libxl__wait_for_device_model_deprecated(gc, domid, "paused", NULL, NULL, NULL); break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: @@ -989,7 +989,7 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model(gc, domid, "running", NULL, NULL, NULL); + libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL); break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 7eddaef..b6efa0f 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -157,7 +157,7 @@ out: return rc ? SIGTERM : 0; } -int libxl__wait_for_offspring(libxl__gc *gc, +int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, uint32_t domid, uint32_t timeout, char *what, char *path, char *state, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0b20434..4ad6ad3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1226,7 +1226,19 @@ _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); /* - * libxl__wait_for_offspring - Wait for child state + * libxl__xenstore_child_wait_deprecated - Wait for daemonic child IPC + * + * This is a NOT function for waiting for ordinary child processes. + * If you want to run (fork/exec/wait) subprocesses from libxl: + * - Make your libxl entrypoint use the ao machinery + * - Use libxl__ev_fork, and use the callback programming style + * + * This function is intended for interprocess communication with a + * service process. If the service process does not respond quickly, + * the whole caller may be blocked. Therefore this function is + * deprecated. This function is currently used only by + * libxl__wait_for_device_model_deprecated. + * * gc: allocation pool * domid: guest to work with * timeout: how many seconds to wait for the state to appear @@ -1243,9 +1255,9 @@ _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, * in xenstore, and optionally for state in path. * If path appears and state matches, check_callback is called. * If check_callback returns > 0, waiting for path or state continues. - * Otherwise libxl__wait_for_offspring returns. + * Otherwise libxl__xenstore_child_wait_deprecated returns. */ -_hidden int libxl__wait_for_offspring(libxl__gc *gc, +_hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, uint32_t domid, uint32_t timeout, char *what, char *path, char *state, @@ -1298,12 +1310,20 @@ _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, int nr_disks, libxl_device_disk *disks); - /* Caller must either: pass starting_r==0, or on successful - * return pass *starting_r (which will be non-0) to - * libxl__confirm_device_model_startup or libxl__detach_device_model. */ -_hidden int libxl__wait_for_device_model(libxl__gc *gc, + +/* + * This function will cause the whole libxl process to hang + * if the device model does not respond. It is deprecated. + * + * Instead of calling this function: + * - Make your libxl entrypoint use the ao machinery + * - Use libxl__ev_xswatch_register, and use the callback programming + * style + */ +_hidden int libxl__wait_for_device_model_deprecated(libxl__gc *gc, uint32_t domid, char *state, - libxl__spawn_starting *spawning, + libxl__spawn_starting *spawning + /* NULL allowed */, int (*check_callback)(libxl__gc *gc, uint32_t domid, const char *state, diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 26ba3e6..c8eceb4 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -823,7 +823,7 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); - rc = libxl__wait_for_device_model(gc, domid, NULL, NULL, + rc = libxl__wait_for_device_model_deprecated(gc, domid, NULL, NULL, pci_ins_check, state); path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); @@ -851,7 +851,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: hvm = 1; - if (libxl__wait_for_device_model(gc, domid, "running", + if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) { return ERROR_FAIL; } @@ -1137,7 +1137,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, * device-model for function 0 */ if ( !force && (pcidev->vdevfn & 0x7) == 0 ) { libxl__qemu_traditional_cmd(gc, domid, "pci-rem"); - if (libxl__wait_for_device_model(gc, domid, "pci-removed", + if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-removed", NULL, NULL, NULL) < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Device Model didn't respond in time"); /* This depends on guest operating system acknowledging the @@ -1179,7 +1179,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: hvm = 1; - if (libxl__wait_for_device_model(gc, domid, "running", + if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) goto out_fail; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:59:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59: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 1VgTU5-0007ov-38; Wed, 13 Nov 2013 05:59:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTU3-0007od-HU for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:23 +0000 Received: from [85.158.137.68:22739] by server-4.bemta-3.messagelabs.com id FB/A4-08123-A3513825; Wed, 13 Nov 2013 05:59:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384322360!1161566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26888 invoked from network); 13 Nov 2013 05:59:21 -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; 13 Nov 2013 05:59:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTU0-00047F-Cm for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTU0-0007kZ-98 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:20 +0000 Date: Wed, 13 Nov 2013 05:59:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Deprecate synchronous waiting for the device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47cb2273b2bfc25279c917d0bb5a67dc2d9266bc Author: Ian Jackson AuthorDate: Mon Oct 14 17:26:01 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:27:09 2013 +0000 libxl: Deprecate synchronous waiting for the device model libxl__wait_for_device_model blocks, with the ctx lock held, waiting for a response from the device model. If the dm doesn't respond quickly (for example, because it has crashed), this may block the whole process. Explain this in a comment, rename the function to libxl__wait_for_device_model_deprecated, and explain what to use instead. libxl__wait_for_offspring is the core implementation for the above. Its name leads people to think it might be generally useful for waiting for children, which is far from the case. It only waits for xenstore. Also it has the problems described above. Explain this, rename it to libxl__xenstore_child_wait_deprecated, and explain what to use instead. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_device.c | 4 ++-- tools/libxl/libxl_dom.c | 4 ++-- tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_internal.h | 36 ++++++++++++++++++++++++++++-------- tools/libxl/libxl_pci.c | 8 ++++---- 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0f0f56c..9e623c8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -846,7 +846,7 @@ int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) state = libxl__xs_read(gc, XBT_NULL, path); if (state != NULL && !strcmp(state, "paused")) { libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model(gc, domid, "running", + libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL); } } diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 4e24ff4..cce9e32 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1057,7 +1057,7 @@ static void devices_remove_callback(libxl__egc *egc, return; } -int libxl__wait_for_device_model(libxl__gc *gc, +int libxl__wait_for_device_model_deprecated(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, int (*check_callback)(libxl__gc *gc, @@ -1068,7 +1068,7 @@ int libxl__wait_for_device_model(libxl__gc *gc, { char *path; path = GCSPRINTF("/local/domain/0/device-model/%d/state", domid); - return libxl__wait_for_offspring(gc, domid, + return libxl__xenstore_child_wait_deprecated(gc, domid, LIBXL_DEVICE_MODEL_START_TIMEOUT, "Device Model", path, state, spawning, check_callback, check_callback_userdata); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 1812bdc..6cb39c1 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -965,7 +965,7 @@ int libxl__domain_suspend_device_model(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { LOG(DEBUG, "Saving device model state to %s", filename); libxl__qemu_traditional_cmd(gc, domid, "save"); - libxl__wait_for_device_model(gc, domid, "paused", NULL, NULL, NULL); + libxl__wait_for_device_model_deprecated(gc, domid, "paused", NULL, NULL, NULL); break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: @@ -989,7 +989,7 @@ int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid) switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model(gc, domid, "running", NULL, NULL, NULL); + libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL); break; } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index 7eddaef..b6efa0f 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -157,7 +157,7 @@ out: return rc ? SIGTERM : 0; } -int libxl__wait_for_offspring(libxl__gc *gc, +int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, uint32_t domid, uint32_t timeout, char *what, char *path, char *state, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0b20434..4ad6ad3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1226,7 +1226,19 @@ _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); /* - * libxl__wait_for_offspring - Wait for child state + * libxl__xenstore_child_wait_deprecated - Wait for daemonic child IPC + * + * This is a NOT function for waiting for ordinary child processes. + * If you want to run (fork/exec/wait) subprocesses from libxl: + * - Make your libxl entrypoint use the ao machinery + * - Use libxl__ev_fork, and use the callback programming style + * + * This function is intended for interprocess communication with a + * service process. If the service process does not respond quickly, + * the whole caller may be blocked. Therefore this function is + * deprecated. This function is currently used only by + * libxl__wait_for_device_model_deprecated. + * * gc: allocation pool * domid: guest to work with * timeout: how many seconds to wait for the state to appear @@ -1243,9 +1255,9 @@ _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, * in xenstore, and optionally for state in path. * If path appears and state matches, check_callback is called. * If check_callback returns > 0, waiting for path or state continues. - * Otherwise libxl__wait_for_offspring returns. + * Otherwise libxl__xenstore_child_wait_deprecated returns. */ -_hidden int libxl__wait_for_offspring(libxl__gc *gc, +_hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, uint32_t domid, uint32_t timeout, char *what, char *path, char *state, @@ -1298,12 +1310,20 @@ _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, int nr_disks, libxl_device_disk *disks); - /* Caller must either: pass starting_r==0, or on successful - * return pass *starting_r (which will be non-0) to - * libxl__confirm_device_model_startup or libxl__detach_device_model. */ -_hidden int libxl__wait_for_device_model(libxl__gc *gc, + +/* + * This function will cause the whole libxl process to hang + * if the device model does not respond. It is deprecated. + * + * Instead of calling this function: + * - Make your libxl entrypoint use the ao machinery + * - Use libxl__ev_xswatch_register, and use the callback programming + * style + */ +_hidden int libxl__wait_for_device_model_deprecated(libxl__gc *gc, uint32_t domid, char *state, - libxl__spawn_starting *spawning, + libxl__spawn_starting *spawning + /* NULL allowed */, int (*check_callback)(libxl__gc *gc, uint32_t domid, const char *state, diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 26ba3e6..c8eceb4 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -823,7 +823,7 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); - rc = libxl__wait_for_device_model(gc, domid, NULL, NULL, + rc = libxl__wait_for_device_model_deprecated(gc, domid, NULL, NULL, pci_ins_check, state); path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); @@ -851,7 +851,7 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: hvm = 1; - if (libxl__wait_for_device_model(gc, domid, "running", + if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) { return ERROR_FAIL; } @@ -1137,7 +1137,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, * device-model for function 0 */ if ( !force && (pcidev->vdevfn & 0x7) == 0 ) { libxl__qemu_traditional_cmd(gc, domid, "pci-rem"); - if (libxl__wait_for_device_model(gc, domid, "pci-removed", + if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-removed", NULL, NULL, NULL) < 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Device Model didn't respond in time"); /* This depends on guest operating system acknowledging the @@ -1179,7 +1179,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: hvm = 1; - if (libxl__wait_for_device_model(gc, domid, "running", + if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) goto out_fail; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 13 05:59:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59: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 1VgTUG-0007qp-6B; Wed, 13 Nov 2013 05:59:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTUE-0007qa-I3 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:34 +0000 Received: from [193.109.254.147:26557] by server-9.bemta-14.messagelabs.com id DB/E1-08751-54513825; Wed, 13 Nov 2013 05:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384322372!2373953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15285 invoked from network); 13 Nov 2013 05:59:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:59:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTUC-00047K-2c for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTUB-0007kw-27 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:31 +0000 Date: Wed, 13 Nov 2013 05:59:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Avoid realloc(, 0) when libxl__xs_directory returns empty list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8173054294061396268==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8173054294061396268== Content-Type: text/plain commit 48249a140379b6a66cd32438c344a57fa21e00ed Author: Ian Jackson AuthorDate: Thu Apr 18 16:27:46 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:52:09 2013 +0000 libxl: Avoid realloc(,0) when libxl__xs_directory returns empty list If the named path is a leaf node, libxl__xs_directory can succeed, returning non-null, but set *nb to 0. In three places in libxl this may result in a zero size argument being passed to malloc() or realloc(), which is not adviseable. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9e623c8..0de1112 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1864,7 +1864,7 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); - if(dir) { + if (dir && ndirs) { vtpms = malloc(sizeof(*vtpms) * ndirs); libxl_device_vtpm* vtpm; libxl_device_vtpm* end = vtpms + ndirs; @@ -2371,7 +2371,7 @@ static int libxl__append_disk_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_disk *tmp; tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); if (tmp == NULL) @@ -3060,7 +3060,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_nic *tmp; tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n)); if (tmp == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8173054294061396268== 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 --===============8173054294061396268==-- From xen-changelog-bounces@lists.xen.org Wed Nov 13 05:59:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Nov 2013 05:59: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 1VgTUG-0007qp-6B; Wed, 13 Nov 2013 05:59:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTUE-0007qa-I3 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:34 +0000 Received: from [193.109.254.147:26557] by server-9.bemta-14.messagelabs.com id DB/E1-08751-54513825; Wed, 13 Nov 2013 05:59:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384322372!2373953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15285 invoked from network); 13 Nov 2013 05:59:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2013 05:59:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VgTUC-00047K-2c for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VgTUB-0007kw-27 for xen-changelog@lists.xensource.com; Wed, 13 Nov 2013 05:59:31 +0000 Date: Wed, 13 Nov 2013 05:59:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Avoid realloc(, 0) when libxl__xs_directory returns empty list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8173054294061396268==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8173054294061396268== Content-Type: text/plain commit 48249a140379b6a66cd32438c344a57fa21e00ed Author: Ian Jackson AuthorDate: Thu Apr 18 16:27:46 2013 +0100 Commit: Ian Jackson CommitDate: Tue Nov 12 17:52:09 2013 +0000 libxl: Avoid realloc(,0) when libxl__xs_directory returns empty list If the named path is a leaf node, libxl__xs_directory can succeed, returning non-null, but set *nb to 0. In three places in libxl this may result in a zero size argument being passed to malloc() or realloc(), which is not adviseable. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Acked-by: Ian Campbell --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9e623c8..0de1112 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1864,7 +1864,7 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); - if(dir) { + if (dir && ndirs) { vtpms = malloc(sizeof(*vtpms) * ndirs); libxl_device_vtpm* vtpm; libxl_device_vtpm* end = vtpms + ndirs; @@ -2371,7 +2371,7 @@ static int libxl__append_disk_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_disk *tmp; tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); if (tmp == NULL) @@ -3060,7 +3060,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_nic *tmp; tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n)); if (tmp == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8173054294061396268== 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 --===============8173054294061396268==-- From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00: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 1Vh41M-0000ZF-FF; Thu, 14 Nov 2013 21:00:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41K-0000ZA-IX for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:10 +0000 Received: from [85.158.143.35:33407] by server-1.bemta-4.messagelabs.com id 0D/51-02132-9D935825; Thu, 14 Nov 2013 21:00:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384462808!3280138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9323 invoked from network); 14 Nov 2013 21:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41H-0007L4-Oa for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41G-0008Tj-DD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:06 +0000 Date: Thu, 14 Nov 2013 21:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allow vmx_update_debug_state to be called when v!=current X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5ce1e3921e86b7b8176d85eaa3263aadba637d Author: George Dunlap AuthorDate: Wed Nov 13 09:25:36 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:25:36 2013 +0100 VMX: allow vmx_update_debug_state to be called when v!=current Removing the assert allows the PVH code to call this during vmcs construction in a later patch, making the code more robust by removing duplicate code. Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8e418c5..8d451d4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1125,8 +1125,6 @@ void vmx_update_debug_state(struct vcpu *v) { unsigned long mask; - ASSERT(v == current); - mask = 1u << TRAP_int3; if ( !cpu_has_monitor_trap_flag ) mask |= 1u << TRAP_debug; @@ -1135,7 +1133,10 @@ void vmx_update_debug_state(struct vcpu *v) v->arch.hvm_vmx.exception_bitmap |= mask; else v->arch.hvm_vmx.exception_bitmap &= ~mask; + + vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); + vmx_vmcs_exit(v); } static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00: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 1Vh41M-0000ZF-FF; Thu, 14 Nov 2013 21:00:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41K-0000ZA-IX for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:10 +0000 Received: from [85.158.143.35:33407] by server-1.bemta-4.messagelabs.com id 0D/51-02132-9D935825; Thu, 14 Nov 2013 21:00:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384462808!3280138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9323 invoked from network); 14 Nov 2013 21:00:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41H-0007L4-Oa for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41G-0008Tj-DD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:06 +0000 Date: Thu, 14 Nov 2013 21:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allow vmx_update_debug_state to be called when v!=current X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5ce1e3921e86b7b8176d85eaa3263aadba637d Author: George Dunlap AuthorDate: Wed Nov 13 09:25:36 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:25:36 2013 +0100 VMX: allow vmx_update_debug_state to be called when v!=current Removing the assert allows the PVH code to call this during vmcs construction in a later patch, making the code more robust by removing duplicate code. Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8e418c5..8d451d4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1125,8 +1125,6 @@ void vmx_update_debug_state(struct vcpu *v) { unsigned long mask; - ASSERT(v == current); - mask = 1u << TRAP_int3; if ( !cpu_has_monitor_trap_flag ) mask |= 1u << TRAP_debug; @@ -1135,7 +1133,10 @@ void vmx_update_debug_state(struct vcpu *v) v->arch.hvm_vmx.exception_bitmap |= mask; else v->arch.hvm_vmx.exception_bitmap &= ~mask; + + vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); + vmx_vmcs_exit(v); } static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41V-0000Zr-Jw; Thu, 14 Nov 2013 21:00:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41U-0000Zj-Oh for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:20 +0000 Received: from [193.109.254.147:29855] by server-6.bemta-14.messagelabs.com id D6/8C-19621-3E935825; Thu, 14 Nov 2013 21:00:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384462818!2865773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15356 invoked from network); 14 Nov 2013 21:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41S-0007L7-0A for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41R-0008Ul-TZ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:17 +0000 Date: Thu, 14 Nov 2013 21:00:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: move temporary grant table mapping to end of 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: multipart/mixed; boundary="===============5354411817635827524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5354411817635827524== Content-Type: text/plain commit db062c28f30eb68d1b5d7a910445a0ba1136179a Author: Roger Pau Monné AuthorDate: Wed Nov 13 09:26:13 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:26:13 2013 +0100 libxc: move temporary grant table mapping to end of memory In order to set up the grant table for HVM guests, libxc needs to map the grant table temporarily. At the moment, it does this by adding the grant page to the HVM guest's p2m table in the MMIO hole (at gfn 0xFFFFE), then mapping that gfn, setting up the table, then unmapping the gfn and removing it from the p2m table. This breaks with PVH guests with 4G or more of ram, because there is no MMIO hole; so it ends up clobbering a valid RAM p2m entry, then leaving a "hole" when it removes the grant map from the p2m table. Since the guest thinks this is normal ram, when it maps it and tries to access the page, it crashes. This patch maps the page at max_gfn+1 instead. Signed-off-by: Roger Pau Monné Acked-by: Tim Deegan Acked-by: Ian Campbell Acked-by: Keir Fraser Acked-by: Eddie Dong --- tools/libxc/xc_dom.h | 3 --- tools/libxc/xc_dom_boot.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 86e23ee..935b49e 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -18,9 +18,6 @@ #define INVALID_P2M_ENTRY ((xen_pfn_t)-1) -/* Scrach PFN for temporary mappings in HVM */ -#define SCRATCH_PFN_GNTTAB 0xFFFFE - /* --- typedefs and structs ---------------------------------------- */ typedef uint64_t xen_vaddr_t; diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index 71e1897..fdfeaf8 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -361,17 +361,27 @@ int xc_dom_gnttab_hvm_seed(xc_interface *xch, domid_t domid, domid_t xenstore_domid) { int rc; + xen_pfn_t max_gfn; struct xen_add_to_physmap xatp = { .domid = domid, .space = XENMAPSPACE_grant_table, .idx = 0, - .gpfn = SCRATCH_PFN_GNTTAB }; struct xen_remove_from_physmap xrfp = { .domid = domid, - .gpfn = SCRATCH_PFN_GNTTAB }; + max_gfn = xc_domain_maximum_gpfn(xch, domid); + if ( max_gfn <= 0 ) { + xc_dom_panic(xch, XC_INTERNAL_ERROR, + "%s: failed to get max gfn " + "[errno=%d]\n", + __FUNCTION__, errno); + return -1; + } + xatp.gpfn = max_gfn + 1; + xrfp.gpfn = max_gfn + 1; + rc = do_memory_op(xch, XENMEM_add_to_physmap, &xatp, sizeof(xatp)); if ( rc != 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5354411817635827524== 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 --===============5354411817635827524==-- From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41V-0000Zr-Jw; Thu, 14 Nov 2013 21:00:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41U-0000Zj-Oh for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:20 +0000 Received: from [193.109.254.147:29855] by server-6.bemta-14.messagelabs.com id D6/8C-19621-3E935825; Thu, 14 Nov 2013 21:00:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384462818!2865773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15356 invoked from network); 14 Nov 2013 21:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41S-0007L7-0A for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41R-0008Ul-TZ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:17 +0000 Date: Thu, 14 Nov 2013 21:00:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: move temporary grant table mapping to end of 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: multipart/mixed; boundary="===============5354411817635827524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5354411817635827524== Content-Type: text/plain commit db062c28f30eb68d1b5d7a910445a0ba1136179a Author: Roger Pau Monné AuthorDate: Wed Nov 13 09:26:13 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:26:13 2013 +0100 libxc: move temporary grant table mapping to end of memory In order to set up the grant table for HVM guests, libxc needs to map the grant table temporarily. At the moment, it does this by adding the grant page to the HVM guest's p2m table in the MMIO hole (at gfn 0xFFFFE), then mapping that gfn, setting up the table, then unmapping the gfn and removing it from the p2m table. This breaks with PVH guests with 4G or more of ram, because there is no MMIO hole; so it ends up clobbering a valid RAM p2m entry, then leaving a "hole" when it removes the grant map from the p2m table. Since the guest thinks this is normal ram, when it maps it and tries to access the page, it crashes. This patch maps the page at max_gfn+1 instead. Signed-off-by: Roger Pau Monné Acked-by: Tim Deegan Acked-by: Ian Campbell Acked-by: Keir Fraser Acked-by: Eddie Dong --- tools/libxc/xc_dom.h | 3 --- tools/libxc/xc_dom_boot.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 86e23ee..935b49e 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -18,9 +18,6 @@ #define INVALID_P2M_ENTRY ((xen_pfn_t)-1) -/* Scrach PFN for temporary mappings in HVM */ -#define SCRATCH_PFN_GNTTAB 0xFFFFE - /* --- typedefs and structs ---------------------------------------- */ typedef uint64_t xen_vaddr_t; diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index 71e1897..fdfeaf8 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -361,17 +361,27 @@ int xc_dom_gnttab_hvm_seed(xc_interface *xch, domid_t domid, domid_t xenstore_domid) { int rc; + xen_pfn_t max_gfn; struct xen_add_to_physmap xatp = { .domid = domid, .space = XENMAPSPACE_grant_table, .idx = 0, - .gpfn = SCRATCH_PFN_GNTTAB }; struct xen_remove_from_physmap xrfp = { .domid = domid, - .gpfn = SCRATCH_PFN_GNTTAB }; + max_gfn = xc_domain_maximum_gpfn(xch, domid); + if ( max_gfn <= 0 ) { + xc_dom_panic(xch, XC_INTERNAL_ERROR, + "%s: failed to get max gfn " + "[errno=%d]\n", + __FUNCTION__, errno); + return -1; + } + xatp.gpfn = max_gfn + 1; + xrfp.gpfn = max_gfn + 1; + rc = do_memory_op(xch, XENMEM_add_to_physmap, &xatp, sizeof(xatp)); if ( rc != 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5354411817635827524== 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 --===============5354411817635827524==-- From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00: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 1Vh41g-0000at-VZ; Thu, 14 Nov 2013 21:00:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41f-0000al-S9 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:32 +0000 Received: from [193.109.254.147:32562] by server-8.bemta-14.messagelabs.com id 7A/92-03701-FE935825; Thu, 14 Nov 2013 21:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384462829!2825875!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20099 invoked from network); 14 Nov 2013 21:00:30 -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; 14 Nov 2013 21:00:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41c-0007LI-VB for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41c-0008V7-4h for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:28 +0000 Date: Thu, 14 Nov 2013 21:00:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh prep: code motion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 033331ea3c0a510ab682697d0eef9d69e35c80ec Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:26:38 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:26:38 2013 +0100 pvh prep: code motion There are many functions where PVH requires some code in common with HVM. Rearrange some of these functions so that the code is together. In general, the HVM code that PVH also uses includes: - cacheattr functionality - paging - hvm_funcs - hvm_assert_evtchn_irq tasklet - tm_list - hvm_params And code that PVH shares with PV but not with PVH: - updating the domain wallclock - setting v->is_initialized There should be no end-to-end changes in behavior. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 89 +++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 36699b8..e7862bc 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -525,11 +525,17 @@ int hvm_domain_initialise(struct domain *d) INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); + hvm_init_cacheattr_region_list(d); + + rc = paging_enable(d, PG_refcounts|PG_translate|PG_external); + if ( rc != 0 ) + goto fail0; + 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.params || !d->arch.hvm_domain.io_handler ) - goto fail0; + goto fail1; d->arch.hvm_domain.io_handler->num_slot = 0; hvm_init_guest_time(d); @@ -537,12 +543,6 @@ int hvm_domain_initialise(struct domain *d) d->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] = 1; d->arch.hvm_domain.params[HVM_PARAM_TRIPLE_FAULT_REASON] = SHUTDOWN_reboot; - hvm_init_cacheattr_region_list(d); - - rc = paging_enable(d, PG_refcounts|PG_translate|PG_external); - if ( rc != 0 ) - goto fail1; - vpic_init(d); rc = vioapic_init(d); @@ -569,10 +569,10 @@ int hvm_domain_initialise(struct domain *d) stdvga_deinit(d); vioapic_deinit(d); fail1: - hvm_destroy_cacheattr_region_list(d); - fail0: xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); + fail0: + hvm_destroy_cacheattr_region_list(d); return rc; } @@ -601,11 +601,11 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + hvm_destroy_cacheattr_region_list(d); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); vioapic_deinit(d); - hvm_destroy_cacheattr_region_list(d); } static int hvm_save_tsc_adjust(struct domain *d, hvm_domain_context_t *h) @@ -1091,24 +1091,47 @@ int hvm_vcpu_initialise(struct vcpu *v) { int rc; struct domain *d = v->domain; - domid_t dm_domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; + domid_t dm_domid; hvm_asid_flush_vcpu(v); - if ( (rc = vlapic_init(v)) != 0 ) + spin_lock_init(&v->arch.hvm_vcpu.tm_lock); + INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list); + + rc = hvm_vcpu_cacheattr_init(v); /* teardown: vcpu_cacheattr_destroy */ + if ( rc != 0 ) goto fail1; - if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) + /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ + if ( (rc = vlapic_init(v)) != 0 ) /* teardown: vlapic_destroy */ goto fail2; - if ( nestedhvm_enabled(d) - && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) + if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) /* teardown: hvm_funcs.vcpu_destroy */ goto fail3; + softirq_tasklet_init( + &v->arch.hvm_vcpu.assert_evtchn_irq_tasklet, + (void(*)(unsigned long))hvm_assert_evtchn_irq, + (unsigned long)v); + + v->arch.user_regs.eflags = 2; + + v->arch.hvm_vcpu.inject_trap.vector = -1; + + rc = setup_compat_arg_xlat(v); /* teardown: free_compat_arg_xlat() */ + if ( rc != 0 ) + goto fail4; + + if ( nestedhvm_enabled(d) + && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) /* teardown: nestedhvm_vcpu_destroy */ + goto fail5; + + dm_domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; + /* Create ioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); + rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); /* teardown: none */ if ( rc < 0 ) - goto fail4; + goto fail6; /* Register ioreq event channel. */ v->arch.hvm_vcpu.xen_port = rc; @@ -1116,9 +1139,9 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( v->vcpu_id == 0 ) { /* Create bufioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); + rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); /* teardown: none */ if ( rc < 0 ) - goto fail4; + goto fail6; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } @@ -1127,26 +1150,6 @@ int hvm_vcpu_initialise(struct vcpu *v) get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port; spin_unlock(&d->arch.hvm_domain.ioreq.lock); - spin_lock_init(&v->arch.hvm_vcpu.tm_lock); - INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list); - - v->arch.hvm_vcpu.inject_trap.vector = -1; - - rc = setup_compat_arg_xlat(v); - if ( rc != 0 ) - goto fail4; - - rc = hvm_vcpu_cacheattr_init(v); - if ( rc != 0 ) - goto fail5; - - softirq_tasklet_init( - &v->arch.hvm_vcpu.assert_evtchn_irq_tasklet, - (void(*)(unsigned long))hvm_assert_evtchn_irq, - (unsigned long)v); - - v->arch.user_regs.eflags = 2; - if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ @@ -1164,14 +1167,16 @@ int hvm_vcpu_initialise(struct vcpu *v) return 0; + fail6: + nestedhvm_vcpu_destroy(v); fail5: free_compat_arg_xlat(v); fail4: - nestedhvm_vcpu_destroy(v); - fail3: hvm_funcs.vcpu_destroy(v); - fail2: + fail3: vlapic_destroy(v); + fail2: + hvm_vcpu_cacheattr_destroy(v); fail1: 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 Thu Nov 14 21:00:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00: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 1Vh41g-0000at-VZ; Thu, 14 Nov 2013 21:00:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41f-0000al-S9 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:32 +0000 Received: from [193.109.254.147:32562] by server-8.bemta-14.messagelabs.com id 7A/92-03701-FE935825; Thu, 14 Nov 2013 21:00:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384462829!2825875!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20099 invoked from network); 14 Nov 2013 21:00:30 -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; 14 Nov 2013 21:00:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41c-0007LI-VB for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41c-0008V7-4h for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:28 +0000 Date: Thu, 14 Nov 2013 21:00:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh prep: code motion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 033331ea3c0a510ab682697d0eef9d69e35c80ec Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:26:38 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:26:38 2013 +0100 pvh prep: code motion There are many functions where PVH requires some code in common with HVM. Rearrange some of these functions so that the code is together. In general, the HVM code that PVH also uses includes: - cacheattr functionality - paging - hvm_funcs - hvm_assert_evtchn_irq tasklet - tm_list - hvm_params And code that PVH shares with PV but not with PVH: - updating the domain wallclock - setting v->is_initialized There should be no end-to-end changes in behavior. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 89 +++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 36699b8..e7862bc 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -525,11 +525,17 @@ int hvm_domain_initialise(struct domain *d) INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); + hvm_init_cacheattr_region_list(d); + + rc = paging_enable(d, PG_refcounts|PG_translate|PG_external); + if ( rc != 0 ) + goto fail0; + 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.params || !d->arch.hvm_domain.io_handler ) - goto fail0; + goto fail1; d->arch.hvm_domain.io_handler->num_slot = 0; hvm_init_guest_time(d); @@ -537,12 +543,6 @@ int hvm_domain_initialise(struct domain *d) d->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] = 1; d->arch.hvm_domain.params[HVM_PARAM_TRIPLE_FAULT_REASON] = SHUTDOWN_reboot; - hvm_init_cacheattr_region_list(d); - - rc = paging_enable(d, PG_refcounts|PG_translate|PG_external); - if ( rc != 0 ) - goto fail1; - vpic_init(d); rc = vioapic_init(d); @@ -569,10 +569,10 @@ int hvm_domain_initialise(struct domain *d) stdvga_deinit(d); vioapic_deinit(d); fail1: - hvm_destroy_cacheattr_region_list(d); - fail0: xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); + fail0: + hvm_destroy_cacheattr_region_list(d); return rc; } @@ -601,11 +601,11 @@ void hvm_domain_relinquish_resources(struct domain *d) void hvm_domain_destroy(struct domain *d) { + hvm_destroy_cacheattr_region_list(d); hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); vioapic_deinit(d); - hvm_destroy_cacheattr_region_list(d); } static int hvm_save_tsc_adjust(struct domain *d, hvm_domain_context_t *h) @@ -1091,24 +1091,47 @@ int hvm_vcpu_initialise(struct vcpu *v) { int rc; struct domain *d = v->domain; - domid_t dm_domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; + domid_t dm_domid; hvm_asid_flush_vcpu(v); - if ( (rc = vlapic_init(v)) != 0 ) + spin_lock_init(&v->arch.hvm_vcpu.tm_lock); + INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list); + + rc = hvm_vcpu_cacheattr_init(v); /* teardown: vcpu_cacheattr_destroy */ + if ( rc != 0 ) goto fail1; - if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) + /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ + if ( (rc = vlapic_init(v)) != 0 ) /* teardown: vlapic_destroy */ goto fail2; - if ( nestedhvm_enabled(d) - && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) + if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) /* teardown: hvm_funcs.vcpu_destroy */ goto fail3; + softirq_tasklet_init( + &v->arch.hvm_vcpu.assert_evtchn_irq_tasklet, + (void(*)(unsigned long))hvm_assert_evtchn_irq, + (unsigned long)v); + + v->arch.user_regs.eflags = 2; + + v->arch.hvm_vcpu.inject_trap.vector = -1; + + rc = setup_compat_arg_xlat(v); /* teardown: free_compat_arg_xlat() */ + if ( rc != 0 ) + goto fail4; + + if ( nestedhvm_enabled(d) + && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) /* teardown: nestedhvm_vcpu_destroy */ + goto fail5; + + dm_domid = d->arch.hvm_domain.params[HVM_PARAM_DM_DOMAIN]; + /* Create ioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); + rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); /* teardown: none */ if ( rc < 0 ) - goto fail4; + goto fail6; /* Register ioreq event channel. */ v->arch.hvm_vcpu.xen_port = rc; @@ -1116,9 +1139,9 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( v->vcpu_id == 0 ) { /* Create bufioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); + rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL); /* teardown: none */ if ( rc < 0 ) - goto fail4; + goto fail6; d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; } @@ -1127,26 +1150,6 @@ int hvm_vcpu_initialise(struct vcpu *v) get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port; spin_unlock(&d->arch.hvm_domain.ioreq.lock); - spin_lock_init(&v->arch.hvm_vcpu.tm_lock); - INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list); - - v->arch.hvm_vcpu.inject_trap.vector = -1; - - rc = setup_compat_arg_xlat(v); - if ( rc != 0 ) - goto fail4; - - rc = hvm_vcpu_cacheattr_init(v); - if ( rc != 0 ) - goto fail5; - - softirq_tasklet_init( - &v->arch.hvm_vcpu.assert_evtchn_irq_tasklet, - (void(*)(unsigned long))hvm_assert_evtchn_irq, - (unsigned long)v); - - v->arch.user_regs.eflags = 2; - if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ @@ -1164,14 +1167,16 @@ int hvm_vcpu_initialise(struct vcpu *v) return 0; + fail6: + nestedhvm_vcpu_destroy(v); fail5: free_compat_arg_xlat(v); fail4: - nestedhvm_vcpu_destroy(v); - fail3: hvm_funcs.vcpu_destroy(v); - fail2: + fail3: vlapic_destroy(v); + fail2: + hvm_vcpu_cacheattr_destroy(v); fail1: 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 Thu Nov 14 21:00:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41s-0000c3-BC; Thu, 14 Nov 2013 21: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 1Vh41q-0000bn-Kd for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:42 +0000 Received: from [193.109.254.147:30884] by server-15.bemta-14.messagelabs.com id 2A/2A-06807-9F935825; Thu, 14 Nov 2013 21:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384462839!2865833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17094 invoked from network); 14 Nov 2013 21:00:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41n-0007LO-Gp for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41n-0008VX-Fg for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:39 +0000 Date: Thu, 14 Nov 2013 21:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: tolerate HVM guests having no ioreq 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 68209bce0f551dcae991877ffd58211498bb0755 Author: George Dunlap AuthorDate: Wed Nov 13 09:29:02 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:29:02 2013 +0100 pvh: tolerate HVM guests having no ioreq page PVH guests don't have a backing device model emulator (qemu); just tolerate this situation explicitly, rather than special-casing PVH. For unhandled IO, hvmemul_do_io() will now return X86EMUL_OKAY, which is I believe what would be the effect if qemu didn't have a handler for the IO. This also fixes a potetial DoS in the host from the reworked series: If the guest makes a hypercall which sends an invalidate request, it would have crashed the host. Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/emulate.c | 32 +++++++++++++++++++++++++++----- xen/arch/x86/hvm/hvm.c | 11 ++++++++--- xen/arch/x86/hvm/io.c | 6 ++++-- xen/include/asm-x86/hvm/io.h | 2 +- xen/include/asm-x86/hvm/support.h | 3 +-- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f39c173..868aa1d 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -58,10 +58,23 @@ static int hvmemul_do_io( struct vcpu *curr = current; struct hvm_vcpu_io *vio; ioreq_t *p = get_ioreq(curr); + ioreq_t _ioreq; unsigned long ram_gfn = paddr_to_pfn(ram_gpa); p2m_type_t p2mt; struct page_info *ram_page; int rc; + bool_t has_dm = 1; + + /* + * Domains without a backing DM, don't have an ioreq page. Just + * point to a struct on the stack, initialising the state as needed. + */ + if ( !p ) + { + has_dm = 0; + p = &_ioreq; + p->state = STATE_IOREQ_NONE; + } /* Check for paged out page */ ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); @@ -211,7 +224,7 @@ static int hvmemul_do_io( p->state = STATE_IORESP_READY; if ( !vio->mmio_retry ) { - hvm_io_assist(); + hvm_io_assist(p); vio->io_state = HVMIO_none; } else @@ -219,11 +232,20 @@ static int hvmemul_do_io( vio->io_state = HVMIO_handle_mmio_awaiting_completion; break; case X86EMUL_UNHANDLEABLE: - rc = X86EMUL_RETRY; - if ( !hvm_send_assist_req(curr) ) - vio->io_state = HVMIO_none; - else if ( p_data == NULL ) + /* If there is no backing DM, just ignore accesses */ + if ( !has_dm ) + { rc = X86EMUL_OKAY; + vio->io_state = HVMIO_none; + } + else + { + rc = X86EMUL_RETRY; + if ( !hvm_send_assist_req(curr) ) + vio->io_state = HVMIO_none; + else if ( p_data == NULL ) + rc = X86EMUL_OKAY; + } break; default: BUG(); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e7862bc..f235a24 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -347,13 +347,15 @@ void hvm_do_resume(struct vcpu *v) check_wakeup_from_wait(); /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ - p = get_ioreq(v); + if ( !(p = get_ioreq(v)) ) + goto check_inject_trap; + while ( p->state != STATE_IOREQ_NONE ) { switch ( p->state ) { case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - hvm_io_assist(); + hvm_io_assist(p); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: @@ -368,6 +370,7 @@ void hvm_do_resume(struct vcpu *v) } } + check_inject_trap: /* Inject pending hw/sw trap */ if ( v->arch.hvm_vcpu.inject_trap.vector != -1 ) { @@ -1227,7 +1230,9 @@ bool_t hvm_send_assist_req(struct vcpu *v) if ( unlikely(!vcpu_start_shutdown_deferral(v)) ) return 0; /* implicitly bins the i/o operation */ - p = get_ioreq(v); + if ( !(p = get_ioreq(v)) ) + return 0; + if ( unlikely(p->state != STATE_IOREQ_NONE) ) { /* This indicates a bug in the device model. Crash the domain. */ diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index feb0406..deb7b92 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -152,6 +152,9 @@ void send_invalidate_req(void) struct vcpu *v = current; ioreq_t *p = get_ioreq(v); + if ( !p ) + return; + if ( p->state != STATE_IOREQ_NONE ) { gdprintk(XENLOG_ERR, "WARNING: send invalidate req with something " @@ -262,11 +265,10 @@ int handle_pio(uint16_t port, unsigned int size, int dir) return 1; } -void hvm_io_assist(void) +void hvm_io_assist(ioreq_t *p) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; - ioreq_t *p = get_ioreq(curr); enum hvm_io_state io_state; rmb(); /* see IORESP_READY /then/ read contents of ioreq */ diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index b0718b8..6f4cb96 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -121,7 +121,7 @@ int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_io_assist(void); +void hvm_io_assist(ioreq_t *p); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, union vioapic_redir_entry *ent); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 52aef1f..3529499 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -32,8 +32,7 @@ static inline ioreq_t *get_ioreq(struct vcpu *v) struct domain *d = v->domain; shared_iopage_t *p = d->arch.hvm_domain.ioreq.va; ASSERT((v == current) || spin_is_locked(&d->arch.hvm_domain.ioreq.lock)); - ASSERT(d->arch.hvm_domain.ioreq.va != NULL); - return &p->vcpu_ioreq[v->vcpu_id]; + return p ? &p->vcpu_ioreq[v->vcpu_id] : NULL; } #define HVM_DELIVER_NO_ERROR_CODE -1 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41s-0000c3-BC; Thu, 14 Nov 2013 21: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 1Vh41q-0000bn-Kd for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:42 +0000 Received: from [193.109.254.147:30884] by server-15.bemta-14.messagelabs.com id 2A/2A-06807-9F935825; Thu, 14 Nov 2013 21:00:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1384462839!2865833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17094 invoked from network); 14 Nov 2013 21:00:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:00:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41n-0007LO-Gp for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41n-0008VX-Fg for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:39 +0000 Date: Thu, 14 Nov 2013 21:00:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: tolerate HVM guests having no ioreq 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 68209bce0f551dcae991877ffd58211498bb0755 Author: George Dunlap AuthorDate: Wed Nov 13 09:29:02 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:29:02 2013 +0100 pvh: tolerate HVM guests having no ioreq page PVH guests don't have a backing device model emulator (qemu); just tolerate this situation explicitly, rather than special-casing PVH. For unhandled IO, hvmemul_do_io() will now return X86EMUL_OKAY, which is I believe what would be the effect if qemu didn't have a handler for the IO. This also fixes a potetial DoS in the host from the reworked series: If the guest makes a hypercall which sends an invalidate request, it would have crashed the host. Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/emulate.c | 32 +++++++++++++++++++++++++++----- xen/arch/x86/hvm/hvm.c | 11 ++++++++--- xen/arch/x86/hvm/io.c | 6 ++++-- xen/include/asm-x86/hvm/io.h | 2 +- xen/include/asm-x86/hvm/support.h | 3 +-- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f39c173..868aa1d 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -58,10 +58,23 @@ static int hvmemul_do_io( struct vcpu *curr = current; struct hvm_vcpu_io *vio; ioreq_t *p = get_ioreq(curr); + ioreq_t _ioreq; unsigned long ram_gfn = paddr_to_pfn(ram_gpa); p2m_type_t p2mt; struct page_info *ram_page; int rc; + bool_t has_dm = 1; + + /* + * Domains without a backing DM, don't have an ioreq page. Just + * point to a struct on the stack, initialising the state as needed. + */ + if ( !p ) + { + has_dm = 0; + p = &_ioreq; + p->state = STATE_IOREQ_NONE; + } /* Check for paged out page */ ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); @@ -211,7 +224,7 @@ static int hvmemul_do_io( p->state = STATE_IORESP_READY; if ( !vio->mmio_retry ) { - hvm_io_assist(); + hvm_io_assist(p); vio->io_state = HVMIO_none; } else @@ -219,11 +232,20 @@ static int hvmemul_do_io( vio->io_state = HVMIO_handle_mmio_awaiting_completion; break; case X86EMUL_UNHANDLEABLE: - rc = X86EMUL_RETRY; - if ( !hvm_send_assist_req(curr) ) - vio->io_state = HVMIO_none; - else if ( p_data == NULL ) + /* If there is no backing DM, just ignore accesses */ + if ( !has_dm ) + { rc = X86EMUL_OKAY; + vio->io_state = HVMIO_none; + } + else + { + rc = X86EMUL_RETRY; + if ( !hvm_send_assist_req(curr) ) + vio->io_state = HVMIO_none; + else if ( p_data == NULL ) + rc = X86EMUL_OKAY; + } break; default: BUG(); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e7862bc..f235a24 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -347,13 +347,15 @@ void hvm_do_resume(struct vcpu *v) check_wakeup_from_wait(); /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ - p = get_ioreq(v); + if ( !(p = get_ioreq(v)) ) + goto check_inject_trap; + while ( p->state != STATE_IOREQ_NONE ) { switch ( p->state ) { case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - hvm_io_assist(); + hvm_io_assist(p); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: @@ -368,6 +370,7 @@ void hvm_do_resume(struct vcpu *v) } } + check_inject_trap: /* Inject pending hw/sw trap */ if ( v->arch.hvm_vcpu.inject_trap.vector != -1 ) { @@ -1227,7 +1230,9 @@ bool_t hvm_send_assist_req(struct vcpu *v) if ( unlikely(!vcpu_start_shutdown_deferral(v)) ) return 0; /* implicitly bins the i/o operation */ - p = get_ioreq(v); + if ( !(p = get_ioreq(v)) ) + return 0; + if ( unlikely(p->state != STATE_IOREQ_NONE) ) { /* This indicates a bug in the device model. Crash the domain. */ diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index feb0406..deb7b92 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -152,6 +152,9 @@ void send_invalidate_req(void) struct vcpu *v = current; ioreq_t *p = get_ioreq(v); + if ( !p ) + return; + if ( p->state != STATE_IOREQ_NONE ) { gdprintk(XENLOG_ERR, "WARNING: send invalidate req with something " @@ -262,11 +265,10 @@ int handle_pio(uint16_t port, unsigned int size, int dir) return 1; } -void hvm_io_assist(void) +void hvm_io_assist(ioreq_t *p) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; - ioreq_t *p = get_ioreq(curr); enum hvm_io_state io_state; rmb(); /* see IORESP_READY /then/ read contents of ioreq */ diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index b0718b8..6f4cb96 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -121,7 +121,7 @@ int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_io_assist(void); +void hvm_io_assist(ioreq_t *p); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, union vioapic_redir_entry *ent); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 52aef1f..3529499 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -32,8 +32,7 @@ static inline ioreq_t *get_ioreq(struct vcpu *v) struct domain *d = v->domain; shared_iopage_t *p = d->arch.hvm_domain.ioreq.va; ASSERT((v == current) || spin_is_locked(&d->arch.hvm_domain.ioreq.lock)); - ASSERT(d->arch.hvm_domain.ioreq.va != NULL); - return &p->vcpu_ioreq[v->vcpu_id]; + return p ? &p->vcpu_ioreq[v->vcpu_id] : NULL; } #define HVM_DELIVER_NO_ERROR_CODE -1 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh424-0000de-Ef; Thu, 14 Nov 2013 21:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh422-0000dG-8P for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:54 +0000 Received: from [85.158.139.211:34485] by server-6.bemta-5.messagelabs.com id 9D/A1-04949-50A35825; Thu, 14 Nov 2013 21:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1384462850!2074500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.0 required=7.0 tests=BODY_DONG,BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4212 invoked from network); 14 Nov 2013 21:00:51 -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; 14 Nov 2013 21:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41y-0007LX-9w for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41y-0008Vw-6n for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:50 +0000 Date: Thu, 14 Nov 2013 21:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh prep: introduce pv guest type and has_hvm_container macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c6492780eac70db6c0b9e3a6a485052db574553 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:30:09 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:30:09 2013 +0100 pvh prep: introduce pv guest type and has_hvm_container macros The goal of this patch is to classify conditionals more clearly, as to whether they relate to pv guests, hvm-only guests, or guests with an "hvm container" (which will eventually include PVH). This patch introduces an enum for guest type, as well as two new macros for switching behavior on and off: is_pv_* and has_hvm_container_*. At the moment is_pv_* <=> !has_hvm_container_*. The purpose of having two is that it seems to me different to take a path because something does *not* have PV structures as to take a path because it *does* have HVM structures, even if the two happen to coincide 100% at the moment. The exact usage is occasionally a bit fuzzy though, and a judgement call just needs to be made on which is clearer. In general, a switch should use is_pv_* (or !is_pv_*) if the code in question relates directly to a PV guest. Examples include use of pv_vcpu structs or other behavior directly related to PV domains. hvm_container is more of a fuzzy concept, but in general: * Most core HVM behavior will be included in this. Behavior not appropriate for PVH mode will be disabled in later patches * Hypercalls related to HVM guests will *not* be included by default; functionality needed by PVH guests will be enabled in future patches * The following functionality are not considered part of the HVM container, and PVH will end up behaving like PV by default: Event channel, vtsc offset, code related to emulated timers, nested HVM, emuirq, PoD * Some features are left to implement for PVH later: vpmu, shadow mode Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/acpi/suspend.c | 2 +- xen/arch/x86/cpu/mcheck/vmce.c | 6 ++-- xen/arch/x86/debug.c | 2 +- xen/arch/x86/domain.c | 54 ++++++++++++++++++------------------ xen/arch/x86/domain_page.c | 10 +++--- xen/arch/x86/domctl.c | 10 +++--- xen/arch/x86/efi/runtime.c | 4 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 +- xen/arch/x86/mm.c | 6 ++-- xen/arch/x86/mm/shadow/common.c | 6 ++-- xen/arch/x86/mm/shadow/multi.c | 4 +- xen/arch/x86/physdev.c | 4 +- xen/arch/x86/traps.c | 5 ++- xen/arch/x86/x86_64/mm.c | 2 +- xen/arch/x86/x86_64/traps.c | 8 ++-- xen/common/domain.c | 2 +- xen/common/grant_table.c | 4 +- xen/common/kernel.c | 2 +- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/event.h | 2 +- xen/include/asm-x86/guest_access.h | 12 ++++---- xen/include/asm-x86/guest_pt.h | 4 +- xen/include/xen/sched.h | 14 +++++++-- xen/include/xen/tmem_xen.h | 2 +- 24 files changed, 90 insertions(+), 81 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index 6fdd876..1718930 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -85,7 +85,7 @@ void restore_rest_processor_state(void) BUG(); /* Maybe load the debug registers. */ - BUG_ON(is_hvm_vcpu(curr)); + BUG_ON(!is_pv_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) { write_debugreg(0, curr->arch.debugreg[0]); diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index af3b491..f6c35db 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -83,7 +83,7 @@ int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", - is_hvm_vcpu(v) ? "HVM" : "PV", ctxt->caps, + has_hvm_container_vcpu(v) ? "HVM" : "PV", ctxt->caps, v->domain->domain_id, v->vcpu_id, guest_mcg_cap & ~MCG_CAP_COUNT); return -EPERM; @@ -357,7 +357,7 @@ int inject_vmce(struct domain *d, int vcpu) if ( vcpu != VMCE_INJECT_BROADCAST && vcpu != v->vcpu_id ) continue; - if ( (is_hvm_domain(d) || + if ( (has_hvm_container_domain(d) || guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { @@ -439,7 +439,7 @@ int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn) if (!mfn_valid(mfn_x(mfn))) return -EINVAL; - if ( !is_hvm_domain(d) || !paging_mode_hap(d) ) + if ( !has_hvm_container_domain(d) || !paging_mode_hap(d) ) return -ENOSYS; rc = -1; diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index e67473e..3e21ca8 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -158,7 +158,7 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, pagecnt = min_t(long, PAGE_SIZE - (addr & ~PAGE_MASK), len); - mfn = (dp->is_hvm + mfn = (has_hvm_container_domain(dp) ? dbg_hvm_va2mfn(addr, dp, toaddr, &gfn) : dbg_pv_va2mfn(addr, dp, pgd3)); if ( mfn == INVALID_MFN ) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b67fcb8..358616c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -167,7 +167,7 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) p2m_pod_dump_data(d); spin_lock(&d->page_alloc_lock); @@ -385,7 +385,7 @@ int vcpu_initialise(struct vcpu *v) vmce_init_vcpu(v); - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { rc = hvm_vcpu_initialise(v); goto done; @@ -438,7 +438,7 @@ int vcpu_initialise(struct vcpu *v) { vcpu_destroy_fpu(v); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) xfree(v->arch.pv_vcpu.trap_ctxt); } @@ -452,7 +452,7 @@ void vcpu_destroy(struct vcpu *v) vcpu_destroy_fpu(v); - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) hvm_vcpu_destroy(v); else xfree(v->arch.pv_vcpu.trap_ctxt); @@ -464,7 +464,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int rc = -ENOMEM; d->arch.hvm_domain.hap_enabled = - is_hvm_domain(d) && + has_hvm_container_domain(d) && hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); d->arch.hvm_domain.mem_sharing_enabled = 0; @@ -490,7 +490,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) d->domain_id); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); else if ( is_idle_domain(d) ) rc = 0; @@ -512,7 +512,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) mapcache_domain_init(d); HYPERVISOR_COMPAT_VIRT_START(d) = - is_hvm_domain(d) ? ~0u : __HYPERVISOR_COMPAT_VIRT_START; + is_pv_domain(d) ? __HYPERVISOR_COMPAT_VIRT_START : ~0u; if ( (rc = paging_domain_init(d, domcr_flags)) != 0 ) goto fail; @@ -554,7 +554,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) goto fail; } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { if ( (rc = hvm_domain_initialise(d)) != 0 ) { @@ -583,14 +583,14 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( paging_initialised ) paging_final_teardown(d); free_perdomain_mappings(d); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); return rc; } void arch_domain_destroy(struct domain *d) { - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); else xfree(d->arch.pv_domain.e820); @@ -602,7 +602,7 @@ void arch_domain_destroy(struct domain *d) paging_final_teardown(d); free_perdomain_mappings(d); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); free_xenheap_page(d->shared_info); @@ -653,7 +653,7 @@ int arch_set_info_guest( #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { if ( !compat ) { @@ -698,7 +698,7 @@ int arch_set_info_guest( v->fpu_initialised = !!(flags & VGCF_I387_VALID); v->arch.flags &= ~TF_kernel_mode; - if ( (flags & VGCF_in_kernel) || is_hvm_vcpu(v)/*???*/ ) + if ( (flags & VGCF_in_kernel) || has_hvm_container_vcpu(v)/*???*/ ) v->arch.flags |= TF_kernel_mode; v->arch.vgc_flags = flags; @@ -713,7 +713,7 @@ int arch_set_info_guest( if ( !compat ) { memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) memcpy(v->arch.pv_vcpu.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -729,7 +729,7 @@ int arch_set_info_guest( v->arch.user_regs.eflags |= 2; - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) { hvm_set_info_guest(v); goto out; @@ -959,7 +959,7 @@ int arch_set_info_guest( int arch_vcpu_reset(struct vcpu *v) { - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { destroy_gdt(v); return vcpu_destroy_pagetables(v); @@ -1309,7 +1309,7 @@ static void update_runstate_area(struct vcpu *v) static inline int need_full_gdt(struct vcpu *v) { - return (!is_hvm_vcpu(v) && !is_idle_vcpu(v)); + return (is_pv_vcpu(v) && !is_idle_vcpu(v)); } static void __context_switch(void) @@ -1435,9 +1435,9 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { __context_switch(); - if ( !is_hvm_vcpu(next) && + if ( is_pv_vcpu(next) && (is_idle_vcpu(prev) || - is_hvm_vcpu(prev) || + has_hvm_container_vcpu(prev) || is_pv_32on64_vcpu(prev) != is_pv_32on64_vcpu(next)) ) { uint64_t efer = read_efer(); @@ -1448,13 +1448,13 @@ void context_switch(struct vcpu *prev, struct vcpu *next) /* Re-enable interrupts before restoring state which may fault. */ local_irq_enable(); - if ( !is_hvm_vcpu(next) ) + if ( is_pv_vcpu(next) ) { load_LDT(next); load_segments(next); } - set_cpuid_faulting(!is_hvm_vcpu(next) && + set_cpuid_faulting(is_pv_vcpu(next) && (next->domain->domain_id != 0)); } @@ -1537,7 +1537,7 @@ void hypercall_cancel_continuation(void) } else { - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) regs->eip += 2; /* skip re-execute 'syscall' / 'int $xx' */ else current->arch.hvm_vcpu.hcall_preempted = 0; @@ -1574,12 +1574,12 @@ unsigned long hypercall_create_continuation( regs->eax = op; /* Ensure the hypercall trap instruction is re-executed. */ - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) regs->eip -= 2; /* re-execute 'syscall' / 'int $xx' */ else current->arch.hvm_vcpu.hcall_preempted = 1; - if ( !is_hvm_vcpu(current) ? + if ( is_pv_vcpu(current) ? !is_pv_32on64_vcpu(current) : (hvm_guest_x86_mode(current) == 8) ) { @@ -1851,7 +1851,7 @@ int domain_relinquish_resources(struct domain *d) return ret; } - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { for_each_vcpu ( d, v ) { @@ -1924,7 +1924,7 @@ int domain_relinquish_resources(struct domain *d) BUG(); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_domain_relinquish_resources(d); return 0; @@ -2008,7 +2008,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) hvm_assert_evtchn_irq(v); else vcpu_kick(v); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index bc18263..3903952 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -35,7 +35,7 @@ static inline struct vcpu *mapcache_current_vcpu(void) * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ - if ( unlikely(pagetable_is_null(v->arch.guest_table)) && !is_hvm_vcpu(v) ) + if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) @@ -72,7 +72,7 @@ void *map_domain_page(unsigned long mfn) #endif v = mapcache_current_vcpu(); - if ( !v || is_hvm_vcpu(v) ) + if ( !v || !is_pv_vcpu(v) ) return mfn_to_virt(mfn); dcache = &v->domain->arch.pv_domain.mapcache; @@ -177,7 +177,7 @@ void unmap_domain_page(const void *ptr) ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END); v = mapcache_current_vcpu(); - ASSERT(v && !is_hvm_vcpu(v)); + ASSERT(v && is_pv_vcpu(v)); dcache = &v->domain->arch.pv_domain.mapcache; ASSERT(dcache->inuse); @@ -244,7 +244,7 @@ int mapcache_domain_init(struct domain *d) struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; unsigned int bitmap_pages; - if ( is_hvm_domain(d) || is_idle_domain(d) ) + if ( !is_pv_domain(d) || is_idle_domain(d) ) return 0; #ifdef NDEBUG @@ -275,7 +275,7 @@ int mapcache_vcpu_init(struct vcpu *v) unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); - if ( is_hvm_vcpu(v) || !dcache->inuse ) + if ( !is_pv_vcpu(v) || !dcache->inuse ) return 0; if ( ents > dcache->entries ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e75918a..f7e4586 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -800,7 +800,7 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { evc->size = sizeof(*evc); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { evc->sysenter_callback_cs = v->arch.pv_vcpu.sysenter_callback_cs; @@ -833,7 +833,7 @@ long arch_do_domctl( ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) goto ext_vcpucontext_out; - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) @@ -1246,7 +1246,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) bool_t compat = is_pv_32on64_domain(v->domain); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) - if ( is_hvm_vcpu(v) ) + if ( !is_pv_vcpu(v) ) memset(c.nat, 0, sizeof(*c.nat)); memcpy(&c.nat->fpu_ctxt, v->arch.fpu_ctxt, sizeof(c.nat->fpu_ctxt)); c(flags = v->arch.vgc_flags & ~(VGCF_i387_valid|VGCF_in_kernel)); @@ -1257,7 +1257,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) if ( !compat ) { memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) memcpy(c.nat->trap_ctxt, v->arch.pv_vcpu.trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -1272,7 +1272,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) c(debugreg[i] = v->arch.debugreg[i]); - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) { struct segment_register sreg; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 37bb535..d7c884b 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -52,7 +52,7 @@ unsigned long efi_rs_enter(void) /* prevent fixup_page_fault() from doing anything */ irq_enter(); - if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) + if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { struct desc_ptr gdt_desc = { .limit = LAST_RESERVED_GDT_BYTE, @@ -71,7 +71,7 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { write_cr3(cr3); - if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) + if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { struct desc_ptr gdt_desc = { .limit = LAST_RESERVED_GDT_BYTE, diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 19650ce..2f7c238 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -659,7 +659,7 @@ void vmx_vmcs_exit(struct vcpu *v) { /* Don't confuse vmx_do_resume (for @v or @current!) */ vmx_clear_vmcs(v); - if ( is_hvm_vcpu(current) ) + if ( has_hvm_container_vcpu(current) ) vmx_load_vmcs(current); spin_unlock(&v->arch.hvm_vmx.vmcs_lock); @@ -1488,7 +1488,7 @@ static void vmcs_dump(unsigned char ch) for_each_domain ( d ) { - if ( !is_hvm_domain(d) ) + if ( !has_hvm_container_domain(d) ) continue; printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 43aaceb..9621e22 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -181,7 +181,7 @@ static uint32_t base_disallow_mask; (rangeset_is_empty((d)->iomem_caps) && \ rangeset_is_empty((d)->arch.ioport_caps) && \ !has_arch_pdevs(d) && \ - !is_hvm_domain(d)) ? \ + is_pv_domain(d)) ? \ L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS)) static void __init init_frametable_chunk(void *start, void *end) @@ -433,7 +433,7 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) unsigned long domain_get_maximum_gpfn(struct domain *d) { - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ return (arch_get_max_pfn(d) ?: 1) - 1; @@ -2381,7 +2381,7 @@ static int __get_page_type(struct page_info *page, unsigned long type, { /* Special pages should not be accessible from devices. */ struct domain *d = page_get_owner(page); - if ( d && !is_hvm_domain(d) && unlikely(need_iommu(d)) ) + if ( d && is_pv_domain(d) && unlikely(need_iommu(d)) ) { if ( (x & PGT_type_mask) == PGT_writable_page ) iommu_unmap_page(d, mfn_to_gmfn(d, page_to_mfn(page))); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index adffa06..0bfa595 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -367,7 +367,7 @@ const struct x86_emulate_ops *shadow_init_emulation( sh_ctxt->ctxt.regs = regs; sh_ctxt->ctxt.force_writeback = 0; - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { sh_ctxt->ctxt.addr_size = sh_ctxt->ctxt.sp_size = BITS_PER_LONG; return &pv_shadow_emulator_ops; @@ -964,7 +964,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) if ( pg->shadow_flags & ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) - || !is_hvm_domain(v->domain) + || is_pv_domain(v->domain) || !v->domain->arch.paging.shadow.oos_active ) return 0; @@ -2753,7 +2753,7 @@ static void sh_update_paging_modes(struct vcpu *v) if ( v->arch.paging.mode ) v->arch.paging.mode->shadow.detach_old_tables(v); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { /// /// PV guest diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3fed0b6..3d35537 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -712,7 +712,7 @@ _sh_propagate(struct vcpu *v, // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) - && !is_hvm_domain(d) ) + && is_pv_domain(d) ) { sflags |= _PAGE_USER; } @@ -3922,7 +3922,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) #endif /* Don't do anything on an uninitialised vcpu */ - if ( !is_hvm_domain(d) && !v->is_initialised ) + if ( is_pv_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); return; diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 4835ed7..dab6213 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -310,10 +310,10 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) spin_unlock(&v->domain->event_lock); break; } - if ( !is_hvm_domain(v->domain) && + if ( is_pv_domain(v->domain) && v->domain->arch.pv_domain.auto_unmask ) evtchn_unmask(pirq->evtchn); - if ( !is_hvm_domain(v->domain) || + if ( is_pv_domain(v->domain) || domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) pirq_guest_eoi(pirq); if ( is_hvm_domain(v->domain) && diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0e3c6e3..26ae722 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -120,6 +120,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) return; @@ -547,7 +548,7 @@ static inline void do_trap( } if ( ((trapnr == TRAP_copro_error) || (trapnr == TRAP_simd_error)) && - is_hvm_vcpu(curr) && curr->arch.hvm_vcpu.fpu_exception_callback ) + has_hvm_container_vcpu(curr) && curr->arch.hvm_vcpu.fpu_exception_callback ) { curr->arch.hvm_vcpu.fpu_exception_callback( curr->arch.hvm_vcpu.fpu_exception_callback_arg, regs); @@ -702,7 +703,7 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, *ebx = 0x40000200; *ecx = 0; /* Features 1 */ *edx = 0; /* Features 2 */ - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) *ecx |= XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD; break; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 2bdbad0..4a3b3f1 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -73,7 +73,7 @@ void *do_page_walk(struct vcpu *v, unsigned long addr) l2_pgentry_t l2e, *l2t; l1_pgentry_t l1e, *l1t; - if ( is_hvm_vcpu(v) || !is_canonical_address(addr) ) + if ( !is_pv_vcpu(v) || !is_canonical_address(addr) ) return NULL; l4t = map_domain_page(mfn); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ae93539..8e6a7c1 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -86,7 +86,7 @@ void show_registers(struct cpu_user_regs *regs) enum context context; struct vcpu *v = current; - if ( is_hvm_vcpu(v) && guest_mode(regs) ) + if ( has_hvm_container_vcpu(v) && guest_mode(regs) ) { struct segment_register sreg; context = CTXT_hvm_guest; @@ -147,8 +147,8 @@ void vcpu_show_registers(const struct vcpu *v) const struct cpu_user_regs *regs = &v->arch.user_regs; unsigned long crs[8]; - /* No need to handle HVM for now. */ - if ( is_hvm_vcpu(v) ) + /* Only handle PV guests for now */ + if ( !is_pv_vcpu(v) ) return; crs[0] = v->arch.pv_vcpu.ctrlreg[0]; @@ -624,7 +624,7 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) void hypercall_page_initialise(struct domain *d, void *hypercall_page) { memset(hypercall_page, 0xCC, PAGE_SIZE); - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_hypercall_page_initialise(d, hypercall_page); else if ( !is_pv_32bit_domain(d) ) hypercall_page_initialise_ring3_kernel(hypercall_page); diff --git a/xen/common/domain.c b/xen/common/domain.c index 63c47e8..aacf9c0 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -238,7 +238,7 @@ struct domain *domain_create( goto fail; if ( domcr_flags & DOMCRF_hvm ) - d->is_hvm = 1; + d->guest_type = guest_type_hvm; if ( domid == 0 ) { diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 21c6a14..107b000 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -721,7 +721,7 @@ __gnttab_map_grant_ref( double_gt_lock(lgt, rgt); - if ( !is_hvm_domain(ld) && need_iommu(ld) ) + if ( is_pv_domain(ld) && need_iommu(ld) ) { unsigned int wrc, rdc; int err = 0; @@ -931,7 +931,7 @@ __gnttab_unmap_common( act->pin -= GNTPIN_hstw_inc; } - if ( !is_hvm_domain(ld) && need_iommu(ld) ) + if ( is_pv_domain(ld) && need_iommu(ld) ) { unsigned int wrc, rdc; int err = 0; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 4ca50c4..97d9050 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -306,7 +306,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( current->domain == dom0 ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index e4da850..9b20268 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -16,7 +16,7 @@ #define is_pv_32on64_domain(d) (is_pv_32bit_domain(d)) #define is_pv_32on64_vcpu(v) (is_pv_32on64_domain((v)->domain)) -#define is_hvm_pv_evtchn_domain(d) (is_hvm_domain(d) && \ +#define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain)) diff --git a/xen/include/asm-x86/event.h b/xen/include/asm-x86/event.h index 7edeb5b..a82062e 100644 --- a/xen/include/asm-x86/event.h +++ b/xen/include/asm-x86/event.h @@ -23,7 +23,7 @@ int hvm_local_events_need_delivery(struct vcpu *v); static inline int local_events_need_delivery(void) { struct vcpu *v = current; - return (is_hvm_vcpu(v) ? hvm_local_events_need_delivery(v) : + return (has_hvm_container_vcpu(v) ? hvm_local_events_need_delivery(v) : (vcpu_info(v, evtchn_upcall_pending) && !vcpu_info(v, evtchn_upcall_mask))); } diff --git a/xen/include/asm-x86/guest_access.h b/xen/include/asm-x86/guest_access.h index ca700c9..88edb3f 100644 --- a/xen/include/asm-x86/guest_access.h +++ b/xen/include/asm-x86/guest_access.h @@ -14,27 +14,27 @@ /* Raw access functions: no type checking. */ #define raw_copy_to_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_to_user_hvm((dst), (src), (len)) : \ copy_to_user((dst), (src), (len))) #define raw_copy_from_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ copy_from_user((dst), (src), (len))) #define raw_clear_guest(dst, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ clear_user_hvm((dst), (len)) : \ clear_user((dst), (len))) #define __raw_copy_to_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_to_user_hvm((dst), (src), (len)) : \ __copy_to_user((dst), (src), (len))) #define __raw_copy_from_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ __copy_from_user((dst), (src), (len))) #define __raw_clear_guest(dst, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ clear_user_hvm((dst), (len)) : \ clear_user((dst), (len))) diff --git a/xen/include/asm-x86/guest_pt.h b/xen/include/asm-x86/guest_pt.h index b62bc6a..d2a8250 100644 --- a/xen/include/asm-x86/guest_pt.h +++ b/xen/include/asm-x86/guest_pt.h @@ -196,7 +196,7 @@ guest_supports_superpages(struct vcpu *v) /* The _PAGE_PSE bit must be honoured in HVM guests, whenever * CR4.PSE is set or the guest is in PAE or long mode. * It's also used in the dummy PT for vcpus with CR4.PG cleared. */ - return (!is_hvm_vcpu(v) + return (is_pv_vcpu(v) ? opt_allow_superpage : (GUEST_PAGING_LEVELS != 2 || !hvm_paging_enabled(v) @@ -214,7 +214,7 @@ guest_supports_nx(struct vcpu *v) { if ( GUEST_PAGING_LEVELS == 2 || !cpu_has_nx ) return 0; - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) return cpu_has_nx; return hvm_nx_enabled(v); } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2397537..a9dd15f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -259,6 +259,10 @@ struct mem_event_per_domain struct evtchn_port_ops; +enum guest_type { + guest_type_pv, guest_type_hvm +}; + struct domain { domid_t domain_id; @@ -311,8 +315,8 @@ struct domain struct rangeset *iomem_caps; struct rangeset *irq_caps; - /* Is this an HVM guest? */ - bool_t is_hvm; + enum guest_type guest_type; + #ifdef HAS_PASSTHROUGH /* Does this guest need iommu mappings? */ bool_t need_iommu; @@ -772,8 +776,12 @@ void watchdog_domain_destroy(struct domain *d); #define VM_ASSIST(_d,_t) (test_bit((_t), &(_d)->vm_assist)) -#define is_hvm_domain(d) ((d)->is_hvm) +#define is_pv_domain(d) ((d)->guest_type == guest_type_pv) +#define is_pv_vcpu(v) (is_pv_domain((v)->domain)) +#define is_hvm_domain(d) ((d)->guest_type == guest_type_hvm) #define is_hvm_vcpu(v) (is_hvm_domain(v->domain)) +#define has_hvm_container_domain(d) ((d)->guest_type != guest_type_pv) +#define has_hvm_container_vcpu(v) (has_hvm_container_domain((v)->domain)) #define is_pinned_vcpu(v) ((v)->domain->is_pinned || \ cpumask_weight((v)->cpu_affinity) == 1) #ifdef HAS_PASSTHROUGH diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index ad1ddd5..9fb7446 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -442,7 +442,7 @@ typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT - if ( is_hvm_vcpu(current) ? + if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : is_pv_32on64_vcpu(current) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:00:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh424-0000de-Ef; Thu, 14 Nov 2013 21:00:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh422-0000dG-8P for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:54 +0000 Received: from [85.158.139.211:34485] by server-6.bemta-5.messagelabs.com id 9D/A1-04949-50A35825; Thu, 14 Nov 2013 21:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1384462850!2074500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.0 required=7.0 tests=BODY_DONG,BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4212 invoked from network); 14 Nov 2013 21:00:51 -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; 14 Nov 2013 21:00:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh41y-0007LX-9w for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh41y-0008Vw-6n for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:00:50 +0000 Date: Thu, 14 Nov 2013 21:00:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh prep: introduce pv guest type and has_hvm_container macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c6492780eac70db6c0b9e3a6a485052db574553 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:30:09 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:30:09 2013 +0100 pvh prep: introduce pv guest type and has_hvm_container macros The goal of this patch is to classify conditionals more clearly, as to whether they relate to pv guests, hvm-only guests, or guests with an "hvm container" (which will eventually include PVH). This patch introduces an enum for guest type, as well as two new macros for switching behavior on and off: is_pv_* and has_hvm_container_*. At the moment is_pv_* <=> !has_hvm_container_*. The purpose of having two is that it seems to me different to take a path because something does *not* have PV structures as to take a path because it *does* have HVM structures, even if the two happen to coincide 100% at the moment. The exact usage is occasionally a bit fuzzy though, and a judgement call just needs to be made on which is clearer. In general, a switch should use is_pv_* (or !is_pv_*) if the code in question relates directly to a PV guest. Examples include use of pv_vcpu structs or other behavior directly related to PV domains. hvm_container is more of a fuzzy concept, but in general: * Most core HVM behavior will be included in this. Behavior not appropriate for PVH mode will be disabled in later patches * Hypercalls related to HVM guests will *not* be included by default; functionality needed by PVH guests will be enabled in future patches * The following functionality are not considered part of the HVM container, and PVH will end up behaving like PV by default: Event channel, vtsc offset, code related to emulated timers, nested HVM, emuirq, PoD * Some features are left to implement for PVH later: vpmu, shadow mode Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/acpi/suspend.c | 2 +- xen/arch/x86/cpu/mcheck/vmce.c | 6 ++-- xen/arch/x86/debug.c | 2 +- xen/arch/x86/domain.c | 54 ++++++++++++++++++------------------ xen/arch/x86/domain_page.c | 10 +++--- xen/arch/x86/domctl.c | 10 +++--- xen/arch/x86/efi/runtime.c | 4 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 +- xen/arch/x86/mm.c | 6 ++-- xen/arch/x86/mm/shadow/common.c | 6 ++-- xen/arch/x86/mm/shadow/multi.c | 4 +- xen/arch/x86/physdev.c | 4 +- xen/arch/x86/traps.c | 5 ++- xen/arch/x86/x86_64/mm.c | 2 +- xen/arch/x86/x86_64/traps.c | 8 ++-- xen/common/domain.c | 2 +- xen/common/grant_table.c | 4 +- xen/common/kernel.c | 2 +- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/event.h | 2 +- xen/include/asm-x86/guest_access.h | 12 ++++---- xen/include/asm-x86/guest_pt.h | 4 +- xen/include/xen/sched.h | 14 +++++++-- xen/include/xen/tmem_xen.h | 2 +- 24 files changed, 90 insertions(+), 81 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index 6fdd876..1718930 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -85,7 +85,7 @@ void restore_rest_processor_state(void) BUG(); /* Maybe load the debug registers. */ - BUG_ON(is_hvm_vcpu(curr)); + BUG_ON(!is_pv_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) { write_debugreg(0, curr->arch.debugreg[0]); diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index af3b491..f6c35db 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -83,7 +83,7 @@ int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt) { dprintk(XENLOG_G_ERR, "%s restore: unsupported MCA capabilities" " %#" PRIx64 " for d%d:v%u (supported: %#Lx)\n", - is_hvm_vcpu(v) ? "HVM" : "PV", ctxt->caps, + has_hvm_container_vcpu(v) ? "HVM" : "PV", ctxt->caps, v->domain->domain_id, v->vcpu_id, guest_mcg_cap & ~MCG_CAP_COUNT); return -EPERM; @@ -357,7 +357,7 @@ int inject_vmce(struct domain *d, int vcpu) if ( vcpu != VMCE_INJECT_BROADCAST && vcpu != v->vcpu_id ) continue; - if ( (is_hvm_domain(d) || + if ( (has_hvm_container_domain(d) || guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { @@ -439,7 +439,7 @@ int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn) if (!mfn_valid(mfn_x(mfn))) return -EINVAL; - if ( !is_hvm_domain(d) || !paging_mode_hap(d) ) + if ( !has_hvm_container_domain(d) || !paging_mode_hap(d) ) return -ENOSYS; rc = -1; diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index e67473e..3e21ca8 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -158,7 +158,7 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, pagecnt = min_t(long, PAGE_SIZE - (addr & ~PAGE_MASK), len); - mfn = (dp->is_hvm + mfn = (has_hvm_container_domain(dp) ? dbg_hvm_va2mfn(addr, dp, toaddr, &gfn) : dbg_pv_va2mfn(addr, dp, pgd3)); if ( mfn == INVALID_MFN ) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b67fcb8..358616c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -167,7 +167,7 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) p2m_pod_dump_data(d); spin_lock(&d->page_alloc_lock); @@ -385,7 +385,7 @@ int vcpu_initialise(struct vcpu *v) vmce_init_vcpu(v); - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { rc = hvm_vcpu_initialise(v); goto done; @@ -438,7 +438,7 @@ int vcpu_initialise(struct vcpu *v) { vcpu_destroy_fpu(v); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) xfree(v->arch.pv_vcpu.trap_ctxt); } @@ -452,7 +452,7 @@ void vcpu_destroy(struct vcpu *v) vcpu_destroy_fpu(v); - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) hvm_vcpu_destroy(v); else xfree(v->arch.pv_vcpu.trap_ctxt); @@ -464,7 +464,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) int rc = -ENOMEM; d->arch.hvm_domain.hap_enabled = - is_hvm_domain(d) && + has_hvm_container_domain(d) && hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); d->arch.hvm_domain.mem_sharing_enabled = 0; @@ -490,7 +490,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) d->domain_id); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); else if ( is_idle_domain(d) ) rc = 0; @@ -512,7 +512,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) mapcache_domain_init(d); HYPERVISOR_COMPAT_VIRT_START(d) = - is_hvm_domain(d) ? ~0u : __HYPERVISOR_COMPAT_VIRT_START; + is_pv_domain(d) ? __HYPERVISOR_COMPAT_VIRT_START : ~0u; if ( (rc = paging_domain_init(d, domcr_flags)) != 0 ) goto fail; @@ -554,7 +554,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) goto fail; } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { if ( (rc = hvm_domain_initialise(d)) != 0 ) { @@ -583,14 +583,14 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( paging_initialised ) paging_final_teardown(d); free_perdomain_mappings(d); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); return rc; } void arch_domain_destroy(struct domain *d) { - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); else xfree(d->arch.pv_domain.e820); @@ -602,7 +602,7 @@ void arch_domain_destroy(struct domain *d) paging_final_teardown(d); free_perdomain_mappings(d); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) free_xenheap_page(d->arch.pv_domain.gdt_ldt_l1tab); free_xenheap_page(d->shared_info); @@ -653,7 +653,7 @@ int arch_set_info_guest( #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { if ( !compat ) { @@ -698,7 +698,7 @@ int arch_set_info_guest( v->fpu_initialised = !!(flags & VGCF_I387_VALID); v->arch.flags &= ~TF_kernel_mode; - if ( (flags & VGCF_in_kernel) || is_hvm_vcpu(v)/*???*/ ) + if ( (flags & VGCF_in_kernel) || has_hvm_container_vcpu(v)/*???*/ ) v->arch.flags |= TF_kernel_mode; v->arch.vgc_flags = flags; @@ -713,7 +713,7 @@ int arch_set_info_guest( if ( !compat ) { memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) memcpy(v->arch.pv_vcpu.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -729,7 +729,7 @@ int arch_set_info_guest( v->arch.user_regs.eflags |= 2; - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) { hvm_set_info_guest(v); goto out; @@ -959,7 +959,7 @@ int arch_set_info_guest( int arch_vcpu_reset(struct vcpu *v) { - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { destroy_gdt(v); return vcpu_destroy_pagetables(v); @@ -1309,7 +1309,7 @@ static void update_runstate_area(struct vcpu *v) static inline int need_full_gdt(struct vcpu *v) { - return (!is_hvm_vcpu(v) && !is_idle_vcpu(v)); + return (is_pv_vcpu(v) && !is_idle_vcpu(v)); } static void __context_switch(void) @@ -1435,9 +1435,9 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { __context_switch(); - if ( !is_hvm_vcpu(next) && + if ( is_pv_vcpu(next) && (is_idle_vcpu(prev) || - is_hvm_vcpu(prev) || + has_hvm_container_vcpu(prev) || is_pv_32on64_vcpu(prev) != is_pv_32on64_vcpu(next)) ) { uint64_t efer = read_efer(); @@ -1448,13 +1448,13 @@ void context_switch(struct vcpu *prev, struct vcpu *next) /* Re-enable interrupts before restoring state which may fault. */ local_irq_enable(); - if ( !is_hvm_vcpu(next) ) + if ( is_pv_vcpu(next) ) { load_LDT(next); load_segments(next); } - set_cpuid_faulting(!is_hvm_vcpu(next) && + set_cpuid_faulting(is_pv_vcpu(next) && (next->domain->domain_id != 0)); } @@ -1537,7 +1537,7 @@ void hypercall_cancel_continuation(void) } else { - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) regs->eip += 2; /* skip re-execute 'syscall' / 'int $xx' */ else current->arch.hvm_vcpu.hcall_preempted = 0; @@ -1574,12 +1574,12 @@ unsigned long hypercall_create_continuation( regs->eax = op; /* Ensure the hypercall trap instruction is re-executed. */ - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) regs->eip -= 2; /* re-execute 'syscall' / 'int $xx' */ else current->arch.hvm_vcpu.hcall_preempted = 1; - if ( !is_hvm_vcpu(current) ? + if ( is_pv_vcpu(current) ? !is_pv_32on64_vcpu(current) : (hvm_guest_x86_mode(current) == 8) ) { @@ -1851,7 +1851,7 @@ int domain_relinquish_resources(struct domain *d) return ret; } - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { for_each_vcpu ( d, v ) { @@ -1924,7 +1924,7 @@ int domain_relinquish_resources(struct domain *d) BUG(); } - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_domain_relinquish_resources(d); return 0; @@ -2008,7 +2008,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) hvm_assert_evtchn_irq(v); else vcpu_kick(v); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index bc18263..3903952 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -35,7 +35,7 @@ static inline struct vcpu *mapcache_current_vcpu(void) * then it means we are running on the idle domain's page table and must * therefore use its mapcache. */ - if ( unlikely(pagetable_is_null(v->arch.guest_table)) && !is_hvm_vcpu(v) ) + if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) @@ -72,7 +72,7 @@ void *map_domain_page(unsigned long mfn) #endif v = mapcache_current_vcpu(); - if ( !v || is_hvm_vcpu(v) ) + if ( !v || !is_pv_vcpu(v) ) return mfn_to_virt(mfn); dcache = &v->domain->arch.pv_domain.mapcache; @@ -177,7 +177,7 @@ void unmap_domain_page(const void *ptr) ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END); v = mapcache_current_vcpu(); - ASSERT(v && !is_hvm_vcpu(v)); + ASSERT(v && is_pv_vcpu(v)); dcache = &v->domain->arch.pv_domain.mapcache; ASSERT(dcache->inuse); @@ -244,7 +244,7 @@ int mapcache_domain_init(struct domain *d) struct mapcache_domain *dcache = &d->arch.pv_domain.mapcache; unsigned int bitmap_pages; - if ( is_hvm_domain(d) || is_idle_domain(d) ) + if ( !is_pv_domain(d) || is_idle_domain(d) ) return 0; #ifdef NDEBUG @@ -275,7 +275,7 @@ int mapcache_vcpu_init(struct vcpu *v) unsigned int ents = d->max_vcpus * MAPCACHE_VCPU_ENTRIES; unsigned int nr = PFN_UP(BITS_TO_LONGS(ents) * sizeof(long)); - if ( is_hvm_vcpu(v) || !dcache->inuse ) + if ( !is_pv_vcpu(v) || !dcache->inuse ) return 0; if ( ents > dcache->entries ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e75918a..f7e4586 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -800,7 +800,7 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { evc->size = sizeof(*evc); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { evc->sysenter_callback_cs = v->arch.pv_vcpu.sysenter_callback_cs; @@ -833,7 +833,7 @@ long arch_do_domctl( ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) goto ext_vcpucontext_out; - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) @@ -1246,7 +1246,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) bool_t compat = is_pv_32on64_domain(v->domain); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) - if ( is_hvm_vcpu(v) ) + if ( !is_pv_vcpu(v) ) memset(c.nat, 0, sizeof(*c.nat)); memcpy(&c.nat->fpu_ctxt, v->arch.fpu_ctxt, sizeof(c.nat->fpu_ctxt)); c(flags = v->arch.vgc_flags & ~(VGCF_i387_valid|VGCF_in_kernel)); @@ -1257,7 +1257,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) if ( !compat ) { memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) memcpy(c.nat->trap_ctxt, v->arch.pv_vcpu.trap_ctxt, sizeof(c.nat->trap_ctxt)); } @@ -1272,7 +1272,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) c(debugreg[i] = v->arch.debugreg[i]); - if ( is_hvm_vcpu(v) ) + if ( has_hvm_container_vcpu(v) ) { struct segment_register sreg; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 37bb535..d7c884b 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -52,7 +52,7 @@ unsigned long efi_rs_enter(void) /* prevent fixup_page_fault() from doing anything */ irq_enter(); - if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) + if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { struct desc_ptr gdt_desc = { .limit = LAST_RESERVED_GDT_BYTE, @@ -71,7 +71,7 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { write_cr3(cr3); - if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) + if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { struct desc_ptr gdt_desc = { .limit = LAST_RESERVED_GDT_BYTE, diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 19650ce..2f7c238 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -659,7 +659,7 @@ void vmx_vmcs_exit(struct vcpu *v) { /* Don't confuse vmx_do_resume (for @v or @current!) */ vmx_clear_vmcs(v); - if ( is_hvm_vcpu(current) ) + if ( has_hvm_container_vcpu(current) ) vmx_load_vmcs(current); spin_unlock(&v->arch.hvm_vmx.vmcs_lock); @@ -1488,7 +1488,7 @@ static void vmcs_dump(unsigned char ch) for_each_domain ( d ) { - if ( !is_hvm_domain(d) ) + if ( !has_hvm_container_domain(d) ) continue; printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 43aaceb..9621e22 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -181,7 +181,7 @@ static uint32_t base_disallow_mask; (rangeset_is_empty((d)->iomem_caps) && \ rangeset_is_empty((d)->arch.ioport_caps) && \ !has_arch_pdevs(d) && \ - !is_hvm_domain(d)) ? \ + is_pv_domain(d)) ? \ L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS)) static void __init init_frametable_chunk(void *start, void *end) @@ -433,7 +433,7 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) unsigned long domain_get_maximum_gpfn(struct domain *d) { - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) return p2m_get_hostp2m(d)->max_mapped_pfn; /* NB. PV guests specify nr_pfns rather than max_pfn so we adjust here. */ return (arch_get_max_pfn(d) ?: 1) - 1; @@ -2381,7 +2381,7 @@ static int __get_page_type(struct page_info *page, unsigned long type, { /* Special pages should not be accessible from devices. */ struct domain *d = page_get_owner(page); - if ( d && !is_hvm_domain(d) && unlikely(need_iommu(d)) ) + if ( d && is_pv_domain(d) && unlikely(need_iommu(d)) ) { if ( (x & PGT_type_mask) == PGT_writable_page ) iommu_unmap_page(d, mfn_to_gmfn(d, page_to_mfn(page))); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index adffa06..0bfa595 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -367,7 +367,7 @@ const struct x86_emulate_ops *shadow_init_emulation( sh_ctxt->ctxt.regs = regs; sh_ctxt->ctxt.force_writeback = 0; - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) { sh_ctxt->ctxt.addr_size = sh_ctxt->ctxt.sp_size = BITS_PER_LONG; return &pv_shadow_emulator_ops; @@ -964,7 +964,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) if ( pg->shadow_flags & ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) - || !is_hvm_domain(v->domain) + || is_pv_domain(v->domain) || !v->domain->arch.paging.shadow.oos_active ) return 0; @@ -2753,7 +2753,7 @@ static void sh_update_paging_modes(struct vcpu *v) if ( v->arch.paging.mode ) v->arch.paging.mode->shadow.detach_old_tables(v); - if ( !is_hvm_domain(d) ) + if ( is_pv_domain(d) ) { /// /// PV guest diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 3fed0b6..3d35537 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -712,7 +712,7 @@ _sh_propagate(struct vcpu *v, // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... if ( (GUEST_PAGING_LEVELS == 4) && !is_pv_32on64_domain(d) - && !is_hvm_domain(d) ) + && is_pv_domain(d) ) { sflags |= _PAGE_USER; } @@ -3922,7 +3922,7 @@ sh_update_cr3(struct vcpu *v, int do_locking) #endif /* Don't do anything on an uninitialised vcpu */ - if ( !is_hvm_domain(d) && !v->is_initialised ) + if ( is_pv_domain(d) && !v->is_initialised ) { ASSERT(v->arch.cr3 == 0); return; diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 4835ed7..dab6213 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -310,10 +310,10 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) spin_unlock(&v->domain->event_lock); break; } - if ( !is_hvm_domain(v->domain) && + if ( is_pv_domain(v->domain) && v->domain->arch.pv_domain.auto_unmask ) evtchn_unmask(pirq->evtchn); - if ( !is_hvm_domain(v->domain) || + if ( is_pv_domain(v->domain) || domain_pirq_to_irq(v->domain, eoi.irq) > 0 ) pirq_guest_eoi(pirq); if ( is_hvm_domain(v->domain) && diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0e3c6e3..26ae722 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -120,6 +120,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) return; @@ -547,7 +548,7 @@ static inline void do_trap( } if ( ((trapnr == TRAP_copro_error) || (trapnr == TRAP_simd_error)) && - is_hvm_vcpu(curr) && curr->arch.hvm_vcpu.fpu_exception_callback ) + has_hvm_container_vcpu(curr) && curr->arch.hvm_vcpu.fpu_exception_callback ) { curr->arch.hvm_vcpu.fpu_exception_callback( curr->arch.hvm_vcpu.fpu_exception_callback_arg, regs); @@ -702,7 +703,7 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, *ebx = 0x40000200; *ecx = 0; /* Features 1 */ *edx = 0; /* Features 2 */ - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) *ecx |= XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD; break; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 2bdbad0..4a3b3f1 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -73,7 +73,7 @@ void *do_page_walk(struct vcpu *v, unsigned long addr) l2_pgentry_t l2e, *l2t; l1_pgentry_t l1e, *l1t; - if ( is_hvm_vcpu(v) || !is_canonical_address(addr) ) + if ( !is_pv_vcpu(v) || !is_canonical_address(addr) ) return NULL; l4t = map_domain_page(mfn); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ae93539..8e6a7c1 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -86,7 +86,7 @@ void show_registers(struct cpu_user_regs *regs) enum context context; struct vcpu *v = current; - if ( is_hvm_vcpu(v) && guest_mode(regs) ) + if ( has_hvm_container_vcpu(v) && guest_mode(regs) ) { struct segment_register sreg; context = CTXT_hvm_guest; @@ -147,8 +147,8 @@ void vcpu_show_registers(const struct vcpu *v) const struct cpu_user_regs *regs = &v->arch.user_regs; unsigned long crs[8]; - /* No need to handle HVM for now. */ - if ( is_hvm_vcpu(v) ) + /* Only handle PV guests for now */ + if ( !is_pv_vcpu(v) ) return; crs[0] = v->arch.pv_vcpu.ctrlreg[0]; @@ -624,7 +624,7 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) void hypercall_page_initialise(struct domain *d, void *hypercall_page) { memset(hypercall_page, 0xCC, PAGE_SIZE); - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_hypercall_page_initialise(d, hypercall_page); else if ( !is_pv_32bit_domain(d) ) hypercall_page_initialise_ring3_kernel(hypercall_page); diff --git a/xen/common/domain.c b/xen/common/domain.c index 63c47e8..aacf9c0 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -238,7 +238,7 @@ struct domain *domain_create( goto fail; if ( domcr_flags & DOMCRF_hvm ) - d->is_hvm = 1; + d->guest_type = guest_type_hvm; if ( domid == 0 ) { diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 21c6a14..107b000 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -721,7 +721,7 @@ __gnttab_map_grant_ref( double_gt_lock(lgt, rgt); - if ( !is_hvm_domain(ld) && need_iommu(ld) ) + if ( is_pv_domain(ld) && need_iommu(ld) ) { unsigned int wrc, rdc; int err = 0; @@ -931,7 +931,7 @@ __gnttab_unmap_common( act->pin -= GNTPIN_hstw_inc; } - if ( !is_hvm_domain(ld) && need_iommu(ld) ) + if ( is_pv_domain(ld) && need_iommu(ld) ) { unsigned int wrc, rdc; int err = 0; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 4ca50c4..97d9050 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -306,7 +306,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( current->domain == dom0 ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 - if ( !is_hvm_vcpu(current) ) + if ( is_pv_vcpu(current) ) fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index e4da850..9b20268 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -16,7 +16,7 @@ #define is_pv_32on64_domain(d) (is_pv_32bit_domain(d)) #define is_pv_32on64_vcpu(v) (is_pv_32on64_domain((v)->domain)) -#define is_hvm_pv_evtchn_domain(d) (is_hvm_domain(d) && \ +#define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain)) diff --git a/xen/include/asm-x86/event.h b/xen/include/asm-x86/event.h index 7edeb5b..a82062e 100644 --- a/xen/include/asm-x86/event.h +++ b/xen/include/asm-x86/event.h @@ -23,7 +23,7 @@ int hvm_local_events_need_delivery(struct vcpu *v); static inline int local_events_need_delivery(void) { struct vcpu *v = current; - return (is_hvm_vcpu(v) ? hvm_local_events_need_delivery(v) : + return (has_hvm_container_vcpu(v) ? hvm_local_events_need_delivery(v) : (vcpu_info(v, evtchn_upcall_pending) && !vcpu_info(v, evtchn_upcall_mask))); } diff --git a/xen/include/asm-x86/guest_access.h b/xen/include/asm-x86/guest_access.h index ca700c9..88edb3f 100644 --- a/xen/include/asm-x86/guest_access.h +++ b/xen/include/asm-x86/guest_access.h @@ -14,27 +14,27 @@ /* Raw access functions: no type checking. */ #define raw_copy_to_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_to_user_hvm((dst), (src), (len)) : \ copy_to_user((dst), (src), (len))) #define raw_copy_from_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ copy_from_user((dst), (src), (len))) #define raw_clear_guest(dst, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ clear_user_hvm((dst), (len)) : \ clear_user((dst), (len))) #define __raw_copy_to_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_to_user_hvm((dst), (src), (len)) : \ __copy_to_user((dst), (src), (len))) #define __raw_copy_from_guest(dst, src, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ copy_from_user_hvm((dst), (src), (len)) : \ __copy_from_user((dst), (src), (len))) #define __raw_clear_guest(dst, len) \ - (is_hvm_vcpu(current) ? \ + (has_hvm_container_vcpu(current) ? \ clear_user_hvm((dst), (len)) : \ clear_user((dst), (len))) diff --git a/xen/include/asm-x86/guest_pt.h b/xen/include/asm-x86/guest_pt.h index b62bc6a..d2a8250 100644 --- a/xen/include/asm-x86/guest_pt.h +++ b/xen/include/asm-x86/guest_pt.h @@ -196,7 +196,7 @@ guest_supports_superpages(struct vcpu *v) /* The _PAGE_PSE bit must be honoured in HVM guests, whenever * CR4.PSE is set or the guest is in PAE or long mode. * It's also used in the dummy PT for vcpus with CR4.PG cleared. */ - return (!is_hvm_vcpu(v) + return (is_pv_vcpu(v) ? opt_allow_superpage : (GUEST_PAGING_LEVELS != 2 || !hvm_paging_enabled(v) @@ -214,7 +214,7 @@ guest_supports_nx(struct vcpu *v) { if ( GUEST_PAGING_LEVELS == 2 || !cpu_has_nx ) return 0; - if ( !is_hvm_vcpu(v) ) + if ( is_pv_vcpu(v) ) return cpu_has_nx; return hvm_nx_enabled(v); } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2397537..a9dd15f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -259,6 +259,10 @@ struct mem_event_per_domain struct evtchn_port_ops; +enum guest_type { + guest_type_pv, guest_type_hvm +}; + struct domain { domid_t domain_id; @@ -311,8 +315,8 @@ struct domain struct rangeset *iomem_caps; struct rangeset *irq_caps; - /* Is this an HVM guest? */ - bool_t is_hvm; + enum guest_type guest_type; + #ifdef HAS_PASSTHROUGH /* Does this guest need iommu mappings? */ bool_t need_iommu; @@ -772,8 +776,12 @@ void watchdog_domain_destroy(struct domain *d); #define VM_ASSIST(_d,_t) (test_bit((_t), &(_d)->vm_assist)) -#define is_hvm_domain(d) ((d)->is_hvm) +#define is_pv_domain(d) ((d)->guest_type == guest_type_pv) +#define is_pv_vcpu(v) (is_pv_domain((v)->domain)) +#define is_hvm_domain(d) ((d)->guest_type == guest_type_hvm) #define is_hvm_vcpu(v) (is_hvm_domain(v->domain)) +#define has_hvm_container_domain(d) ((d)->guest_type != guest_type_pv) +#define has_hvm_container_vcpu(v) (has_hvm_container_domain((v)->domain)) #define is_pinned_vcpu(v) ((v)->domain->is_pinned || \ cpumask_weight((v)->cpu_affinity) == 1) #ifdef HAS_PASSTHROUGH diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index ad1ddd5..9fb7446 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -442,7 +442,7 @@ typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT - if ( is_hvm_vcpu(current) ? + if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : is_pv_32on64_vcpu(current) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42C-0000f5-Sr; Thu, 14 Nov 2013 21:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42B-0000ep-ML for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:03 +0000 Received: from [85.158.139.211:34821] by server-14.bemta-5.messagelabs.com id 3C/11-29404-E0A35825; Thu, 14 Nov 2013 21:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384462860!2092371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14721 invoked from network); 14 Nov 2013 21:01:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh428-0007Lg-Gl for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh428-000053-EZ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:00 +0000 Date: Thu, 14 Nov 2013 21:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: introduce PVH guest type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8271d6522c608d3adff6d745a1d76751cb8f10d5 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:33:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:33:12 2013 +0100 pvh: introduce PVH guest type Introduce new PVH guest type, flags to create it, and ways to identify it. To begin with, it will inherit functionality marked hvm_container. Code to actually check for hardware support, in the VMX case, will be added in future patches. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 19 +++++++++++++++++++ xen/common/domain.c | 2 ++ xen/common/domctl.c | 24 +++++++++++++++++++++--- xen/include/asm-x86/hvm/hvm.h | 3 +++ xen/include/public/domctl.h | 8 +++++++- xen/include/xen/sched.h | 11 ++++++++++- 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f235a24..2f8990e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -145,6 +145,9 @@ static int __init hvm_enable(void) printk("\n"); } + if ( !fns->pvh_supported ) + printk(XENLOG_INFO "HVM: PVH mode not supported on this platform\n"); + /* * Allow direct access to the PC debug ports 0x80 and 0xed (they are * often used for I/O delays, but the vmexits simply slow things down). @@ -522,6 +525,22 @@ int hvm_domain_initialise(struct domain *d) return -EINVAL; } + if ( is_pvh_domain(d) ) + { + if ( !hvm_funcs.pvh_supported ) + { + printk(XENLOG_G_WARNING "Attempt to create a PVH guest " + "on a system without necessary hardware support\n"); + return -EINVAL; + } + if ( !hap_enabled(d) ) + { + printk(XENLOG_G_INFO "PVH guest must have HAP on\n"); + return -EINVAL; + } + + } + spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); diff --git a/xen/common/domain.c b/xen/common/domain.c index aacf9c0..1162e55 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -239,6 +239,8 @@ struct domain *domain_create( if ( domcr_flags & DOMCRF_hvm ) d->guest_type = guest_type_hvm; + else if ( domcr_flags & DOMCRF_pvh ) + d->guest_type = guest_type_pvh; if ( domid == 0 ) { diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 870eef1..904d27b 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -185,8 +185,17 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; - if ( is_hvm_domain(d) ) + switch ( d->guest_type ) + { + case guest_type_hvm: info->flags |= XEN_DOMINF_hvm_guest; + break; + case guest_type_pvh: + info->flags |= XEN_DOMINF_pvh_guest; + break; + default: + break; + } xsm_security_domaininfo(d, info); @@ -412,8 +421,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = -EINVAL; if ( supervisor_mode_kernel || (op->u.createdomain.flags & - ~(XEN_DOMCTL_CDF_hvm_guest | XEN_DOMCTL_CDF_hap | - XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off)) ) + ~(XEN_DOMCTL_CDF_hvm_guest + | XEN_DOMCTL_CDF_pvh_guest + | XEN_DOMCTL_CDF_hap + | XEN_DOMCTL_CDF_s3_integrity + | XEN_DOMCTL_CDF_oos_off)) ) break; dom = op->domain; @@ -440,9 +452,15 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) rover = dom; } + if ( (op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest) + && (op->u.createdomain.flags & XEN_DOMCTL_CDF_pvh_guest) ) + return -EINVAL; + domcr_flags = 0; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest ) domcr_flags |= DOMCRF_hvm; + if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_pvh_guest ) + domcr_flags |= DOMCRF_pvh; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) domcr_flags |= DOMCRF_hap; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_s3_integrity ) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index c9afb56..ccca5df 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -90,6 +90,9 @@ struct hvm_function_table { /* Support Hardware-Assisted Paging? */ int hap_supported; + /* Necessary hardware support for PVH mode? */ + int pvh_supported; + /* Indicate HAP capabilities. */ int hap_capabilities; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index d4e479f..01a3652 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -47,7 +47,7 @@ struct xen_domctl_createdomain { /* IN parameters */ uint32_t ssidref; xen_domain_handle_t handle; - /* Is this an HVM guest (as opposed to a PV guest)? */ + /* Is this an HVM guest (as opposed to a PVH or PV guest)? */ #define _XEN_DOMCTL_CDF_hvm_guest 0 #define XEN_DOMCTL_CDF_hvm_guest (1U<<_XEN_DOMCTL_CDF_hvm_guest) /* Use hardware-assisted paging if available? */ @@ -59,6 +59,9 @@ struct xen_domctl_createdomain { /* Disable out-of-sync shadow page tables? */ #define _XEN_DOMCTL_CDF_oos_off 3 #define XEN_DOMCTL_CDF_oos_off (1U<<_XEN_DOMCTL_CDF_oos_off) + /* Is this a PVH guest (as opposed to an HVM or PV guest)? */ +#define _XEN_DOMCTL_CDF_pvh_guest 4 +#define XEN_DOMCTL_CDF_pvh_guest (1U<<_XEN_DOMCTL_CDF_pvh_guest) uint32_t flags; }; typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; @@ -89,6 +92,9 @@ struct xen_domctl_getdomaininfo { /* Being debugged. */ #define _XEN_DOMINF_debugged 6 #define XEN_DOMINF_debugged (1U<<_XEN_DOMINF_debugged) +/* domain is PVH */ +#define _XEN_DOMINF_pvh_guest 7 +#define XEN_DOMINF_pvh_guest (1U<<_XEN_DOMINF_pvh_guest) /* XEN_DOMINF_shutdown guest-supplied code. */ #define XEN_DOMINF_shutdownmask 255 #define XEN_DOMINF_shutdownshift 16 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index a9dd15f..cbdf377 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -259,8 +259,12 @@ struct mem_event_per_domain struct evtchn_port_ops; +/* + * PVH is a PV guest running in an HVM container. is_hvm_* checks + * will be false, but has_hvm_container_* checks will be true. + */ enum guest_type { - guest_type_pv, guest_type_hvm + guest_type_pv, guest_type_pvh, guest_type_hvm }; struct domain @@ -500,6 +504,9 @@ struct domain *domain_create( /* DOMCRF_oos_off: dont use out-of-sync optimization for shadow page tables */ #define _DOMCRF_oos_off 4 #define DOMCRF_oos_off (1U<<_DOMCRF_oos_off) + /* DOMCRF_pvh: Create PV domain in HVM container. */ +#define _DOMCRF_pvh 5 +#define DOMCRF_pvh (1U<<_DOMCRF_pvh) /* * rcu_lock_domain_by_id() is more efficient than get_domain_by_id(). @@ -778,6 +785,8 @@ void watchdog_domain_destroy(struct domain *d); #define is_pv_domain(d) ((d)->guest_type == guest_type_pv) #define is_pv_vcpu(v) (is_pv_domain((v)->domain)) +#define is_pvh_domain(d) ((d)->guest_type == guest_type_pvh) +#define is_pvh_vcpu(v) (is_pvh_domain((v)->domain)) #define is_hvm_domain(d) ((d)->guest_type == guest_type_hvm) #define is_hvm_vcpu(v) (is_hvm_domain(v->domain)) #define has_hvm_container_domain(d) ((d)->guest_type != guest_type_pv) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42C-0000f5-Sr; Thu, 14 Nov 2013 21:01:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42B-0000ep-ML for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:03 +0000 Received: from [85.158.139.211:34821] by server-14.bemta-5.messagelabs.com id 3C/11-29404-E0A35825; Thu, 14 Nov 2013 21:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1384462860!2092371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14721 invoked from network); 14 Nov 2013 21:01:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh428-0007Lg-Gl for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh428-000053-EZ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:00 +0000 Date: Thu, 14 Nov 2013 21:01:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: introduce PVH guest type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8271d6522c608d3adff6d745a1d76751cb8f10d5 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:33:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:33:12 2013 +0100 pvh: introduce PVH guest type Introduce new PVH guest type, flags to create it, and ways to identify it. To begin with, it will inherit functionality marked hvm_container. Code to actually check for hardware support, in the VMX case, will be added in future patches. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 19 +++++++++++++++++++ xen/common/domain.c | 2 ++ xen/common/domctl.c | 24 +++++++++++++++++++++--- xen/include/asm-x86/hvm/hvm.h | 3 +++ xen/include/public/domctl.h | 8 +++++++- xen/include/xen/sched.h | 11 ++++++++++- 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f235a24..2f8990e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -145,6 +145,9 @@ static int __init hvm_enable(void) printk("\n"); } + if ( !fns->pvh_supported ) + printk(XENLOG_INFO "HVM: PVH mode not supported on this platform\n"); + /* * Allow direct access to the PC debug ports 0x80 and 0xed (they are * often used for I/O delays, but the vmexits simply slow things down). @@ -522,6 +525,22 @@ int hvm_domain_initialise(struct domain *d) return -EINVAL; } + if ( is_pvh_domain(d) ) + { + if ( !hvm_funcs.pvh_supported ) + { + printk(XENLOG_G_WARNING "Attempt to create a PVH guest " + "on a system without necessary hardware support\n"); + return -EINVAL; + } + if ( !hap_enabled(d) ) + { + printk(XENLOG_G_INFO "PVH guest must have HAP on\n"); + return -EINVAL; + } + + } + spin_lock_init(&d->arch.hvm_domain.irq_lock); spin_lock_init(&d->arch.hvm_domain.uc_lock); diff --git a/xen/common/domain.c b/xen/common/domain.c index aacf9c0..1162e55 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -239,6 +239,8 @@ struct domain *domain_create( if ( domcr_flags & DOMCRF_hvm ) d->guest_type = guest_type_hvm; + else if ( domcr_flags & DOMCRF_pvh ) + d->guest_type = guest_type_pvh; if ( domid == 0 ) { diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 870eef1..904d27b 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -185,8 +185,17 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; - if ( is_hvm_domain(d) ) + switch ( d->guest_type ) + { + case guest_type_hvm: info->flags |= XEN_DOMINF_hvm_guest; + break; + case guest_type_pvh: + info->flags |= XEN_DOMINF_pvh_guest; + break; + default: + break; + } xsm_security_domaininfo(d, info); @@ -412,8 +421,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = -EINVAL; if ( supervisor_mode_kernel || (op->u.createdomain.flags & - ~(XEN_DOMCTL_CDF_hvm_guest | XEN_DOMCTL_CDF_hap | - XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off)) ) + ~(XEN_DOMCTL_CDF_hvm_guest + | XEN_DOMCTL_CDF_pvh_guest + | XEN_DOMCTL_CDF_hap + | XEN_DOMCTL_CDF_s3_integrity + | XEN_DOMCTL_CDF_oos_off)) ) break; dom = op->domain; @@ -440,9 +452,15 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) rover = dom; } + if ( (op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest) + && (op->u.createdomain.flags & XEN_DOMCTL_CDF_pvh_guest) ) + return -EINVAL; + domcr_flags = 0; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest ) domcr_flags |= DOMCRF_hvm; + if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_pvh_guest ) + domcr_flags |= DOMCRF_pvh; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) domcr_flags |= DOMCRF_hap; if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_s3_integrity ) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index c9afb56..ccca5df 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -90,6 +90,9 @@ struct hvm_function_table { /* Support Hardware-Assisted Paging? */ int hap_supported; + /* Necessary hardware support for PVH mode? */ + int pvh_supported; + /* Indicate HAP capabilities. */ int hap_capabilities; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index d4e479f..01a3652 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -47,7 +47,7 @@ struct xen_domctl_createdomain { /* IN parameters */ uint32_t ssidref; xen_domain_handle_t handle; - /* Is this an HVM guest (as opposed to a PV guest)? */ + /* Is this an HVM guest (as opposed to a PVH or PV guest)? */ #define _XEN_DOMCTL_CDF_hvm_guest 0 #define XEN_DOMCTL_CDF_hvm_guest (1U<<_XEN_DOMCTL_CDF_hvm_guest) /* Use hardware-assisted paging if available? */ @@ -59,6 +59,9 @@ struct xen_domctl_createdomain { /* Disable out-of-sync shadow page tables? */ #define _XEN_DOMCTL_CDF_oos_off 3 #define XEN_DOMCTL_CDF_oos_off (1U<<_XEN_DOMCTL_CDF_oos_off) + /* Is this a PVH guest (as opposed to an HVM or PV guest)? */ +#define _XEN_DOMCTL_CDF_pvh_guest 4 +#define XEN_DOMCTL_CDF_pvh_guest (1U<<_XEN_DOMCTL_CDF_pvh_guest) uint32_t flags; }; typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; @@ -89,6 +92,9 @@ struct xen_domctl_getdomaininfo { /* Being debugged. */ #define _XEN_DOMINF_debugged 6 #define XEN_DOMINF_debugged (1U<<_XEN_DOMINF_debugged) +/* domain is PVH */ +#define _XEN_DOMINF_pvh_guest 7 +#define XEN_DOMINF_pvh_guest (1U<<_XEN_DOMINF_pvh_guest) /* XEN_DOMINF_shutdown guest-supplied code. */ #define XEN_DOMINF_shutdownmask 255 #define XEN_DOMINF_shutdownshift 16 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index a9dd15f..cbdf377 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -259,8 +259,12 @@ struct mem_event_per_domain struct evtchn_port_ops; +/* + * PVH is a PV guest running in an HVM container. is_hvm_* checks + * will be false, but has_hvm_container_* checks will be true. + */ enum guest_type { - guest_type_pv, guest_type_hvm + guest_type_pv, guest_type_pvh, guest_type_hvm }; struct domain @@ -500,6 +504,9 @@ struct domain *domain_create( /* DOMCRF_oos_off: dont use out-of-sync optimization for shadow page tables */ #define _DOMCRF_oos_off 4 #define DOMCRF_oos_off (1U<<_DOMCRF_oos_off) + /* DOMCRF_pvh: Create PV domain in HVM container. */ +#define _DOMCRF_pvh 5 +#define DOMCRF_pvh (1U<<_DOMCRF_pvh) /* * rcu_lock_domain_by_id() is more efficient than get_domain_by_id(). @@ -778,6 +785,8 @@ void watchdog_domain_destroy(struct domain *d); #define is_pv_domain(d) ((d)->guest_type == guest_type_pv) #define is_pv_vcpu(v) (is_pv_domain((v)->domain)) +#define is_pvh_domain(d) ((d)->guest_type == guest_type_pvh) +#define is_pvh_vcpu(v) (is_pvh_domain((v)->domain)) #define is_hvm_domain(d) ((d)->guest_type == guest_type_hvm) #define is_hvm_vcpu(v) (is_hvm_domain(v->domain)) #define has_hvm_container_domain(d) ((d)->guest_type != guest_type_pv) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01: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 1Vh42M-0000gY-Vb; Thu, 14 Nov 2013 21:01:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42L-0000gN-LU for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:13 +0000 Received: from [85.158.143.35:44277] by server-1.bemta-4.messagelabs.com id 40/12-02132-91A35825; Thu, 14 Nov 2013 21:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384462870!3290416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30966 invoked from network); 14 Nov 2013 21:01:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42I-0007ME-Mc for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42I-00005a-Ku for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:10 +0000 Date: Thu, 14 Nov 2013 21:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: disable unneeded features of HVM containers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4de659038341360fba21e802d2aefa8d0b79d555 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:34:35 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:34:35 2013 +0100 pvh: disable unneeded features of HVM containers Things kept: * cacheattr_region lists * irq-related structures * paging * tm_list * hvm params * hvm_domaim.io_handler (for handling PV io) Things disabled for now: * compat xlation Things disabled: * Emulated timers and clock sources * IO/MMIO ioreq pages, event channels * msix tables * hvm_funcs * nested HVM * Fast-path for emulated lapic accesses Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 43 ++++++++++++++++++++++++++++++++++++------- xen/arch/x86/hvm/irq.c | 3 +++ xen/arch/x86/hvm/vmx/intr.c | 3 ++- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2f8990e..484319f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -304,6 +304,10 @@ u64 hvm_get_guest_tsc_adjust(struct vcpu *v) void hvm_migrate_timers(struct vcpu *v) { + /* PVH doesn't use rtc and emulated timers, it uses pvclock mechanism. */ + if ( is_pvh_vcpu(v) ) + return; + rtc_migrate_timers(v); pt_migrate(v); } @@ -345,10 +349,11 @@ void hvm_do_resume(struct vcpu *v) { ioreq_t *p; - pt_restore_timer(v); - check_wakeup_from_wait(); + if ( is_hvm_vcpu(v) ) + pt_restore_timer(v); + /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ if ( !(p = get_ioreq(v)) ) goto check_inject_trap; @@ -560,6 +565,9 @@ int hvm_domain_initialise(struct domain *d) goto fail1; d->arch.hvm_domain.io_handler->num_slot = 0; + if ( is_pvh_domain(d) ) + return 0; + hvm_init_guest_time(d); d->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] = 1; @@ -600,6 +608,12 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + + if ( is_pvh_domain(d) ) + return; + if ( hvm_funcs.nhvm_domain_relinquish_resources ) hvm_funcs.nhvm_domain_relinquish_resources(d); @@ -616,14 +630,15 @@ void hvm_domain_relinquish_resources(struct domain *d) pmtimer_deinit(d); hpet_deinit(d); } - - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); } void hvm_domain_destroy(struct domain *d) { hvm_destroy_cacheattr_region_list(d); + + if ( is_pvh_domain(d) ) + return; + hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); @@ -1125,7 +1140,9 @@ int hvm_vcpu_initialise(struct vcpu *v) goto fail1; /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ - if ( (rc = vlapic_init(v)) != 0 ) /* teardown: vlapic_destroy */ + if ( is_hvm_vcpu(v) ) + rc = vlapic_init(v); + if ( rc != 0 ) /* teardown: vlapic_destroy */ goto fail2; if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) /* teardown: hvm_funcs.vcpu_destroy */ @@ -1140,6 +1157,14 @@ int hvm_vcpu_initialise(struct vcpu *v) v->arch.hvm_vcpu.inject_trap.vector = -1; + if ( is_pvh_vcpu(v) ) + { + v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ + /* This is for hvm_long_mode_enabled(v). */ + v->arch.hvm_vcpu.guest_efer = EFER_SCE | EFER_LMA | EFER_LME; + return 0; + } + rc = setup_compat_arg_xlat(v); /* teardown: free_compat_arg_xlat() */ if ( rc != 0 ) goto fail4; @@ -1211,7 +1236,10 @@ void hvm_vcpu_destroy(struct vcpu *v) tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet); hvm_vcpu_cacheattr_destroy(v); - vlapic_destroy(v); + + if ( is_hvm_vcpu(v) ) + vlapic_destroy(v); + hvm_funcs.vcpu_destroy(v); /* Event channel is already freed by evtchn_destroy(). */ @@ -1414,6 +1442,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, * a fast path for LAPIC accesses, skipping the p2m lookup. */ if ( !nestedhvm_vcpu_in_guestmode(v) + && is_hvm_vcpu(v) && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(v))) ) { if ( !handle_mmio() ) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 6a6fb68..677fbcd 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -405,6 +405,9 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) && vcpu_info(v, evtchn_upcall_pending) ) return hvm_intack_vector(plat->irq.callback_via.vector); + if ( is_pvh_vcpu(v) ) + return hvm_intack_none; + if ( vlapic_accept_pic_intr(v) && plat->vpic[0].int_output ) return hvm_intack_pic(0); diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 1942e31..7757910 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -236,7 +236,8 @@ void vmx_intr_assist(void) } /* Crank the handle on interrupt state. */ - pt_vector = pt_update_irq(v); + if ( is_hvm_vcpu(v) ) + pt_vector = pt_update_irq(v); do { unsigned long intr_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 Thu Nov 14 21:01:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01: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 1Vh42M-0000gY-Vb; Thu, 14 Nov 2013 21:01:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42L-0000gN-LU for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:13 +0000 Received: from [85.158.143.35:44277] by server-1.bemta-4.messagelabs.com id 40/12-02132-91A35825; Thu, 14 Nov 2013 21:01:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384462870!3290416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30966 invoked from network); 14 Nov 2013 21:01:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42I-0007ME-Mc for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42I-00005a-Ku for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:10 +0000 Date: Thu, 14 Nov 2013 21:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: disable unneeded features of HVM containers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4de659038341360fba21e802d2aefa8d0b79d555 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:34:35 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:34:35 2013 +0100 pvh: disable unneeded features of HVM containers Things kept: * cacheattr_region lists * irq-related structures * paging * tm_list * hvm params * hvm_domaim.io_handler (for handling PV io) Things disabled for now: * compat xlation Things disabled: * Emulated timers and clock sources * IO/MMIO ioreq pages, event channels * msix tables * hvm_funcs * nested HVM * Fast-path for emulated lapic accesses Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 43 ++++++++++++++++++++++++++++++++++++------- xen/arch/x86/hvm/irq.c | 3 +++ xen/arch/x86/hvm/vmx/intr.c | 3 ++- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2f8990e..484319f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -304,6 +304,10 @@ u64 hvm_get_guest_tsc_adjust(struct vcpu *v) void hvm_migrate_timers(struct vcpu *v) { + /* PVH doesn't use rtc and emulated timers, it uses pvclock mechanism. */ + if ( is_pvh_vcpu(v) ) + return; + rtc_migrate_timers(v); pt_migrate(v); } @@ -345,10 +349,11 @@ void hvm_do_resume(struct vcpu *v) { ioreq_t *p; - pt_restore_timer(v); - check_wakeup_from_wait(); + if ( is_hvm_vcpu(v) ) + pt_restore_timer(v); + /* NB. Optimised for common case (p->state == STATE_IOREQ_NONE). */ if ( !(p = get_ioreq(v)) ) goto check_inject_trap; @@ -560,6 +565,9 @@ int hvm_domain_initialise(struct domain *d) goto fail1; d->arch.hvm_domain.io_handler->num_slot = 0; + if ( is_pvh_domain(d) ) + return 0; + hvm_init_guest_time(d); d->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] = 1; @@ -600,6 +608,12 @@ int hvm_domain_initialise(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { + xfree(d->arch.hvm_domain.io_handler); + xfree(d->arch.hvm_domain.params); + + if ( is_pvh_domain(d) ) + return; + if ( hvm_funcs.nhvm_domain_relinquish_resources ) hvm_funcs.nhvm_domain_relinquish_resources(d); @@ -616,14 +630,15 @@ void hvm_domain_relinquish_resources(struct domain *d) pmtimer_deinit(d); hpet_deinit(d); } - - xfree(d->arch.hvm_domain.io_handler); - xfree(d->arch.hvm_domain.params); } void hvm_domain_destroy(struct domain *d) { hvm_destroy_cacheattr_region_list(d); + + if ( is_pvh_domain(d) ) + return; + hvm_funcs.domain_destroy(d); rtc_deinit(d); stdvga_deinit(d); @@ -1125,7 +1140,9 @@ int hvm_vcpu_initialise(struct vcpu *v) goto fail1; /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ - if ( (rc = vlapic_init(v)) != 0 ) /* teardown: vlapic_destroy */ + if ( is_hvm_vcpu(v) ) + rc = vlapic_init(v); + if ( rc != 0 ) /* teardown: vlapic_destroy */ goto fail2; if ( (rc = hvm_funcs.vcpu_initialise(v)) != 0 ) /* teardown: hvm_funcs.vcpu_destroy */ @@ -1140,6 +1157,14 @@ int hvm_vcpu_initialise(struct vcpu *v) v->arch.hvm_vcpu.inject_trap.vector = -1; + if ( is_pvh_vcpu(v) ) + { + v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ + /* This is for hvm_long_mode_enabled(v). */ + v->arch.hvm_vcpu.guest_efer = EFER_SCE | EFER_LMA | EFER_LME; + return 0; + } + rc = setup_compat_arg_xlat(v); /* teardown: free_compat_arg_xlat() */ if ( rc != 0 ) goto fail4; @@ -1211,7 +1236,10 @@ void hvm_vcpu_destroy(struct vcpu *v) tasklet_kill(&v->arch.hvm_vcpu.assert_evtchn_irq_tasklet); hvm_vcpu_cacheattr_destroy(v); - vlapic_destroy(v); + + if ( is_hvm_vcpu(v) ) + vlapic_destroy(v); + hvm_funcs.vcpu_destroy(v); /* Event channel is already freed by evtchn_destroy(). */ @@ -1414,6 +1442,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, * a fast path for LAPIC accesses, skipping the p2m lookup. */ if ( !nestedhvm_vcpu_in_guestmode(v) + && is_hvm_vcpu(v) && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(v))) ) { if ( !handle_mmio() ) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 6a6fb68..677fbcd 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -405,6 +405,9 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) && vcpu_info(v, evtchn_upcall_pending) ) return hvm_intack_vector(plat->irq.callback_via.vector); + if ( is_pvh_vcpu(v) ) + return hvm_intack_none; + if ( vlapic_accept_pic_intr(v) && plat->vpic[0].int_output ) return hvm_intack_pic(0); diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 1942e31..7757910 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -236,7 +236,8 @@ void vmx_intr_assist(void) } /* Crank the handle on interrupt state. */ - pt_vector = pt_update_irq(v); + if ( is_hvm_vcpu(v) ) + pt_vector = pt_update_irq(v); do { unsigned long intr_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 Thu Nov 14 21:01:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01: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 1Vh42X-0000hf-3n; Thu, 14 Nov 2013 21:01:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42W-0000hV-7I for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:24 +0000 Received: from [193.109.254.147:43185] by server-8.bemta-14.messagelabs.com id 2C/23-03701-32A35825; Thu, 14 Nov 2013 21:01:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1384462881!2857137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16304 invoked from network); 14 Nov 2013 21:01:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42S-0007MN-Ra for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42S-00006f-QA for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:20 +0000 Date: Thu, 14 Nov 2013 21:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: vmx-specific changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5847255bed399c8b12b14d3dcfdfb21124a8b0 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:35:20 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:35:20 2013 +0100 pvh: vmx-specific changes Changes: * Enforce HAP mode for now * Disable exits related to virtual interrupts or emulated APICs * Disable changing paging mode - "unrestricted guest" (i.e., real mode for EPT) disabled - write guest EFER disabled * Start in 64-bit mode * Paging mode update to happen in arch_set_info_guest Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmcs.c | 55 +++++++++++++++++++++++++++++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 6 ++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 2f7c238..290b42f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -896,7 +897,29 @@ static int construct_vmcs(struct vcpu *v) /* Do not enable Monitor Trap Flag unless start single step debug */ v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MONITOR_TRAP_FLAG; + if ( is_pvh_domain(d) ) + { + /* Disable virtual apics, TPR */ + v->arch.hvm_vmx.secondary_exec_control &= + ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES + | SECONDARY_EXEC_APIC_REGISTER_VIRT + | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); + v->arch.hvm_vmx.exec_control &= ~CPU_BASED_TPR_SHADOW; + + /* Unrestricted guest (real mode for EPT) */ + v->arch.hvm_vmx.secondary_exec_control &= + ~SECONDARY_EXEC_UNRESTRICTED_GUEST; + + /* Start in 64-bit mode. PVH 32bitfixme. */ + vmentry_ctl |= VM_ENTRY_IA32E_MODE; /* GUEST_EFER.LME/LMA ignored */ + + ASSERT(v->arch.hvm_vmx.exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS); + ASSERT(v->arch.hvm_vmx.exec_control & CPU_BASED_ACTIVATE_MSR_BITMAP); + ASSERT(!(v->arch.hvm_vmx.exec_control & CPU_BASED_RDTSC_EXITING)); + } + vmx_update_cpu_exec_control(v); + __vmwrite(VM_EXIT_CONTROLS, vmexit_ctl); __vmwrite(VM_ENTRY_CONTROLS, vmentry_ctl); @@ -1020,7 +1043,11 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(GUEST_DS_AR_BYTES, 0xc093); __vmwrite(GUEST_FS_AR_BYTES, 0xc093); __vmwrite(GUEST_GS_AR_BYTES, 0xc093); - __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ + if ( is_pvh_domain(d) ) + /* CS.L == 1, exec, read/write, accessed. PVH 32bitfixme. */ + __vmwrite(GUEST_CS_AR_BYTES, 0xa09b); + else + __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ /* Guest IDT. */ __vmwrite(GUEST_IDTR_BASE, 0); @@ -1050,10 +1077,25 @@ static int construct_vmcs(struct vcpu *v) | (1U << TRAP_no_device); vmx_update_exception_bitmap(v); + /* + * In HVM domains, this happens on the realmode->paging + * transition. Since PVH never goes through this transition, we + * need to do it at start-of-day. + */ + if ( is_pvh_domain(d) ) + vmx_update_debug_state(v); + v->arch.hvm_vcpu.guest_cr[0] = X86_CR0_PE | X86_CR0_ET; + + /* PVH domains always start in paging mode */ + if ( is_pvh_domain(d) ) + v->arch.hvm_vcpu.guest_cr[0] |= X86_CR0_PG | X86_CR0_NE | X86_CR0_WP; + hvm_update_guest_cr(v, 0); - v->arch.hvm_vcpu.guest_cr[4] = 0; + v->arch.hvm_vcpu.guest_cr[4] = is_pvh_domain(d) ? + (real_cr4_to_pv_guest_cr4(mmu_cr4_features) + & ~HVM_CR4_GUEST_RESERVED_BITS(v)) : 0; hvm_update_guest_cr(v, 4); if ( cpu_has_vmx_tpr_shadow ) @@ -1085,9 +1127,14 @@ static int construct_vmcs(struct vcpu *v) vmx_vmcs_exit(v); - paging_update_paging_modes(v); /* will update HOST & GUEST_CR3 as reqd */ + /* PVH: paging mode is updated by arch_set_info_guest(). */ + if ( is_hvm_vcpu(v) ) + { + /* will update HOST & GUEST_CR3 as reqd */ + paging_update_paging_modes(v); - vmx_vlapic_msr_changed(v); + vmx_vlapic_msr_changed(v); + } return 0; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8d451d4..5e92dbe 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1691,6 +1691,12 @@ const struct hvm_function_table * __init start_vmx(void) vmx_function_table.sync_pir_to_irr = NULL; } + if ( cpu_has_vmx_ept + && cpu_has_vmx_pat + && cpu_has_vmx_msr_bitmap + && cpu_has_vmx_secondary_exec_control ) + vmx_function_table.pvh_supported = 1; + setup_vmcs_dump(); return &vmx_function_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 Thu Nov 14 21:01:25 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01: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 1Vh42X-0000hf-3n; Thu, 14 Nov 2013 21:01:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42W-0000hV-7I for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:24 +0000 Received: from [193.109.254.147:43185] by server-8.bemta-14.messagelabs.com id 2C/23-03701-32A35825; Thu, 14 Nov 2013 21:01:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1384462881!2857137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16304 invoked from network); 14 Nov 2013 21:01:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42S-0007MN-Ra for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42S-00006f-QA for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:20 +0000 Date: Thu, 14 Nov 2013 21:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: vmx-specific changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e5847255bed399c8b12b14d3dcfdfb21124a8b0 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:35:20 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:35:20 2013 +0100 pvh: vmx-specific changes Changes: * Enforce HAP mode for now * Disable exits related to virtual interrupts or emulated APICs * Disable changing paging mode - "unrestricted guest" (i.e., real mode for EPT) disabled - write guest EFER disabled * Start in 64-bit mode * Paging mode update to happen in arch_set_info_guest Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmcs.c | 55 +++++++++++++++++++++++++++++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 6 ++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 2f7c238..290b42f 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -896,7 +897,29 @@ static int construct_vmcs(struct vcpu *v) /* Do not enable Monitor Trap Flag unless start single step debug */ v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MONITOR_TRAP_FLAG; + if ( is_pvh_domain(d) ) + { + /* Disable virtual apics, TPR */ + v->arch.hvm_vmx.secondary_exec_control &= + ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES + | SECONDARY_EXEC_APIC_REGISTER_VIRT + | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY); + v->arch.hvm_vmx.exec_control &= ~CPU_BASED_TPR_SHADOW; + + /* Unrestricted guest (real mode for EPT) */ + v->arch.hvm_vmx.secondary_exec_control &= + ~SECONDARY_EXEC_UNRESTRICTED_GUEST; + + /* Start in 64-bit mode. PVH 32bitfixme. */ + vmentry_ctl |= VM_ENTRY_IA32E_MODE; /* GUEST_EFER.LME/LMA ignored */ + + ASSERT(v->arch.hvm_vmx.exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS); + ASSERT(v->arch.hvm_vmx.exec_control & CPU_BASED_ACTIVATE_MSR_BITMAP); + ASSERT(!(v->arch.hvm_vmx.exec_control & CPU_BASED_RDTSC_EXITING)); + } + vmx_update_cpu_exec_control(v); + __vmwrite(VM_EXIT_CONTROLS, vmexit_ctl); __vmwrite(VM_ENTRY_CONTROLS, vmentry_ctl); @@ -1020,7 +1043,11 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(GUEST_DS_AR_BYTES, 0xc093); __vmwrite(GUEST_FS_AR_BYTES, 0xc093); __vmwrite(GUEST_GS_AR_BYTES, 0xc093); - __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ + if ( is_pvh_domain(d) ) + /* CS.L == 1, exec, read/write, accessed. PVH 32bitfixme. */ + __vmwrite(GUEST_CS_AR_BYTES, 0xa09b); + else + __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ /* Guest IDT. */ __vmwrite(GUEST_IDTR_BASE, 0); @@ -1050,10 +1077,25 @@ static int construct_vmcs(struct vcpu *v) | (1U << TRAP_no_device); vmx_update_exception_bitmap(v); + /* + * In HVM domains, this happens on the realmode->paging + * transition. Since PVH never goes through this transition, we + * need to do it at start-of-day. + */ + if ( is_pvh_domain(d) ) + vmx_update_debug_state(v); + v->arch.hvm_vcpu.guest_cr[0] = X86_CR0_PE | X86_CR0_ET; + + /* PVH domains always start in paging mode */ + if ( is_pvh_domain(d) ) + v->arch.hvm_vcpu.guest_cr[0] |= X86_CR0_PG | X86_CR0_NE | X86_CR0_WP; + hvm_update_guest_cr(v, 0); - v->arch.hvm_vcpu.guest_cr[4] = 0; + v->arch.hvm_vcpu.guest_cr[4] = is_pvh_domain(d) ? + (real_cr4_to_pv_guest_cr4(mmu_cr4_features) + & ~HVM_CR4_GUEST_RESERVED_BITS(v)) : 0; hvm_update_guest_cr(v, 4); if ( cpu_has_vmx_tpr_shadow ) @@ -1085,9 +1127,14 @@ static int construct_vmcs(struct vcpu *v) vmx_vmcs_exit(v); - paging_update_paging_modes(v); /* will update HOST & GUEST_CR3 as reqd */ + /* PVH: paging mode is updated by arch_set_info_guest(). */ + if ( is_hvm_vcpu(v) ) + { + /* will update HOST & GUEST_CR3 as reqd */ + paging_update_paging_modes(v); - vmx_vlapic_msr_changed(v); + vmx_vlapic_msr_changed(v); + } return 0; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8d451d4..5e92dbe 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1691,6 +1691,12 @@ const struct hvm_function_table * __init start_vmx(void) vmx_function_table.sync_pir_to_irr = NULL; } + if ( cpu_has_vmx_ept + && cpu_has_vmx_pat + && cpu_has_vmx_msr_bitmap + && cpu_has_vmx_secondary_exec_control ) + vmx_function_table.pvh_supported = 1; + setup_vmcs_dump(); return &vmx_function_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 Thu Nov 14 21:01:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42h-0000j3-6t; Thu, 14 Nov 2013 21:01:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42f-0000iq-JD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:33 +0000 Received: from [85.158.137.68:9286] by server-9.bemta-3.messagelabs.com id A7/1B-21272-C2A35825; Thu, 14 Nov 2013 21:01:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384462891!1560915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17395 invoked from network); 14 Nov 2013 21:01:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42d-0007MV-0r for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42c-000078-Vd for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:30 +0000 Date: Thu, 14 Nov 2013 21:01:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: do not allow PVH guests to change paging modes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9001eb540b815110302505cfd799f1356f40e47f Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:35:58 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:35:58 2013 +0100 pvh: do not allow PVH guests to change paging modes Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 484319f..4df46be 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1818,6 +1818,15 @@ int hvm_set_cr0(unsigned long value) (value & (X86_CR0_PE | X86_CR0_PG)) == X86_CR0_PG ) goto gpf; + /* A pvh is not expected to change to real mode. */ + if ( is_pvh_vcpu(v) + && (value & (X86_CR0_PE | X86_CR0_PG)) != (X86_CR0_PG | X86_CR0_PE) ) + { + printk(XENLOG_G_WARNING + "PVH attempting to turn off PE/PG. CR0:%lx\n", value); + goto gpf; + } + if ( (value & X86_CR0_PG) && !(old_value & X86_CR0_PG) ) { if ( v->arch.hvm_vcpu.guest_efer & EFER_LME ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42h-0000j3-6t; Thu, 14 Nov 2013 21:01:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42f-0000iq-JD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:33 +0000 Received: from [85.158.137.68:9286] by server-9.bemta-3.messagelabs.com id A7/1B-21272-C2A35825; Thu, 14 Nov 2013 21:01:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1384462891!1560915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17395 invoked from network); 14 Nov 2013 21:01:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42d-0007MV-0r for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42c-000078-Vd for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:30 +0000 Date: Thu, 14 Nov 2013 21:01:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: do not allow PVH guests to change paging modes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9001eb540b815110302505cfd799f1356f40e47f Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:35:58 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:35:58 2013 +0100 pvh: do not allow PVH guests to change paging modes Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 484319f..4df46be 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1818,6 +1818,15 @@ int hvm_set_cr0(unsigned long value) (value & (X86_CR0_PE | X86_CR0_PG)) == X86_CR0_PG ) goto gpf; + /* A pvh is not expected to change to real mode. */ + if ( is_pvh_vcpu(v) + && (value & (X86_CR0_PE | X86_CR0_PG)) != (X86_CR0_PG | X86_CR0_PE) ) + { + printk(XENLOG_G_WARNING + "PVH attempting to turn off PE/PG. CR0:%lx\n", value); + goto gpf; + } + if ( (value & X86_CR0_PG) && !(old_value & X86_CR0_PG) ) { if ( v->arch.hvm_vcpu.guest_efer & EFER_LME ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42s-0000kZ-BH; Thu, 14 Nov 2013 21: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 1Vh42q-0000kQ-Go for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:44 +0000 Received: from [85.158.139.211:42413] by server-10.bemta-5.messagelabs.com id 4B/40-28640-73A35825; Thu, 14 Nov 2013 21:01:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384462901!2092085!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15671 invoked from network); 14 Nov 2013 21:01:42 -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; 14 Nov 2013 21:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42n-0007Me-7O for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42n-00007X-5g for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:41 +0000 Date: Thu, 14 Nov 2013 21:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: access to 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 2204b1ce06ac61aec143f71e555fbf480a898c8c Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:36:32 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:36:32 2013 +0100 pvh: access to hypercalls Hypercalls where we now have unrestricted access: * memory_op * console_io * vcpu_op * mmuext_op We also restrict PVH domain access to HVMOP_*_param to reading and writing HVM_PARAM_CALLBACK_IRQ. Most hvm_op functions require "is_hvm_domain()" and will default to -EINVAL; exceptions are HVMOP_get_time and HVMOP_xentrace. Finally, we restrict setting IOPL permissions for a PVH domain. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 44 ++++++++++++++++++++++++++++++++++++-------- xen/arch/x86/physdev.c | 10 ++++++++++ xen/common/kernel.c | 14 ++++++++++++-- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4df46be..4bd4372 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3413,6 +3413,24 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(tmem_op) }; +/* PVH 32bitfixme. */ +static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { + HYPERCALL(platform_op), + HYPERCALL(memory_op), + HYPERCALL(xen_version), + HYPERCALL(console_io), + [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op, + HYPERCALL(vcpu_op), + HYPERCALL(mmuext_op), + HYPERCALL(xsm_op), + HYPERCALL(sched_op), + HYPERCALL(event_channel_op), + [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op, + HYPERCALL(hvm_op), + HYPERCALL(sysctl), + HYPERCALL(domctl) +}; + int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; @@ -3439,7 +3457,9 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) ) return viridian_hypercall(regs); - if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] ) + if ( (eax >= NR_hypercalls) || + (is_pvh_vcpu(curr) ? !pvh_hypercall64_table[eax] + : !hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -3454,16 +3474,20 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r10, regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = hvm_hypercall64_table[eax](regs->rdi, - regs->rsi, - regs->rdx, - regs->r10, - regs->r8, - regs->r9); + if ( is_pvh_vcpu(curr) ) + regs->rax = pvh_hypercall64_table[eax](regs->rdi, regs->rsi, + regs->rdx, regs->r10, + regs->r8, regs->r9); + else + regs->rax = hvm_hypercall64_table[eax](regs->rdi, regs->rsi, + regs->rdx, regs->r10, + regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } else { + ASSERT(!is_pvh_vcpu(curr)); /* PVH 32bitfixme. */ + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%x, %x, %x, %x, %x, %x)", eax, (uint32_t)regs->ebx, (uint32_t)regs->ecx, (uint32_t)regs->edx, (uint32_t)regs->esi, @@ -3888,7 +3912,11 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) return -ESRCH; rc = -EINVAL; - if ( !is_hvm_domain(d) ) + if ( !has_hvm_container_domain(d) ) + goto param_fail; + + if ( is_pvh_domain(d) + && (a.index != HVM_PARAM_CALLBACK_IRQ) ) goto param_fail; rc = xsm_hvm_param(XSM_TARGET, d, op); diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index dab6213..1040b2c 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -519,6 +519,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_set_iopl: { struct physdev_set_iopl set_iopl; + + ret = -ENOSYS; + if ( is_pvh_vcpu(current) ) + break; + ret = -EFAULT; if ( copy_from_guest(&set_iopl, arg, 1) != 0 ) break; @@ -532,6 +537,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_set_iobitmap: { struct physdev_set_iobitmap set_iobitmap; + + ret = -ENOSYS; + if ( is_pvh_vcpu(current) ) + break; + ret = -EFAULT; if ( copy_from_guest(&set_iobitmap, arg, 1) != 0 ) break; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 97d9050..b371f8f 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -306,14 +306,24 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( current->domain == dom0 ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 - if ( is_pv_vcpu(current) ) + switch ( d->guest_type ) + { + case guest_type_pv: fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits); - else + break; + case guest_type_pvh: + fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | + (1U << XENFEAT_supervisor_mode_kernel) | + (1U << XENFEAT_hvm_callback_vector); + break; + case guest_type_hvm: fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | (1U << XENFEAT_hvm_callback_vector) | (1U << XENFEAT_hvm_pirqs); + break; + } #endif break; default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42s-0000kZ-BH; Thu, 14 Nov 2013 21: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 1Vh42q-0000kQ-Go for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:44 +0000 Received: from [85.158.139.211:42413] by server-10.bemta-5.messagelabs.com id 4B/40-28640-73A35825; Thu, 14 Nov 2013 21:01:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384462901!2092085!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15671 invoked from network); 14 Nov 2013 21:01:42 -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; 14 Nov 2013 21:01:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42n-0007Me-7O for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42n-00007X-5g for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:41 +0000 Date: Thu, 14 Nov 2013 21:01:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: access to 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 2204b1ce06ac61aec143f71e555fbf480a898c8c Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:36:32 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:36:32 2013 +0100 pvh: access to hypercalls Hypercalls where we now have unrestricted access: * memory_op * console_io * vcpu_op * mmuext_op We also restrict PVH domain access to HVMOP_*_param to reading and writing HVM_PARAM_CALLBACK_IRQ. Most hvm_op functions require "is_hvm_domain()" and will default to -EINVAL; exceptions are HVMOP_get_time and HVMOP_xentrace. Finally, we restrict setting IOPL permissions for a PVH domain. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 44 ++++++++++++++++++++++++++++++++++++-------- xen/arch/x86/physdev.c | 10 ++++++++++ xen/common/kernel.c | 14 ++++++++++++-- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4df46be..4bd4372 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3413,6 +3413,24 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(tmem_op) }; +/* PVH 32bitfixme. */ +static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { + HYPERCALL(platform_op), + HYPERCALL(memory_op), + HYPERCALL(xen_version), + HYPERCALL(console_io), + [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op, + HYPERCALL(vcpu_op), + HYPERCALL(mmuext_op), + HYPERCALL(xsm_op), + HYPERCALL(sched_op), + HYPERCALL(event_channel_op), + [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op, + HYPERCALL(hvm_op), + HYPERCALL(sysctl), + HYPERCALL(domctl) +}; + int hvm_do_hypercall(struct cpu_user_regs *regs) { struct vcpu *curr = current; @@ -3439,7 +3457,9 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) ) return viridian_hypercall(regs); - if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] ) + if ( (eax >= NR_hypercalls) || + (is_pvh_vcpu(curr) ? !pvh_hypercall64_table[eax] + : !hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -3454,16 +3474,20 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r10, regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = hvm_hypercall64_table[eax](regs->rdi, - regs->rsi, - regs->rdx, - regs->r10, - regs->r8, - regs->r9); + if ( is_pvh_vcpu(curr) ) + regs->rax = pvh_hypercall64_table[eax](regs->rdi, regs->rsi, + regs->rdx, regs->r10, + regs->r8, regs->r9); + else + regs->rax = hvm_hypercall64_table[eax](regs->rdi, regs->rsi, + regs->rdx, regs->r10, + regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } else { + ASSERT(!is_pvh_vcpu(curr)); /* PVH 32bitfixme. */ + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%u(%x, %x, %x, %x, %x, %x)", eax, (uint32_t)regs->ebx, (uint32_t)regs->ecx, (uint32_t)regs->edx, (uint32_t)regs->esi, @@ -3888,7 +3912,11 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) return -ESRCH; rc = -EINVAL; - if ( !is_hvm_domain(d) ) + if ( !has_hvm_container_domain(d) ) + goto param_fail; + + if ( is_pvh_domain(d) + && (a.index != HVM_PARAM_CALLBACK_IRQ) ) goto param_fail; rc = xsm_hvm_param(XSM_TARGET, d, op); diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index dab6213..1040b2c 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -519,6 +519,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_set_iopl: { struct physdev_set_iopl set_iopl; + + ret = -ENOSYS; + if ( is_pvh_vcpu(current) ) + break; + ret = -EFAULT; if ( copy_from_guest(&set_iopl, arg, 1) != 0 ) break; @@ -532,6 +537,11 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_set_iobitmap: { struct physdev_set_iobitmap set_iobitmap; + + ret = -ENOSYS; + if ( is_pvh_vcpu(current) ) + break; + ret = -EFAULT; if ( copy_from_guest(&set_iobitmap, arg, 1) != 0 ) break; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 97d9050..b371f8f 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -306,14 +306,24 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( current->domain == dom0 ) fi.submap |= 1U << XENFEAT_dom0; #ifdef CONFIG_X86 - if ( is_pv_vcpu(current) ) + switch ( d->guest_type ) + { + case guest_type_pv: fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits); - else + break; + case guest_type_pvh: + fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | + (1U << XENFEAT_supervisor_mode_kernel) | + (1U << XENFEAT_hvm_callback_vector); + break; + case guest_type_hvm: fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | (1U << XENFEAT_hvm_callback_vector) | (1U << XENFEAT_hvm_pirqs); + break; + } #endif break; default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh431-0000mV-KG; Thu, 14 Nov 2013 21:01:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh430-0000mI-5l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:54 +0000 Received: from [85.158.139.211:48210] by server-16.bemta-5.messagelabs.com id 09/F4-17144-14A35825; Thu, 14 Nov 2013 21:01:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384462911!2030470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27531 invoked from network); 14 Nov 2013 21:01:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42x-0007Mk-Dx for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42x-00007t-C6 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:51 +0000 Date: Thu, 14 Nov 2013 21:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: use PV e820 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd132e2c4d840d2c8b7ce0b9aa910c3ef0ab782a Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:37:01 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:37:01 2013 +0100 pvh: use PV e820 Allow PV e820 map to be set and read from a PVH domain. This requires moving the pv e820 struct out from the pv-specific domain struct and into the arch domain struct. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 9 +++------ xen/arch/x86/mm.c | 26 ++++++++++++-------------- xen/include/asm-x86/domain.h | 10 +++++----- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 358616c..8c2a57f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -553,6 +553,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = iommu_domain_init(d)) != 0 ) goto fail; } + spin_lock_init(&d->arch.e820_lock); if ( has_hvm_container_domain(d) ) { @@ -563,13 +564,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } } else - { /* 64-bit PV guest by default. */ d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; - spin_lock_init(&d->arch.pv_domain.e820_lock); - } - /* initialize default tsc behavior in case tools don't */ tsc_set_info(d, TSC_MODE_DEFAULT, 0UL, 0, 0); spin_lock_init(&d->arch.vtsc_lock); @@ -592,8 +589,8 @@ void arch_domain_destroy(struct domain *d) { if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); - else - xfree(d->arch.pv_domain.e820); + + xfree(d->arch.e820); free_domain_pirqs(d); if ( !is_idle_domain(d) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9621e22..6c26026 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4759,11 +4759,11 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; } - spin_lock(&d->arch.pv_domain.e820_lock); - xfree(d->arch.pv_domain.e820); - d->arch.pv_domain.e820 = e820; - d->arch.pv_domain.nr_e820 = fmap.map.nr_entries; - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_lock(&d->arch.e820_lock); + xfree(d->arch.e820); + d->arch.e820 = e820; + d->arch.nr_e820 = fmap.map.nr_entries; + spin_unlock(&d->arch.e820_lock); rcu_unlock_domain(d); return rc; @@ -4777,26 +4777,24 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&map, arg, 1) ) return -EFAULT; - spin_lock(&d->arch.pv_domain.e820_lock); + spin_lock(&d->arch.e820_lock); /* Backwards compatibility. */ - if ( (d->arch.pv_domain.nr_e820 == 0) || - (d->arch.pv_domain.e820 == NULL) ) + if ( (d->arch.nr_e820 == 0) || (d->arch.e820 == NULL) ) { - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return -ENOSYS; } - map.nr_entries = min(map.nr_entries, d->arch.pv_domain.nr_e820); - if ( copy_to_guest(map.buffer, d->arch.pv_domain.e820, - map.nr_entries) || + map.nr_entries = min(map.nr_entries, d->arch.nr_e820); + if ( copy_to_guest(map.buffer, d->arch.e820, map.nr_entries) || __copy_to_guest(arg, &map, 1) ) { - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return -EFAULT; } - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return 0; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9b20268..9d39061 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -234,11 +234,6 @@ struct pv_domain /* map_domain_page() mapping cache. */ struct mapcache_domain mapcache; - - /* Pseudophysical e820 map (XENMEM_memory_map). */ - spinlock_t e820_lock; - struct e820entry *e820; - unsigned int nr_e820; }; struct arch_domain @@ -313,6 +308,11 @@ struct arch_domain (possibly other cases in the future */ uint64_t vtsc_kerncount; /* for hvm, counts all vtsc */ uint64_t vtsc_usercount; /* not used for hvm */ + + /* Pseudophysical e820 map (XENMEM_memory_map). */ + spinlock_t e820_lock; + struct e820entry *e820; + unsigned int nr_e820; } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:01:55 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh431-0000mV-KG; Thu, 14 Nov 2013 21:01:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh430-0000mI-5l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:54 +0000 Received: from [85.158.139.211:48210] by server-16.bemta-5.messagelabs.com id 09/F4-17144-14A35825; Thu, 14 Nov 2013 21:01:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384462911!2030470!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27531 invoked from network); 14 Nov 2013 21:01:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:01:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh42x-0007Mk-Dx for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh42x-00007t-C6 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:01:51 +0000 Date: Thu, 14 Nov 2013 21:01:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: use PV e820 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cd132e2c4d840d2c8b7ce0b9aa910c3ef0ab782a Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:37:01 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:37:01 2013 +0100 pvh: use PV e820 Allow PV e820 map to be set and read from a PVH domain. This requires moving the pv e820 struct out from the pv-specific domain struct and into the arch domain struct. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 9 +++------ xen/arch/x86/mm.c | 26 ++++++++++++-------------- xen/include/asm-x86/domain.h | 10 +++++----- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 358616c..8c2a57f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -553,6 +553,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = iommu_domain_init(d)) != 0 ) goto fail; } + spin_lock_init(&d->arch.e820_lock); if ( has_hvm_container_domain(d) ) { @@ -563,13 +564,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) } } else - { /* 64-bit PV guest by default. */ d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; - spin_lock_init(&d->arch.pv_domain.e820_lock); - } - /* initialize default tsc behavior in case tools don't */ tsc_set_info(d, TSC_MODE_DEFAULT, 0UL, 0, 0); spin_lock_init(&d->arch.vtsc_lock); @@ -592,8 +589,8 @@ void arch_domain_destroy(struct domain *d) { if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); - else - xfree(d->arch.pv_domain.e820); + + xfree(d->arch.e820); free_domain_pirqs(d); if ( !is_idle_domain(d) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9621e22..6c26026 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4759,11 +4759,11 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; } - spin_lock(&d->arch.pv_domain.e820_lock); - xfree(d->arch.pv_domain.e820); - d->arch.pv_domain.e820 = e820; - d->arch.pv_domain.nr_e820 = fmap.map.nr_entries; - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_lock(&d->arch.e820_lock); + xfree(d->arch.e820); + d->arch.e820 = e820; + d->arch.nr_e820 = fmap.map.nr_entries; + spin_unlock(&d->arch.e820_lock); rcu_unlock_domain(d); return rc; @@ -4777,26 +4777,24 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&map, arg, 1) ) return -EFAULT; - spin_lock(&d->arch.pv_domain.e820_lock); + spin_lock(&d->arch.e820_lock); /* Backwards compatibility. */ - if ( (d->arch.pv_domain.nr_e820 == 0) || - (d->arch.pv_domain.e820 == NULL) ) + if ( (d->arch.nr_e820 == 0) || (d->arch.e820 == NULL) ) { - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return -ENOSYS; } - map.nr_entries = min(map.nr_entries, d->arch.pv_domain.nr_e820); - if ( copy_to_guest(map.buffer, d->arch.pv_domain.e820, - map.nr_entries) || + map.nr_entries = min(map.nr_entries, d->arch.nr_e820); + if ( copy_to_guest(map.buffer, d->arch.e820, map.nr_entries) || __copy_to_guest(arg, &map, 1) ) { - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return -EFAULT; } - spin_unlock(&d->arch.pv_domain.e820_lock); + spin_unlock(&d->arch.e820_lock); return 0; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9b20268..9d39061 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -234,11 +234,6 @@ struct pv_domain /* map_domain_page() mapping cache. */ struct mapcache_domain mapcache; - - /* Pseudophysical e820 map (XENMEM_memory_map). */ - spinlock_t e820_lock; - struct e820entry *e820; - unsigned int nr_e820; }; struct arch_domain @@ -313,6 +308,11 @@ struct arch_domain (possibly other cases in the future */ uint64_t vtsc_kerncount; /* for hvm, counts all vtsc */ uint64_t vtsc_usercount; /* not used for hvm */ + + /* Pseudophysical e820 map (XENMEM_memory_map). */ + spinlock_t e820_lock; + struct e820entry *e820; + unsigned int nr_e820; } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02: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 1Vh43B-0000nx-Mz; Thu, 14 Nov 2013 21:02:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43A-0000nj-FE for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:04 +0000 Received: from [85.158.137.68:6580] by server-3.bemta-3.messagelabs.com id EC/1E-03862-B4A35825; Thu, 14 Nov 2013 21:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1384462921!1618134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9539 invoked from network); 14 Nov 2013 21:02:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh437-0007Mt-KF for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh437-00008P-Ip for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:01 +0000 Date: Thu, 14 Nov 2013 21:02:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: set up more PV stuff in set_info_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 35b1e076497ce80f9ab2a46257dd015dad132014 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:37:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:37:51 2013 +0100 pvh: set up more PV stuff in set_info_guest Allow the guest to set up a few more things when bringing up a vcpu. This includes cr3 and gs_base. Also set up wallclock, and only initialize a vcpu once. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 36 ++++++++++++++++++++++++++++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 +++++- xen/include/asm-x86/hvm/hvm.h | 6 +++--- xen/include/public/arch-x86/xen.h | 11 +++++++++++ 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8c2a57f..5ec992d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -691,6 +691,17 @@ int arch_set_info_guest( (c(ldt_ents) > 8192) ) return -EINVAL; } + else if ( is_pvh_vcpu(v) ) + { + /* PVH 32bitfixme */ + ASSERT(!compat); + + if ( c(ctrlreg[1]) || c(ldt_base) || c(ldt_ents) || + c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || + c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || + c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) + return -EINVAL; + } v->fpu_initialised = !!(flags & VGCF_I387_VALID); @@ -728,8 +739,28 @@ int arch_set_info_guest( if ( has_hvm_container_vcpu(v) ) { - hvm_set_info_guest(v); - goto out; + /* + * NB: TF_kernel_mode is set unconditionally for HVM guests, + * so we always use the gs_base_kernel here. If we change this + * function to imitate the PV functionality, we'll need to + * make it pay attention to the kernel bit. + */ + hvm_set_info_guest(v, compat ? 0 : c.nat->gs_base_kernel); + + if ( is_hvm_vcpu(v) || v->is_initialised ) + goto out; + + /* NB: No need to use PV cr3 un-pickling macros */ + cr3_gfn = c(ctrlreg[3]) >> PAGE_SHIFT; + cr3_page = get_page_from_gfn(d, cr3_gfn, NULL, P2M_ALLOC); + + v->arch.cr3 = page_to_maddr(cr3_page); + v->arch.hvm_vcpu.guest_cr[3] = c.nat->ctrlreg[3]; + v->arch.guest_table = pagetable_from_page(cr3_page); + + ASSERT(paging_mode_enabled(d)); + + goto pvh_skip_pv_stuff; } init_int80_direct_trap(v); @@ -934,6 +965,7 @@ int arch_set_info_guest( clear_bit(_VPF_in_reset, &v->pause_flags); + pvh_skip_pv_stuff: if ( v->vcpu_id == 0 ) update_domain_wallclock_time(d); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5e92dbe..854f588 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1467,7 +1467,7 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_info_guest(struct vcpu *v) +static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) { unsigned long intr_shadow; @@ -1492,6 +1492,10 @@ static void vmx_set_info_guest(struct vcpu *v) __vmwrite(GUEST_INTERRUPTIBILITY_INFO, intr_shadow); } + /* PVH 32bitfixme */ + if ( is_pvh_vcpu(v) ) + __vmwrite(GUEST_GS_BASE, gs_base_kernel); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index ccca5df..a8ba06d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -160,7 +160,7 @@ struct hvm_function_table { int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); void (*handle_cd)(struct vcpu *v, unsigned long value); - void (*set_info_guest)(struct vcpu *v); + void (*set_info_guest)(struct vcpu *v, uint64_t gs_base_kernel); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); /* Nested HVM */ @@ -434,10 +434,10 @@ void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -static inline void hvm_set_info_guest(struct vcpu *v) +static inline void hvm_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) { if ( hvm_funcs.set_info_guest ) - return hvm_funcs.set_info_guest(v); + return hvm_funcs.set_info_guest(v, gs_base_kernel); } int hvm_debug_op(struct vcpu *v, int32_t op); diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 908ef87..5d220ce 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -154,6 +154,17 @@ typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ /* * The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. + * + * Also note that when calling DOMCTL_setvcpucontext and VCPU_initialise + * for HVM and PVH guests, not all information in this structure is updated: + * + * - For HVM guests, the structures read include: fpu_ctxt (if + * VGCT_I387_VALID is set), flags, user_regs, debugreg[*] + * + * - PVH guests are the same as HVM guests, but additionally set cr3, + * and for 64-bit guests, gs_base_kernel. Additionally, the following + * entries must be 0: ctrlreg[1], ldt_base, ldt_ents, user_regs.{cs, + * ss, es, ds, fs, gs), gdt_ents, fs_base, and gs_base_user. */ struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02: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 1Vh43B-0000nx-Mz; Thu, 14 Nov 2013 21:02:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43A-0000nj-FE for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:04 +0000 Received: from [85.158.137.68:6580] by server-3.bemta-3.messagelabs.com id EC/1E-03862-B4A35825; Thu, 14 Nov 2013 21:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1384462921!1618134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9539 invoked from network); 14 Nov 2013 21:02:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh437-0007Mt-KF for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh437-00008P-Ip for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:01 +0000 Date: Thu, 14 Nov 2013 21:02:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: set up more PV stuff in set_info_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 35b1e076497ce80f9ab2a46257dd015dad132014 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:37:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:37:51 2013 +0100 pvh: set up more PV stuff in set_info_guest Allow the guest to set up a few more things when bringing up a vcpu. This includes cr3 and gs_base. Also set up wallclock, and only initialize a vcpu once. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 36 ++++++++++++++++++++++++++++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 +++++- xen/include/asm-x86/hvm/hvm.h | 6 +++--- xen/include/public/arch-x86/xen.h | 11 +++++++++++ 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8c2a57f..5ec992d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -691,6 +691,17 @@ int arch_set_info_guest( (c(ldt_ents) > 8192) ) return -EINVAL; } + else if ( is_pvh_vcpu(v) ) + { + /* PVH 32bitfixme */ + ASSERT(!compat); + + if ( c(ctrlreg[1]) || c(ldt_base) || c(ldt_ents) || + c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || + c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || + c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) + return -EINVAL; + } v->fpu_initialised = !!(flags & VGCF_I387_VALID); @@ -728,8 +739,28 @@ int arch_set_info_guest( if ( has_hvm_container_vcpu(v) ) { - hvm_set_info_guest(v); - goto out; + /* + * NB: TF_kernel_mode is set unconditionally for HVM guests, + * so we always use the gs_base_kernel here. If we change this + * function to imitate the PV functionality, we'll need to + * make it pay attention to the kernel bit. + */ + hvm_set_info_guest(v, compat ? 0 : c.nat->gs_base_kernel); + + if ( is_hvm_vcpu(v) || v->is_initialised ) + goto out; + + /* NB: No need to use PV cr3 un-pickling macros */ + cr3_gfn = c(ctrlreg[3]) >> PAGE_SHIFT; + cr3_page = get_page_from_gfn(d, cr3_gfn, NULL, P2M_ALLOC); + + v->arch.cr3 = page_to_maddr(cr3_page); + v->arch.hvm_vcpu.guest_cr[3] = c.nat->ctrlreg[3]; + v->arch.guest_table = pagetable_from_page(cr3_page); + + ASSERT(paging_mode_enabled(d)); + + goto pvh_skip_pv_stuff; } init_int80_direct_trap(v); @@ -934,6 +965,7 @@ int arch_set_info_guest( clear_bit(_VPF_in_reset, &v->pause_flags); + pvh_skip_pv_stuff: if ( v->vcpu_id == 0 ) update_domain_wallclock_time(d); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5e92dbe..854f588 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1467,7 +1467,7 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_info_guest(struct vcpu *v) +static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) { unsigned long intr_shadow; @@ -1492,6 +1492,10 @@ static void vmx_set_info_guest(struct vcpu *v) __vmwrite(GUEST_INTERRUPTIBILITY_INFO, intr_shadow); } + /* PVH 32bitfixme */ + if ( is_pvh_vcpu(v) ) + __vmwrite(GUEST_GS_BASE, gs_base_kernel); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index ccca5df..a8ba06d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -160,7 +160,7 @@ struct hvm_function_table { int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); void (*handle_cd)(struct vcpu *v, unsigned long value); - void (*set_info_guest)(struct vcpu *v); + void (*set_info_guest)(struct vcpu *v, uint64_t gs_base_kernel); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); /* Nested HVM */ @@ -434,10 +434,10 @@ void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -static inline void hvm_set_info_guest(struct vcpu *v) +static inline void hvm_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) { if ( hvm_funcs.set_info_guest ) - return hvm_funcs.set_info_guest(v); + return hvm_funcs.set_info_guest(v, gs_base_kernel); } int hvm_debug_op(struct vcpu *v, int32_t op); diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 908ef87..5d220ce 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -154,6 +154,17 @@ typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ /* * The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. + * + * Also note that when calling DOMCTL_setvcpucontext and VCPU_initialise + * for HVM and PVH guests, not all information in this structure is updated: + * + * - For HVM guests, the structures read include: fpu_ctxt (if + * VGCT_I387_VALID is set), flags, user_regs, debugreg[*] + * + * - PVH guests are the same as HVM guests, but additionally set cr3, + * and for 64-bit guests, gs_base_kernel. Additionally, the following + * entries must be 0: ctrlreg[1], ldt_base, ldt_ents, user_regs.{cs, + * ss, es, ds, fs, gs), gdt_ents, fs_base, and gs_base_user. */ struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43L-0000pL-Ph; Thu, 14 Nov 2013 21:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43K-0000p8-G3 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:14 +0000 Received: from [193.109.254.147:41518] by server-3.bemta-14.messagelabs.com id FD/45-03488-55A35825; Thu, 14 Nov 2013 21:02:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384462932!2818006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10242 invoked from network); 14 Nov 2013 21:02:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43H-0007NS-T7 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43H-00009O-O9 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:11 +0000 Date: Thu, 14 Nov 2013 21:02:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: PV cpuid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcb18d14468446f2bcc06ed1264bed38ad7ac0c1 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:39:13 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:39:13 2013 +0100 pvh: PV cpuid NB at the moment we do not handle forced emulated ops. This means, for example, that xen-detect will report an HVM Xen guest instead of a PV one. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 854f588..1c91e09 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2766,8 +2766,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; } case EXIT_REASON_CPUID: + is_pvh_vcpu(v) ? pv_cpuid(regs) : vmx_do_cpuid(regs); update_guest_eip(); /* Safe: CPUID */ - vmx_do_cpuid(regs); break; case EXIT_REASON_HLT: update_guest_eip(); /* Safe: HLT */ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 26ae722..4b2c2ea 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -719,7 +719,7 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, return 1; } -static void pv_cpuid(struct cpu_user_regs *regs) +void pv_cpuid(struct cpu_user_regs *regs) { uint32_t a, b, c, d; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 893afa3..551036d 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -567,6 +567,8 @@ void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); int microcode_resume_cpu(int cpu); +void pv_cpuid(struct cpu_user_regs *regs); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_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 Thu Nov 14 21:02:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43L-0000pL-Ph; Thu, 14 Nov 2013 21:02:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43K-0000p8-G3 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:14 +0000 Received: from [193.109.254.147:41518] by server-3.bemta-14.messagelabs.com id FD/45-03488-55A35825; Thu, 14 Nov 2013 21:02:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384462932!2818006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10242 invoked from network); 14 Nov 2013 21:02:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43H-0007NS-T7 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43H-00009O-O9 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:11 +0000 Date: Thu, 14 Nov 2013 21:02:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: PV cpuid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcb18d14468446f2bcc06ed1264bed38ad7ac0c1 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:39:13 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:39:13 2013 +0100 pvh: PV cpuid NB at the moment we do not handle forced emulated ops. This means, for example, that xen-detect will report an HVM Xen guest instead of a PV one. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 854f588..1c91e09 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2766,8 +2766,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; } case EXIT_REASON_CPUID: + is_pvh_vcpu(v) ? pv_cpuid(regs) : vmx_do_cpuid(regs); update_guest_eip(); /* Safe: CPUID */ - vmx_do_cpuid(regs); break; case EXIT_REASON_HLT: update_guest_eip(); /* Safe: HLT */ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 26ae722..4b2c2ea 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -719,7 +719,7 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, return 1; } -static void pv_cpuid(struct cpu_user_regs *regs) +void pv_cpuid(struct cpu_user_regs *regs) { uint32_t a, b, c, d; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 893afa3..551036d 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -567,6 +567,8 @@ void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); int microcode_resume_cpu(int cpu); +void pv_cpuid(struct cpu_user_regs *regs); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_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 Thu Nov 14 21:02:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21: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 1Vh43W-0000qq-SS; Thu, 14 Nov 2013 21:02:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43U-0000qa-Rq for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:25 +0000 Received: from [85.158.137.68:17422] by server-16.bemta-3.messagelabs.com id 22/AA-18787-06A35825; Thu, 14 Nov 2013 21:02:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384462942!1589793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27636 invoked from network); 14 Nov 2013 21:02: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; 14 Nov 2013 21:02:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43S-0007Nb-3J for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43S-0000A0-0w for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:22 +0000 Date: Thu, 14 Nov 2013 21:02:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: use PV handlers for PIO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77f9975599720ad4ed4a561be7610b248f615aab Author: George Dunlap AuthorDate: Wed Nov 13 09:40:03 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:40:03 2013 +0100 pvh: use PV handlers for PIO Register an IO handler for the entire PIO range, and have it call the PV PIO handlers. NB at this point this won't do the full "copy and execute on the stack with full GPRs" work-around; this may need to be sorted out for dom0 to allow these instructions to happen in guest context. Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 17 +++++++++++++++++ xen/arch/x86/traps.c | 4 ++-- xen/include/asm-x86/traps.h | 5 +++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4bd4372..3919590 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -519,6 +519,20 @@ static int hvm_print_line( return X86EMUL_OKAY; } +static int handle_pvh_io( + int dir, uint32_t port, uint32_t bytes, uint32_t *val) +{ + struct vcpu *curr = current; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + + if ( dir == IOREQ_WRITE ) + guest_io_write(port, bytes, *val, curr, regs); + else + *val = guest_io_read(port, bytes, curr, regs); + + return X86EMUL_OKAY; +} + int hvm_domain_initialise(struct domain *d) { int rc; @@ -566,7 +580,10 @@ int hvm_domain_initialise(struct domain *d) d->arch.hvm_domain.io_handler->num_slot = 0; if ( is_pvh_domain(d) ) + { + register_portio_handler(d, 0, 0x10003, handle_pvh_io); return 0; + } hvm_init_guest_time(d); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4b2c2ea..e5b3585 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1671,7 +1671,7 @@ static int pci_cfg_ok(struct domain *d, int write, int size) return 1; } -static uint32_t guest_io_read( +uint32_t guest_io_read( unsigned int port, unsigned int bytes, struct vcpu *v, struct cpu_user_regs *regs) { @@ -1738,7 +1738,7 @@ static uint32_t guest_io_read( return data; } -static void guest_io_write( +void guest_io_write( unsigned int port, unsigned int bytes, uint32_t data, struct vcpu *v, struct cpu_user_regs *regs) { diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index 82cbcee..556b133 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -49,4 +49,9 @@ extern int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, extern int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr); +uint32_t guest_io_read(unsigned int port, unsigned int bytes, + struct vcpu *, struct cpu_user_regs *); +void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, + struct vcpu *, struct cpu_user_regs *); + #endif /* ASM_TRAP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21: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 1Vh43W-0000qq-SS; Thu, 14 Nov 2013 21:02:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43U-0000qa-Rq for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:25 +0000 Received: from [85.158.137.68:17422] by server-16.bemta-3.messagelabs.com id 22/AA-18787-06A35825; Thu, 14 Nov 2013 21:02:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1384462942!1589793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27636 invoked from network); 14 Nov 2013 21:02: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; 14 Nov 2013 21:02:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43S-0007Nb-3J for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43S-0000A0-0w for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:22 +0000 Date: Thu, 14 Nov 2013 21:02:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: use PV handlers for PIO X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77f9975599720ad4ed4a561be7610b248f615aab Author: George Dunlap AuthorDate: Wed Nov 13 09:40:03 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:40:03 2013 +0100 pvh: use PV handlers for PIO Register an IO handler for the entire PIO range, and have it call the PV PIO handlers. NB at this point this won't do the full "copy and execute on the stack with full GPRs" work-around; this may need to be sorted out for dom0 to allow these instructions to happen in guest context. Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/hvm.c | 17 +++++++++++++++++ xen/arch/x86/traps.c | 4 ++-- xen/include/asm-x86/traps.h | 5 +++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4bd4372..3919590 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -519,6 +519,20 @@ static int hvm_print_line( return X86EMUL_OKAY; } +static int handle_pvh_io( + int dir, uint32_t port, uint32_t bytes, uint32_t *val) +{ + struct vcpu *curr = current; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + + if ( dir == IOREQ_WRITE ) + guest_io_write(port, bytes, *val, curr, regs); + else + *val = guest_io_read(port, bytes, curr, regs); + + return X86EMUL_OKAY; +} + int hvm_domain_initialise(struct domain *d) { int rc; @@ -566,7 +580,10 @@ int hvm_domain_initialise(struct domain *d) d->arch.hvm_domain.io_handler->num_slot = 0; if ( is_pvh_domain(d) ) + { + register_portio_handler(d, 0, 0x10003, handle_pvh_io); return 0; + } hvm_init_guest_time(d); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4b2c2ea..e5b3585 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1671,7 +1671,7 @@ static int pci_cfg_ok(struct domain *d, int write, int size) return 1; } -static uint32_t guest_io_read( +uint32_t guest_io_read( unsigned int port, unsigned int bytes, struct vcpu *v, struct cpu_user_regs *regs) { @@ -1738,7 +1738,7 @@ static uint32_t guest_io_read( return data; } -static void guest_io_write( +void guest_io_write( unsigned int port, unsigned int bytes, uint32_t data, struct vcpu *v, struct cpu_user_regs *regs) { diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index 82cbcee..556b133 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -49,4 +49,9 @@ extern int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, extern int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr); +uint32_t guest_io_read(unsigned int port, unsigned int bytes, + struct vcpu *, struct cpu_user_regs *); +void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data, + struct vcpu *, struct cpu_user_regs *); + #endif /* ASM_TRAP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43f-0000sQ-V4; Thu, 14 Nov 2013 21:02:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43e-0000sE-OX for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:34 +0000 Received: from [85.158.137.68:7775] by server-13.bemta-3.messagelabs.com id 17/0E-02689-A6A35825; Thu, 14 Nov 2013 21:02:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1384462952!1621441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26614 invoked from network); 14 Nov 2013 21:02:33 -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; 14 Nov 2013 21:02:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43c-0007Nj-9l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43c-0000Aa-7N for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:32 +0000 Date: Thu, 14 Nov 2013 21:02:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: disable 32-bit guest support for now X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c50d59f962ac4e9ff77680020f446109994e421c Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:40:41 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:40:41 2013 +0100 pvh: disable 32-bit guest support for now Removing the assert allows the PVH code to call this during vmcs construction in a later patch, making the code more robust by removing duplicate code. To be implemented. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5ec992d..45e5afe 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -339,6 +339,14 @@ int switch_compat(struct domain *d) if ( d == NULL ) return -EINVAL; + + if ( is_pvh_domain(d) ) + { + printk(XENLOG_G_INFO + "Xen currently does not support 32bit PVH guests\n"); + return -EINVAL; + } + if ( !may_switch_mode(d) ) return -EACCES; if ( is_pv_32on64_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43f-0000sQ-V4; Thu, 14 Nov 2013 21:02:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43e-0000sE-OX for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:34 +0000 Received: from [85.158.137.68:7775] by server-13.bemta-3.messagelabs.com id 17/0E-02689-A6A35825; Thu, 14 Nov 2013 21:02:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1384462952!1621441!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26614 invoked from network); 14 Nov 2013 21:02:33 -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; 14 Nov 2013 21:02:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43c-0007Nj-9l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43c-0000Aa-7N for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:32 +0000 Date: Thu, 14 Nov 2013 21:02:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: disable 32-bit guest support for now X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c50d59f962ac4e9ff77680020f446109994e421c Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:40:41 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:40:41 2013 +0100 pvh: disable 32-bit guest support for now Removing the assert allows the PVH code to call this during vmcs construction in a later patch, making the code more robust by removing duplicate code. To be implemented. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Reviewed-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/domain.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5ec992d..45e5afe 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -339,6 +339,14 @@ int switch_compat(struct domain *d) if ( d == NULL ) return -EINVAL; + + if ( is_pvh_domain(d) ) + { + printk(XENLOG_G_INFO + "Xen currently does not support 32bit PVH guests\n"); + return -EINVAL; + } + if ( !may_switch_mode(d) ) return -EACCES; if ( is_pv_32on64_domain(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21: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 1Vh43r-0000u2-26; Thu, 14 Nov 2013 21:02:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43p-0000tv-A1 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:45 +0000 Received: from [85.158.139.211:20851] by server-6.bemta-5.messagelabs.com id 9A/93-04949-47A35825; Thu, 14 Nov 2013 21:02:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1384462962!1967873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10116 invoked from network); 14 Nov 2013 21:02:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43m-0007Np-F0 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43m-0000B0-DF for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:42 +0000 Date: Thu, 14 Nov 2013 21:02:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: restrict tsc_mode to NEVER_EMULATE for now X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a51243376b4fe6bfed7e47ed2cd77258b33788ea Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:41:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:41:12 2013 +0100 pvh: restrict tsc_mode to NEVER_EMULATE for now The reason given for this restriction in the first place, given in one of the comments checking for PVH requirements, had to do with additional infrastructure required to allow PV RDTSC emulation for PVH guests. Since we don't use the PV emulation path at all anymore, we may be able to remove this restriction. Experiments show that pvh will boot without apparent issues in "default", "native", and "native_paravirt" mode, but not in "always_emulate" mode. We'll leave this restriction in until we can sort out what's going on. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/time.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 21224f0..62c3443 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1827,6 +1827,33 @@ void tsc_set_info(struct domain *d, d->arch.vtsc = 0; return; } + if ( is_pvh_domain(d) ) + { + /* + * PVH fixme: support more tsc modes. + * + * NB: The reason this is disabled here appears to be with + * additional support required to do the PV RDTSC emulation. + * Since we're no longer taking the PV emulation path for + * anything, we may be able to remove this restriction. + * + * pvhfixme: Experiments show that "default" works for PVH, + * but "always_emulate" does not for some reason. Figure out + * why. + */ + switch ( tsc_mode ) + { + case TSC_MODE_NEVER_EMULATE: + break; + default: + printk(XENLOG_WARNING + "PVH currently does not support tsc emulation. Setting timer_mode = never_emulate\n"); + /* FALLTHRU */ + case TSC_MODE_DEFAULT: + tsc_mode = TSC_MODE_NEVER_EMULATE; + break; + } + } switch ( d->arch.tsc_mode = tsc_mode ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21: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 1Vh43r-0000u2-26; Thu, 14 Nov 2013 21:02:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43p-0000tv-A1 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:45 +0000 Received: from [85.158.139.211:20851] by server-6.bemta-5.messagelabs.com id 9A/93-04949-47A35825; Thu, 14 Nov 2013 21:02:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1384462962!1967873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10116 invoked from network); 14 Nov 2013 21:02:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:02:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43m-0007Np-F0 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43m-0000B0-DF for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:42 +0000 Date: Thu, 14 Nov 2013 21:02:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: restrict tsc_mode to NEVER_EMULATE for now X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a51243376b4fe6bfed7e47ed2cd77258b33788ea Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:41:12 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:41:12 2013 +0100 pvh: restrict tsc_mode to NEVER_EMULATE for now The reason given for this restriction in the first place, given in one of the comments checking for PVH requirements, had to do with additional infrastructure required to allow PV RDTSC emulation for PVH guests. Since we don't use the PV emulation path at all anymore, we may be able to remove this restriction. Experiments show that pvh will boot without apparent issues in "default", "native", and "native_paravirt" mode, but not in "always_emulate" mode. We'll leave this restriction in until we can sort out what's going on. Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/time.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 21224f0..62c3443 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1827,6 +1827,33 @@ void tsc_set_info(struct domain *d, d->arch.vtsc = 0; return; } + if ( is_pvh_domain(d) ) + { + /* + * PVH fixme: support more tsc modes. + * + * NB: The reason this is disabled here appears to be with + * additional support required to do the PV RDTSC emulation. + * Since we're no longer taking the PV emulation path for + * anything, we may be able to remove this restriction. + * + * pvhfixme: Experiments show that "default" works for PVH, + * but "always_emulate" does not for some reason. Figure out + * why. + */ + switch ( tsc_mode ) + { + case TSC_MODE_NEVER_EMULATE: + break; + default: + printk(XENLOG_WARNING + "PVH currently does not support tsc emulation. Setting timer_mode = never_emulate\n"); + /* FALLTHRU */ + case TSC_MODE_DEFAULT: + tsc_mode = TSC_MODE_NEVER_EMULATE; + break; + } + } switch ( d->arch.tsc_mode = tsc_mode ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02: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 1Vh440-0000vu-AK; Thu, 14 Nov 2013 21:02:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43z-0000vk-Go for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:55 +0000 Received: from [85.158.139.211:21247] by server-16.bemta-5.messagelabs.com id E2/F5-17144-E7A35825; Thu, 14 Nov 2013 21:02:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384462972!2092242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20047 invoked from network); 14 Nov 2013 21:02:53 -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; 14 Nov 2013 21:02:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43w-0007Ny-LV for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43w-0000BQ-JD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:52 +0000 Date: Thu, 14 Nov 2013 21:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58076d00d89fdd040935a438efaec64f9665fbc4 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:41:59 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:41:59 2013 +0100 pvh: documentation Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- docs/misc/pvh-readme.txt | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/docs/misc/pvh-readme.txt b/docs/misc/pvh-readme.txt new file mode 100644 index 0000000..9fea137 --- /dev/null +++ b/docs/misc/pvh-readme.txt @@ -0,0 +1,61 @@ + +PVH : an x86 PV guest running in an HVM container. + +See: http://blog.xen.org/index.php/2012/10/23/the-paravirtualization-spectrum-part-1-the-ends-of-the-spectrum/ + +At the moment HAP is required for PVH. + +At present the only PVH guest is an x86 64bit PV linux. Patches are at: + git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git + +A PVH guest kernel must support following features, as defined for linux +in arch/x86/xen/xen-head.S: + + #define FEATURES_PVH "|writable_descriptor_tables" \ + "|auto_translated_physmap" \ + "|supervisor_mode_kernel" \ + "|hvm_callback_vector" + +In a nutshell: +* the guest uses auto translate: + - p2m is managed by xen + - pagetables are owned by the guest + - mmu_update hypercall not available +* it uses event callback and not vlapic emulation, +* IDT is native, so set_trap_table hcall is also N/A for a PVH guest. + +For a full list of hcalls supported for PVH, see pvh_hypercall64_table +in arch/x86/hvm/hvm.c in xen. From the ABI prespective, it's mostly a +PV guest with auto translate, although it does use hvm_op for setting +callback vector, and has a special version of arch_set_guest_info for bringing +up secondary cpus. + +The initial phase targets the booting of a 64bit UP/SMP linux guest in PVH +mode. This is done by adding: pvh=1 in the config file. xl, and not xm, is +supported. Phase I patches are broken into three parts: + - xen changes for booting of 64bit PVH guest + - tools changes for creating a PVH guest + - boot of 64bit dom0 in PVH mode. + +Following fixme's exist in the code: + - arch/x86/time.c: support more tsc modes. + +Following remain to be done for PVH: + - Get rid of PVH mode, make it just HVM with some flags set + - implement arch_get_info_guest() for pvh. + - Investigate what else needs to be done for VMI support. + - AMD port. + - 32bit PVH guest support in both linux and xen. Xen changes are tagged + "32bitfixme". + - Add support for monitoring guest behavior. See hvm_memory_event* functions + in hvm.c + - vcpu hotplug support + - Live migration of PVH guests. + - Avail PVH dom0 of posted interrupts. (This will be a big win). + + +Note, any emails to me must be cc'd to xen devel mailing list. OTOH, please +cc me on PVH emails to the xen devel mailing list. + +Mukesh Rathor +mukesh.rathor [at] oracle [dot] com -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:02:56 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:02: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 1Vh440-0000vu-AK; Thu, 14 Nov 2013 21:02:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43z-0000vk-Go for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:55 +0000 Received: from [85.158.139.211:21247] by server-16.bemta-5.messagelabs.com id E2/F5-17144-E7A35825; Thu, 14 Nov 2013 21:02:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384462972!2092242!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20047 invoked from network); 14 Nov 2013 21:02:53 -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; 14 Nov 2013 21:02:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh43w-0007Ny-LV for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh43w-0000BQ-JD for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:02:52 +0000 Date: Thu, 14 Nov 2013 21:02:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58076d00d89fdd040935a438efaec64f9665fbc4 Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:41:59 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:41:59 2013 +0100 pvh: documentation Signed-off-by: Mukesh Rathor Signed-off-by: George Dunlap Acked-by: Tim Deegan Acked-by: Keir Fraser Acked-by: Eddie Dong --- docs/misc/pvh-readme.txt | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/docs/misc/pvh-readme.txt b/docs/misc/pvh-readme.txt new file mode 100644 index 0000000..9fea137 --- /dev/null +++ b/docs/misc/pvh-readme.txt @@ -0,0 +1,61 @@ + +PVH : an x86 PV guest running in an HVM container. + +See: http://blog.xen.org/index.php/2012/10/23/the-paravirtualization-spectrum-part-1-the-ends-of-the-spectrum/ + +At the moment HAP is required for PVH. + +At present the only PVH guest is an x86 64bit PV linux. Patches are at: + git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git + +A PVH guest kernel must support following features, as defined for linux +in arch/x86/xen/xen-head.S: + + #define FEATURES_PVH "|writable_descriptor_tables" \ + "|auto_translated_physmap" \ + "|supervisor_mode_kernel" \ + "|hvm_callback_vector" + +In a nutshell: +* the guest uses auto translate: + - p2m is managed by xen + - pagetables are owned by the guest + - mmu_update hypercall not available +* it uses event callback and not vlapic emulation, +* IDT is native, so set_trap_table hcall is also N/A for a PVH guest. + +For a full list of hcalls supported for PVH, see pvh_hypercall64_table +in arch/x86/hvm/hvm.c in xen. From the ABI prespective, it's mostly a +PV guest with auto translate, although it does use hvm_op for setting +callback vector, and has a special version of arch_set_guest_info for bringing +up secondary cpus. + +The initial phase targets the booting of a 64bit UP/SMP linux guest in PVH +mode. This is done by adding: pvh=1 in the config file. xl, and not xm, is +supported. Phase I patches are broken into three parts: + - xen changes for booting of 64bit PVH guest + - tools changes for creating a PVH guest + - boot of 64bit dom0 in PVH mode. + +Following fixme's exist in the code: + - arch/x86/time.c: support more tsc modes. + +Following remain to be done for PVH: + - Get rid of PVH mode, make it just HVM with some flags set + - implement arch_get_info_guest() for pvh. + - Investigate what else needs to be done for VMI support. + - AMD port. + - 32bit PVH guest support in both linux and xen. Xen changes are tagged + "32bitfixme". + - Add support for monitoring guest behavior. See hvm_memory_event* functions + in hvm.c + - vcpu hotplug support + - Live migration of PVH guests. + - Avail PVH dom0 of posted interrupts. (This will be a big win). + + +Note, any emails to me must be cc'd to xen devel mailing list. OTOH, please +cc me on PVH emails to the xen devel mailing list. + +Mukesh Rathor +mukesh.rathor [at] oracle [dot] com -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44A-0000xr-D2; Thu, 14 Nov 2013 21:03:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh449-0000xb-MY for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:05 +0000 Received: from [193.109.254.147:59501] by server-10.bemta-14.messagelabs.com id B6/1F-07477-98A35825; Thu, 14 Nov 2013 21:03:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384462983!2816474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1712 invoked from network); 14 Nov 2013 21:03:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh446-0007OX-QG for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh446-0000Bw-P5 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:02 +0000 Date: Thu, 14 Nov 2013 21:03:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh tools: libxc changes to build a PVH 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 2aa2be09ae4cda7dcd96fb654f6b358c75ce6afa Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:42:14 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:42:14 2013 +0100 pvh tools: libxc changes to build a PVH guest Signed-off-by: Mukesh Rathor Acked-by: Tim Deegan Acked-by: Ian Jackson Acked-by: Keir Fraser Acked-by: Eddie Dong --- tools/libxc/xc_dom.h | 1 + tools/libxc/xc_dom_core.c | 9 ++++ tools/libxc/xc_dom_x86.c | 90 +++++++++++++++++++++++++++++--------------- 3 files changed, 69 insertions(+), 31 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 935b49e..90679da 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -127,6 +127,7 @@ struct xc_dom_image { domid_t console_domid; domid_t xenstore_domid; xen_pfn_t shared_info_mfn; + int pvh_enabled; xc_interface *xch; domid_t guest_domid; diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 3bf51ef..9355fe8 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -766,6 +766,15 @@ int xc_dom_parse_image(struct xc_dom_image *dom) goto err; } + if ( dom->pvh_enabled ) + { + const char *pvh_features = "writable_descriptor_tables|" + "auto_translated_physmap|" + "supervisor_mode_kernel|" + "hvm_callback_vector"; + elf_xen_parse_features(pvh_features, dom->f_requested, NULL); + } + /* check features */ for ( i = 0; i < XENFEAT_NR_SUBMAPS; i++ ) { diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 60fc544..e034d62 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -407,7 +407,8 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) pgpfn = (addr - dom->parms.virt_base) >> PAGE_SHIFT_X86; l1tab[l1off] = pfn_to_paddr(xc_dom_p2m_guest(dom, pgpfn)) | L1_PROT; - if ( (addr >= dom->pgtables_seg.vstart) && + if ( (!dom->pvh_enabled) && + (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ @@ -588,6 +589,13 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF_CALLED(dom->xch); + if ( dom->pvh_enabled ) + { + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: PVH not supported for 32bit guests.", __FUNCTION__); + return -1; + } + /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); @@ -630,12 +638,6 @@ static int vcpu_x86_64(struct xc_dom_image *dom, void *ptr) /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); - ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.es = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_64; - ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_64; ctxt->user_regs.rip = dom->parms.virt_entry; ctxt->user_regs.rsp = dom->parms.virt_base + (dom->bootstack_pfn + 1) * PAGE_SIZE_X86; @@ -643,15 +645,25 @@ static int vcpu_x86_64(struct xc_dom_image *dom, void *ptr) dom->parms.virt_base + (dom->start_info_pfn) * PAGE_SIZE_X86; ctxt->user_regs.rflags = 1 << 9; /* Interrupt Enable */ - ctxt->kernel_ss = ctxt->user_regs.ss; - ctxt->kernel_sp = ctxt->user_regs.esp; - ctxt->flags = VGCF_in_kernel_X86_64 | VGCF_online_X86_64; cr3_pfn = xc_dom_p2m_guest(dom, dom->pgtables_seg.pfn); ctxt->ctrlreg[3] = xen_pfn_to_cr3_x86_64(cr3_pfn); DOMPRINTF("%s: cr3: pfn 0x%" PRIpfn " mfn 0x%" PRIpfn "", __FUNCTION__, dom->pgtables_seg.pfn, cr3_pfn); + if ( dom->pvh_enabled ) + return 0; + + ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.es = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_64; + ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_64; + + ctxt->kernel_ss = ctxt->user_regs.ss; + ctxt->kernel_sp = ctxt->user_regs.esp; + return 0; } @@ -752,7 +764,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) rc = x86_compat(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) return rc; - if ( xc_dom_feature_translated(dom) ) + if ( xc_dom_feature_translated(dom) && !dom->pvh_enabled ) { dom->shadow_enabled = 1; rc = x86_shadow(dom->xch, dom->guest_domid); @@ -828,6 +840,38 @@ int arch_setup_bootearly(struct xc_dom_image *dom) return 0; } +/* + * Map grant table frames into guest physmap. PVH manages grant during boot + * via HVM mechanisms. + */ +static int map_grant_table_frames(struct xc_dom_image *dom) +{ + int i, rc; + + if ( dom->pvh_enabled ) + return 0; + + for ( i = 0; ; i++ ) + { + rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, + XENMAPSPACE_grant_table, + i, dom->total_pages + i); + if ( rc != 0 ) + { + if ( (i > 0) && (errno == EINVAL) ) + { + DOMPRINTF("%s: %d grant tables mapped", __FUNCTION__, i); + break; + } + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: mapping grant tables failed " "(pfn=0x%" PRIpfn + ", rc=%d)", __FUNCTION__, dom->total_pages + i, rc); + return rc; + } + } + return 0; +} + int arch_setup_bootlate(struct xc_dom_image *dom) { static const struct { @@ -866,7 +910,6 @@ int arch_setup_bootlate(struct xc_dom_image *dom) else { /* paravirtualized guest with auto-translation */ - int i; /* Map shared info frame into guest physmap. */ rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, @@ -880,25 +923,10 @@ int arch_setup_bootlate(struct xc_dom_image *dom) return rc; } - /* Map grant table frames into guest physmap. */ - for ( i = 0; ; i++ ) - { - rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, - XENMAPSPACE_grant_table, - i, dom->total_pages + i); - if ( rc != 0 ) - { - if ( (i > 0) && (errno == EINVAL) ) - { - DOMPRINTF("%s: %d grant tables mapped", __FUNCTION__, i); - break; - } - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: mapping grant tables failed " "(pfn=0x%" - PRIpfn ", rc=%d)", __FUNCTION__, dom->total_pages + i, rc); - return rc; - } - } + rc = map_grant_table_frames(dom); + if ( rc != 0 ) + return rc; + shinfo = dom->shared_info_pfn; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:06 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44A-0000xr-D2; Thu, 14 Nov 2013 21:03:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh449-0000xb-MY for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:05 +0000 Received: from [193.109.254.147:59501] by server-10.bemta-14.messagelabs.com id B6/1F-07477-98A35825; Thu, 14 Nov 2013 21:03:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384462983!2816474!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1712 invoked from network); 14 Nov 2013 21:03:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh446-0007OX-QG for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh446-0000Bw-P5 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:02 +0000 Date: Thu, 14 Nov 2013 21:03:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh tools: libxc changes to build a PVH 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 2aa2be09ae4cda7dcd96fb654f6b358c75ce6afa Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:42:14 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:42:14 2013 +0100 pvh tools: libxc changes to build a PVH guest Signed-off-by: Mukesh Rathor Acked-by: Tim Deegan Acked-by: Ian Jackson Acked-by: Keir Fraser Acked-by: Eddie Dong --- tools/libxc/xc_dom.h | 1 + tools/libxc/xc_dom_core.c | 9 ++++ tools/libxc/xc_dom_x86.c | 90 +++++++++++++++++++++++++++++--------------- 3 files changed, 69 insertions(+), 31 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 935b49e..90679da 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -127,6 +127,7 @@ struct xc_dom_image { domid_t console_domid; domid_t xenstore_domid; xen_pfn_t shared_info_mfn; + int pvh_enabled; xc_interface *xch; domid_t guest_domid; diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 3bf51ef..9355fe8 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -766,6 +766,15 @@ int xc_dom_parse_image(struct xc_dom_image *dom) goto err; } + if ( dom->pvh_enabled ) + { + const char *pvh_features = "writable_descriptor_tables|" + "auto_translated_physmap|" + "supervisor_mode_kernel|" + "hvm_callback_vector"; + elf_xen_parse_features(pvh_features, dom->f_requested, NULL); + } + /* check features */ for ( i = 0; i < XENFEAT_NR_SUBMAPS; i++ ) { diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 60fc544..e034d62 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -407,7 +407,8 @@ static int setup_pgtables_x86_64(struct xc_dom_image *dom) pgpfn = (addr - dom->parms.virt_base) >> PAGE_SHIFT_X86; l1tab[l1off] = pfn_to_paddr(xc_dom_p2m_guest(dom, pgpfn)) | L1_PROT; - if ( (addr >= dom->pgtables_seg.vstart) && + if ( (!dom->pvh_enabled) && + (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ @@ -588,6 +589,13 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF_CALLED(dom->xch); + if ( dom->pvh_enabled ) + { + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: PVH not supported for 32bit guests.", __FUNCTION__); + return -1; + } + /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); @@ -630,12 +638,6 @@ static int vcpu_x86_64(struct xc_dom_image *dom, void *ptr) /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); - ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.es = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_64; - ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_64; - ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_64; ctxt->user_regs.rip = dom->parms.virt_entry; ctxt->user_regs.rsp = dom->parms.virt_base + (dom->bootstack_pfn + 1) * PAGE_SIZE_X86; @@ -643,15 +645,25 @@ static int vcpu_x86_64(struct xc_dom_image *dom, void *ptr) dom->parms.virt_base + (dom->start_info_pfn) * PAGE_SIZE_X86; ctxt->user_regs.rflags = 1 << 9; /* Interrupt Enable */ - ctxt->kernel_ss = ctxt->user_regs.ss; - ctxt->kernel_sp = ctxt->user_regs.esp; - ctxt->flags = VGCF_in_kernel_X86_64 | VGCF_online_X86_64; cr3_pfn = xc_dom_p2m_guest(dom, dom->pgtables_seg.pfn); ctxt->ctrlreg[3] = xen_pfn_to_cr3_x86_64(cr3_pfn); DOMPRINTF("%s: cr3: pfn 0x%" PRIpfn " mfn 0x%" PRIpfn "", __FUNCTION__, dom->pgtables_seg.pfn, cr3_pfn); + if ( dom->pvh_enabled ) + return 0; + + ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.es = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_64; + ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_64; + ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_64; + + ctxt->kernel_ss = ctxt->user_regs.ss; + ctxt->kernel_sp = ctxt->user_regs.esp; + return 0; } @@ -752,7 +764,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) rc = x86_compat(dom->xch, dom->guest_domid, dom->guest_type); if ( rc ) return rc; - if ( xc_dom_feature_translated(dom) ) + if ( xc_dom_feature_translated(dom) && !dom->pvh_enabled ) { dom->shadow_enabled = 1; rc = x86_shadow(dom->xch, dom->guest_domid); @@ -828,6 +840,38 @@ int arch_setup_bootearly(struct xc_dom_image *dom) return 0; } +/* + * Map grant table frames into guest physmap. PVH manages grant during boot + * via HVM mechanisms. + */ +static int map_grant_table_frames(struct xc_dom_image *dom) +{ + int i, rc; + + if ( dom->pvh_enabled ) + return 0; + + for ( i = 0; ; i++ ) + { + rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, + XENMAPSPACE_grant_table, + i, dom->total_pages + i); + if ( rc != 0 ) + { + if ( (i > 0) && (errno == EINVAL) ) + { + DOMPRINTF("%s: %d grant tables mapped", __FUNCTION__, i); + break; + } + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: mapping grant tables failed " "(pfn=0x%" PRIpfn + ", rc=%d)", __FUNCTION__, dom->total_pages + i, rc); + return rc; + } + } + return 0; +} + int arch_setup_bootlate(struct xc_dom_image *dom) { static const struct { @@ -866,7 +910,6 @@ int arch_setup_bootlate(struct xc_dom_image *dom) else { /* paravirtualized guest with auto-translation */ - int i; /* Map shared info frame into guest physmap. */ rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, @@ -880,25 +923,10 @@ int arch_setup_bootlate(struct xc_dom_image *dom) return rc; } - /* Map grant table frames into guest physmap. */ - for ( i = 0; ; i++ ) - { - rc = xc_domain_add_to_physmap(dom->xch, dom->guest_domid, - XENMAPSPACE_grant_table, - i, dom->total_pages + i); - if ( rc != 0 ) - { - if ( (i > 0) && (errno == EINVAL) ) - { - DOMPRINTF("%s: %d grant tables mapped", __FUNCTION__, i); - break; - } - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: mapping grant tables failed " "(pfn=0x%" - PRIpfn ", rc=%d)", __FUNCTION__, dom->total_pages + i, rc); - return rc; - } - } + rc = map_grant_table_frames(dom); + if ( rc != 0 ) + return rc; + shinfo = dom->shared_info_pfn; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44L-00010c-Fv; Thu, 14 Nov 2013 21:03:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44K-00010I-16 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:16 +0000 Received: from [85.158.137.68:11913] by server-17.bemta-3.messagelabs.com id A1/75-06285-39A35825; Thu, 14 Nov 2013 21:03:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384462993!1598717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28526 invoked from network); 14 Nov 2013 21:03:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44H-0007Od-0i for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44G-0000D3-Ul for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:12 +0000 Date: Thu, 14 Nov 2013 21:03:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh tools: libxl changes to create a PVH 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 b5dda35f5aa3ab5c7be2333a8a4e0cfa34226654 Author: George Dunlap AuthorDate: Wed Nov 13 09:42:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:42:51 2013 +0100 pvh tools: libxl changes to create a PVH guest Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor Acked-by: Tim Deegan Acked-by: Ian Jackson Acked-by: Keir Fraser Acked-by: Eddie Dong --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl.h | 6 ++++++ tools/libxl/libxl_create.c | 13 +++++++++++++ tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_types.idl | 1 + tools/libxl/libxl_x86.c | 4 +++- tools/libxl/xl_cmdimpl.c | 1 + 8 files changed, 31 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index d2d8921..e6fc83f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -653,6 +653,9 @@ if your particular guest kernel does not require this behaviour then it is safe to allow this to be enabled but you may wish to disable it anyway. +=item B +Selects whether to run this PV guest in an HVM container. Default is 0. + =back =head2 Fully-virtualised (HVM) Guest Specific Options diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 9379694..c7dceda 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -369,6 +369,12 @@ */ #define LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1 +/* + * LIBXL_HAVE_CREATEINFO_PVH + * If this is defined, then libxl supports creation of a PVH guest. + */ +#define LIBXL_HAVE_CREATEINFO_PVH 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 9d793ba..5e9cdcc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -33,6 +33,9 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { libxl_defbool_setdefault(&c_info->hap, true); libxl_defbool_setdefault(&c_info->oos, true); + } else { + libxl_defbool_setdefault(&c_info->pvh, false); + libxl_defbool_setdefault(&c_info->hap, libxl_defbool_val(c_info->pvh)); } libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); @@ -381,6 +384,8 @@ int libxl__domain_build(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PV: + state->pvh_enabled = libxl_defbool_val(d_config->c_info.pvh); + ret = libxl__build_pv(gc, domid, info, state); if (ret) goto out; @@ -440,6 +445,14 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, flags |= XEN_DOMCTL_CDF_hvm_guest; flags |= libxl_defbool_val(info->hap) ? XEN_DOMCTL_CDF_hap : 0; flags |= libxl_defbool_val(info->oos) ? 0 : XEN_DOMCTL_CDF_oos_off; + } else if (libxl_defbool_val(info->pvh)) { + flags |= XEN_DOMCTL_CDF_pvh_guest; + if (!libxl_defbool_val(info->hap)) { + LOG(ERROR, "HAP must be on for PVH"); + rc = ERROR_INVAL; + goto out; + } + flags |= XEN_DOMCTL_CDF_hap; } *domid = -1; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 6cb39c1..a1c16b0 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -348,7 +348,10 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, return ERROR_FAIL; } + dom->pvh_enabled = state->pvh_enabled; + LOG(DEBUG, "pv kernel mapped %d path %s", state->pv_kernel.mapped, state->pv_kernel.path); + if (state->pv_kernel.mapped) { ret = xc_dom_kernel_mem(dom, state->pv_kernel.data, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4ad6ad3..23ff265 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -887,6 +887,7 @@ typedef struct { libxl__file_reference pv_kernel; libxl__file_reference pv_ramdisk; const char * pv_cmdline; + bool pvh_enabled; } libxl__domain_build_state; _hidden int libxl__build_pre(libxl__gc *gc, uint32_t domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ce003c6..de5bac3 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -274,6 +274,7 @@ libxl_domain_create_info = Struct("domain_create_info",[ ("platformdata", libxl_key_value_list), ("poolid", uint32), ("run_hotplug_scripts",libxl_defbool), + ("pvh", libxl_defbool), ], dir=DIR_IN) libxl_domain_restore_params = Struct("domain_restore_params", [ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index a78c91d..87a8110 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -290,7 +290,9 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, if (rtc_timeoffset) xc_domain_set_time_offset(ctx->xch, domid, rtc_timeoffset); - if (d_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { + if (d_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM || + libxl_defbool_val(d_config->c_info.pvh)) { + unsigned long shadow; shadow = (d_config->b_info.shadow_memkb + 1023) / 1024; xc_shadow_control(ctx->xch, domid, XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION, NULL, 0, &shadow, 0, NULL); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5bd9b15..8690ec7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -642,6 +642,7 @@ static void parse_config_data(const char *config_source, !strncmp(buf, "hvm", strlen(buf))) c_info->type = LIBXL_DOMAIN_TYPE_HVM; + xlu_cfg_get_defbool(config, "pvh", &c_info->pvh, 0); xlu_cfg_get_defbool(config, "hap", &c_info->hap, 0); if (xlu_cfg_replace_string (config, "name", &c_info->name, 0)) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44L-00010c-Fv; Thu, 14 Nov 2013 21:03:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44K-00010I-16 for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:16 +0000 Received: from [85.158.137.68:11913] by server-17.bemta-3.messagelabs.com id A1/75-06285-39A35825; Thu, 14 Nov 2013 21:03:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1384462993!1598717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28526 invoked from network); 14 Nov 2013 21:03:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44H-0007Od-0i for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44G-0000D3-Ul for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:12 +0000 Date: Thu, 14 Nov 2013 21:03:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh tools: libxl changes to create a PVH 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 b5dda35f5aa3ab5c7be2333a8a4e0cfa34226654 Author: George Dunlap AuthorDate: Wed Nov 13 09:42:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:42:51 2013 +0100 pvh tools: libxl changes to create a PVH guest Signed-off-by: George Dunlap Signed-off-by: Mukesh Rathor Acked-by: Tim Deegan Acked-by: Ian Jackson Acked-by: Keir Fraser Acked-by: Eddie Dong --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl.h | 6 ++++++ tools/libxl/libxl_create.c | 13 +++++++++++++ tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_types.idl | 1 + tools/libxl/libxl_x86.c | 4 +++- tools/libxl/xl_cmdimpl.c | 1 + 8 files changed, 31 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index d2d8921..e6fc83f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -653,6 +653,9 @@ if your particular guest kernel does not require this behaviour then it is safe to allow this to be enabled but you may wish to disable it anyway. +=item B +Selects whether to run this PV guest in an HVM container. Default is 0. + =back =head2 Fully-virtualised (HVM) Guest Specific Options diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 9379694..c7dceda 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -369,6 +369,12 @@ */ #define LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1 +/* + * LIBXL_HAVE_CREATEINFO_PVH + * If this is defined, then libxl supports creation of a PVH guest. + */ +#define LIBXL_HAVE_CREATEINFO_PVH 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 9d793ba..5e9cdcc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -33,6 +33,9 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) { libxl_defbool_setdefault(&c_info->hap, true); libxl_defbool_setdefault(&c_info->oos, true); + } else { + libxl_defbool_setdefault(&c_info->pvh, false); + libxl_defbool_setdefault(&c_info->hap, libxl_defbool_val(c_info->pvh)); } libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); @@ -381,6 +384,8 @@ int libxl__domain_build(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PV: + state->pvh_enabled = libxl_defbool_val(d_config->c_info.pvh); + ret = libxl__build_pv(gc, domid, info, state); if (ret) goto out; @@ -440,6 +445,14 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_create_info *info, flags |= XEN_DOMCTL_CDF_hvm_guest; flags |= libxl_defbool_val(info->hap) ? XEN_DOMCTL_CDF_hap : 0; flags |= libxl_defbool_val(info->oos) ? 0 : XEN_DOMCTL_CDF_oos_off; + } else if (libxl_defbool_val(info->pvh)) { + flags |= XEN_DOMCTL_CDF_pvh_guest; + if (!libxl_defbool_val(info->hap)) { + LOG(ERROR, "HAP must be on for PVH"); + rc = ERROR_INVAL; + goto out; + } + flags |= XEN_DOMCTL_CDF_hap; } *domid = -1; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 6cb39c1..a1c16b0 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -348,7 +348,10 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, return ERROR_FAIL; } + dom->pvh_enabled = state->pvh_enabled; + LOG(DEBUG, "pv kernel mapped %d path %s", state->pv_kernel.mapped, state->pv_kernel.path); + if (state->pv_kernel.mapped) { ret = xc_dom_kernel_mem(dom, state->pv_kernel.data, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4ad6ad3..23ff265 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -887,6 +887,7 @@ typedef struct { libxl__file_reference pv_kernel; libxl__file_reference pv_ramdisk; const char * pv_cmdline; + bool pvh_enabled; } libxl__domain_build_state; _hidden int libxl__build_pre(libxl__gc *gc, uint32_t domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ce003c6..de5bac3 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -274,6 +274,7 @@ libxl_domain_create_info = Struct("domain_create_info",[ ("platformdata", libxl_key_value_list), ("poolid", uint32), ("run_hotplug_scripts",libxl_defbool), + ("pvh", libxl_defbool), ], dir=DIR_IN) libxl_domain_restore_params = Struct("domain_restore_params", [ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index a78c91d..87a8110 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -290,7 +290,9 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, if (rtc_timeoffset) xc_domain_set_time_offset(ctx->xch, domid, rtc_timeoffset); - if (d_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { + if (d_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM || + libxl_defbool_val(d_config->c_info.pvh)) { + unsigned long shadow; shadow = (d_config->b_info.shadow_memkb + 1023) / 1024; xc_shadow_control(ctx->xch, domid, XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION, NULL, 0, &shadow, 0, NULL); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5bd9b15..8690ec7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -642,6 +642,7 @@ static void parse_config_data(const char *config_source, !strncmp(buf, "hvm", strlen(buf))) c_info->type = LIBXL_DOMAIN_TYPE_HVM; + xlu_cfg_get_defbool(config, "pvh", &c_info->pvh, 0); xlu_cfg_get_defbool(config, "hap", &c_info->hap, 0); if (xlu_cfg_replace_string (config, "name", &c_info->name, 0)) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44V-00013K-Ij; Thu, 14 Nov 2013 21:03:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44T-00012o-TJ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:26 +0000 Received: from [85.158.137.68:25699] by server-13.bemta-3.messagelabs.com id F9/AE-02689-D9A35825; Thu, 14 Nov 2013 21:03:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1384463003!1601134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11892 invoked from network); 14 Nov 2013 21:03:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44R-0007Oj-5l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44R-0000DQ-4l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:23 +0000 Date: Thu, 14 Nov 2013 21:03:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PVH dom0: set eflags resvd bit #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 2e3eba1a3d5cead2f25fde11874a9ef5e9c7b4be Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:52:18 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:52:18 2013 +0100 PVH dom0: set eflags resvd bit #1 In this patch the eflags resv bit #1 is set in vmx_vmenter_helper. If the bit is not set, the vmlaunch/resume will fail with guest state invalid. Signed-off-by: Mukesh Rathor For consistency (i.e. even if perhaps not strictly needed) also do the same on SVM. Signed-off-by: Jan Beulich --- xen/arch/x86/domain.c | 2 -- xen/arch/x86/hvm/hvm.c | 6 ++---- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/include/asm-x86/processor.h | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 45e5afe..a3868f9 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -743,8 +743,6 @@ int arch_set_info_guest( for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) v->arch.debugreg[i] = c(debugreg[i]); - v->arch.user_regs.eflags |= 2; - if ( has_hvm_container_vcpu(v) ) { /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3919590..6efdd85 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -972,7 +972,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) v->arch.user_regs.edi = ctxt.rdi; v->arch.user_regs.esp = ctxt.rsp; v->arch.user_regs.eip = ctxt.rip; - v->arch.user_regs.eflags = ctxt.rflags | 2; + v->arch.user_regs.eflags = ctxt.rflags | X86_EFLAGS_MBS; v->arch.user_regs.r8 = ctxt.r8; v->arch.user_regs.r9 = ctxt.r9; v->arch.user_regs.r10 = ctxt.r10; @@ -1170,8 +1170,6 @@ int hvm_vcpu_initialise(struct vcpu *v) (void(*)(unsigned long))hvm_assert_evtchn_irq, (unsigned long)v); - v->arch.user_regs.eflags = 2; - v->arch.hvm_vcpu.inject_trap.vector = -1; if ( is_pvh_vcpu(v) ) @@ -3636,7 +3634,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) v->arch.vgc_flags = VGCF_online; memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); - v->arch.user_regs.eflags = 2; + v->arch.user_regs.eflags = X86_EFLAGS_MBS; v->arch.user_regs.edx = 0x00000f00; v->arch.user_regs.eip = ip; memset(&v->arch.debugreg, 0, sizeof(v->arch.debugreg)); diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index aeddf64..ef4d5f4 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -76,6 +76,7 @@ UNLIKELY_END(svm_trace) mov UREGS_rsp(%rsp),%rax mov %rax,VMCB_rsp(%rcx) mov UREGS_eflags(%rsp),%rax + or $X86_EFLAGS_MBS,%rax mov %rax,VMCB_rflags(%rcx) pop %r15 diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 1c91e09..f0132a4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3048,7 +3048,7 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); - __vmwrite(GUEST_RFLAGS, regs->rflags); + __vmwrite(GUEST_RFLAGS, regs->rflags | X86_EFLAGS_MBS); } /* diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 551036d..73a3202 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -35,6 +35,7 @@ * EFLAGS bits */ #define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ +#define X86_EFLAGS_MBS 0x00000002 /* Resvd bit */ #define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ #define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ #define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44V-00013K-Ij; Thu, 14 Nov 2013 21:03:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44T-00012o-TJ for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:26 +0000 Received: from [85.158.137.68:25699] by server-13.bemta-3.messagelabs.com id F9/AE-02689-D9A35825; Thu, 14 Nov 2013 21:03:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1384463003!1601134!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11892 invoked from network); 14 Nov 2013 21:03:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2013 21:03:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44R-0007Oj-5l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44R-0000DQ-4l for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:23 +0000 Date: Thu, 14 Nov 2013 21:03:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PVH dom0: set eflags resvd bit #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 2e3eba1a3d5cead2f25fde11874a9ef5e9c7b4be Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:52:18 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:52:18 2013 +0100 PVH dom0: set eflags resvd bit #1 In this patch the eflags resv bit #1 is set in vmx_vmenter_helper. If the bit is not set, the vmlaunch/resume will fail with guest state invalid. Signed-off-by: Mukesh Rathor For consistency (i.e. even if perhaps not strictly needed) also do the same on SVM. Signed-off-by: Jan Beulich --- xen/arch/x86/domain.c | 2 -- xen/arch/x86/hvm/hvm.c | 6 ++---- xen/arch/x86/hvm/svm/entry.S | 1 + xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/include/asm-x86/processor.h | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 45e5afe..a3868f9 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -743,8 +743,6 @@ int arch_set_info_guest( for ( i = 0; i < ARRAY_SIZE(v->arch.debugreg); ++i ) v->arch.debugreg[i] = c(debugreg[i]); - v->arch.user_regs.eflags |= 2; - if ( has_hvm_container_vcpu(v) ) { /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3919590..6efdd85 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -972,7 +972,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) v->arch.user_regs.edi = ctxt.rdi; v->arch.user_regs.esp = ctxt.rsp; v->arch.user_regs.eip = ctxt.rip; - v->arch.user_regs.eflags = ctxt.rflags | 2; + v->arch.user_regs.eflags = ctxt.rflags | X86_EFLAGS_MBS; v->arch.user_regs.r8 = ctxt.r8; v->arch.user_regs.r9 = ctxt.r9; v->arch.user_regs.r10 = ctxt.r10; @@ -1170,8 +1170,6 @@ int hvm_vcpu_initialise(struct vcpu *v) (void(*)(unsigned long))hvm_assert_evtchn_irq, (unsigned long)v); - v->arch.user_regs.eflags = 2; - v->arch.hvm_vcpu.inject_trap.vector = -1; if ( is_pvh_vcpu(v) ) @@ -3636,7 +3634,7 @@ void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip) v->arch.vgc_flags = VGCF_online; memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); - v->arch.user_regs.eflags = 2; + v->arch.user_regs.eflags = X86_EFLAGS_MBS; v->arch.user_regs.edx = 0x00000f00; v->arch.user_regs.eip = ip; memset(&v->arch.debugreg, 0, sizeof(v->arch.debugreg)); diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index aeddf64..ef4d5f4 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -76,6 +76,7 @@ UNLIKELY_END(svm_trace) mov UREGS_rsp(%rsp),%rax mov %rax,VMCB_rsp(%rcx) mov UREGS_eflags(%rsp),%rax + or $X86_EFLAGS_MBS,%rax mov %rax,VMCB_rflags(%rcx) pop %r15 diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 1c91e09..f0132a4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3048,7 +3048,7 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); - __vmwrite(GUEST_RFLAGS, regs->rflags); + __vmwrite(GUEST_RFLAGS, regs->rflags | X86_EFLAGS_MBS); } /* diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 551036d..73a3202 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -35,6 +35,7 @@ * EFLAGS bits */ #define X86_EFLAGS_CF 0x00000001 /* Carry Flag */ +#define X86_EFLAGS_MBS 0x00000002 /* Resvd bit */ #define X86_EFLAGS_PF 0x00000004 /* Parity Flag */ #define X86_EFLAGS_AF 0x00000010 /* Auxillary carry Flag */ #define X86_EFLAGS_ZF 0x00000040 /* Zero Flag */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44f-00015g-MY; Thu, 14 Nov 2013 21:03:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44e-00015F-1H for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:36 +0000 Received: from [193.109.254.147:3105] by server-13.bemta-14.messagelabs.com id 09/09-17468-7AA35825; Thu, 14 Nov 2013 21:03:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384463013!2826124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6500 invoked from network); 14 Nov 2013 21:03:34 -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; 14 Nov 2013 21:03:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44b-0007Or-Ci for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44b-0000Dr-AV for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:33 +0000 Date: Thu, 14 Nov 2013 21:03:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PVH dom0: allow all physdev ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fef491f2d974d4e33eec5b2a4d23fedae0f93fbd Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:53:30 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:53:30 2013 +0100 PVH dom0: allow all physdev ops Allow a PVH dom0 access to all PHYSDEVOP_* ops. Signed-off-by: Mukesh Rathor Convert flow and adjust indentation. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6efdd85..3b353ec 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3278,14 +3278,16 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { switch ( cmd ) { - case PHYSDEVOP_map_pirq: - case PHYSDEVOP_unmap_pirq: - case PHYSDEVOP_eoi: - case PHYSDEVOP_irq_status_query: - case PHYSDEVOP_get_free_pirq: - return do_physdev_op(cmd, arg); - default: + default: + if ( !is_pvh_vcpu(current) || !is_hardware_domain(current->domain) ) return -ENOSYS; + /* fall through */ + case PHYSDEVOP_map_pirq: + case PHYSDEVOP_unmap_pirq: + case PHYSDEVOP_eoi: + case PHYSDEVOP_irq_status_query: + case PHYSDEVOP_get_free_pirq: + return do_physdev_op(cmd, arg); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 14 21:03:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Nov 2013 21:03: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 1Vh44f-00015g-MY; Thu, 14 Nov 2013 21:03:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44e-00015F-1H for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:36 +0000 Received: from [193.109.254.147:3105] by server-13.bemta-14.messagelabs.com id 09/09-17468-7AA35825; Thu, 14 Nov 2013 21:03:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384463013!2826124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6500 invoked from network); 14 Nov 2013 21:03:34 -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; 14 Nov 2013 21:03:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vh44b-0007Or-Ci for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vh44b-0000Dr-AV for xen-changelog@lists.xensource.com; Thu, 14 Nov 2013 21:03:33 +0000 Date: Thu, 14 Nov 2013 21:03:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] PVH dom0: allow all physdev ops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fef491f2d974d4e33eec5b2a4d23fedae0f93fbd Author: Mukesh Rathor AuthorDate: Wed Nov 13 09:53:30 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 13 09:53:30 2013 +0100 PVH dom0: allow all physdev ops Allow a PVH dom0 access to all PHYSDEVOP_* ops. Signed-off-by: Mukesh Rathor Convert flow and adjust indentation. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6efdd85..3b353ec 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3278,14 +3278,16 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { switch ( cmd ) { - case PHYSDEVOP_map_pirq: - case PHYSDEVOP_unmap_pirq: - case PHYSDEVOP_eoi: - case PHYSDEVOP_irq_status_query: - case PHYSDEVOP_get_free_pirq: - return do_physdev_op(cmd, arg); - default: + default: + if ( !is_pvh_vcpu(current) || !is_hardware_domain(current->domain) ) return -ENOSYS; + /* fall through */ + case PHYSDEVOP_map_pirq: + case PHYSDEVOP_unmap_pirq: + case PHYSDEVOP_eoi: + case PHYSDEVOP_irq_status_query: + case PHYSDEVOP_get_free_pirq: + return do_physdev_op(cmd, arg); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmD-0006kO-Gl; Fri, 15 Nov 2013 22:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmB-0006kG-CN for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:07 +0000 Received: from [85.158.139.211:22807] by server-7.bemta-5.messagelabs.com id E6/8E-13897-E8E96825; Fri, 15 Nov 2013 22:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384554123!2353937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21396 invoked from network); 15 Nov 2013 22:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRm7-0006kC-N5 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRm7-0000cD-DJ for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:03 +0000 Date: Fri, 15 Nov 2013 22:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] scheduler: adjust internal locking 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 6bed2fe1f08ca86488af66d027192460b395eba4 Author: Jan Beulich AuthorDate: Fri Nov 15 11:32:51 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:32:51 2013 +0100 scheduler: adjust internal locking interface Make the locking functions return the lock pointers, so they can be passed to the unlocking functions (which in turn can check that the lock is still actually providing the intended protection, i.e. the parameters determining which lock is the right one didn't change). Further use proper spin lock primitives rather than open coded local_irq_...() constructs, so that interrupts can be re-enabled as appropriate while spinning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: eedd60391610629b4e8a2e8278b857ff884f750d master date: 2013-10-14 08:57:56 +0200 --- xen/arch/x86/cpu/mcheck/mce.c | 31 +++++----- xen/common/sched_credit.c | 12 +++- xen/common/sched_credit2.c | 20 +++--- xen/common/sched_sedf.c | 29 +++++--- xen/common/schedule.c | 61 +++++++++--------- xen/include/xen/sched-if.h | 138 +++++++++++++++++------------------------ 6 files changed, 139 insertions(+), 152 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d03769c..66d8dfa 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -401,7 +401,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, mctelem_cookie_t mctc = NULL; struct mca_summary bs; struct mc_info *mci = NULL; - int irqlocked = 0; + spinlock_t *lock = NULL; uint64_t gstatus; int ripv; @@ -411,8 +411,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, /* Disable interrupts for the _vcpu_. It may not re-scheduled to * another physical CPU. */ - vcpu_schedule_lock_irq(v); - irqlocked = 1; + lock = vcpu_schedule_lock_irq(v); /* Read global status; if it does not indicate machine check * in progress then bail as long as we have a valid ip to return to. */ @@ -420,8 +419,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, ripv = ((gstatus & MCG_STATUS_RIPV) != 0); if (!(gstatus & MCG_STATUS_MCIP) && ripv) { add_taint(TAINT_MACHINE_CHECK); /* questionable */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; goto cmn_handler_done; } @@ -440,8 +439,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, /* If no valid errors and our stack is intact, we're done */ if (ripv && bs.errcnt == 0) { - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; goto cmn_handler_done; } @@ -484,8 +483,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, if (xen_state_lost) { /* Now we are going to panic anyway. Allow interrupts, so that * printk on serial console can work. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; printk("Terminal machine check exception occurred in " "hypervisor context.\n"); @@ -557,8 +556,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, * domain_crash() the vcpu pointer is invalid. * Therefore, we must unlock the irqs before killing * it. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; /* DomU is impacted. Kill it and continue. */ domain_crash(curdom); @@ -569,8 +568,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, case DOM0_TRAP: case DOMU_TRAP: /* Enable interrupts. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; /* guest softirqs and event callbacks are scheduled * immediately after this handler exits. */ @@ -580,13 +579,13 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, break; case DOM_NORMAL: - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; break; } cmn_handler_done: - BUG_ON(irqlocked); + BUG_ON(lock != NULL); BUG_ON(!ripv); if (bs.errcnt) { diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 68dc80b..ec30706 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -937,6 +937,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) struct csched_pcpu * const spc = CSCHED_PCPU(cpu); struct list_head *runq, *elem, *next, *last_under; struct csched_vcpu *svc_elem; + spinlock_t *lock; unsigned long flags; int sort_epoch; @@ -946,7 +947,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) spc->runq_sort_last = sort_epoch; - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); runq = &spc->runq; elem = runq->next; @@ -971,7 +972,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) elem = next; } - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); } static void @@ -1288,6 +1289,8 @@ csched_load_balance(struct csched_private *prv, int cpu, while ( !cpumask_empty(&workers) ) { + spinlock_t *lock; + peer_cpu = cpumask_cycle(peer_cpu, &workers); cpumask_clear_cpu(peer_cpu, &workers); @@ -1298,7 +1301,8 @@ csched_load_balance(struct csched_private *prv, int cpu, * cause a deadlock if the peer CPU is also load balancing and trying * to lock this CPU. */ - if ( !pcpu_schedule_trylock(peer_cpu) ) + lock = pcpu_schedule_trylock(peer_cpu); + if ( !lock ) { CSCHED_STAT_CRANK(steal_trylock_failed); continue; @@ -1309,7 +1313,7 @@ csched_load_balance(struct csched_private *prv, int cpu, */ speer = cpumask_test_cpu(peer_cpu, online) ? csched_runq_steal(peer_cpu, cpu, snext->pri) : NULL; - pcpu_schedule_unlock(peer_cpu); + pcpu_schedule_unlock(lock, peer_cpu); if ( speer != NULL ) { *stolen = 1; diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 471f6d5..26d87b3 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -835,15 +835,17 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) */ if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + /* FIXME: Do we need the private lock here? */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); /* Add vcpu to runqueue of initial processor */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_assign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); sdom->nr_vcpus++; } @@ -871,11 +873,11 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) if ( ! is_idle_vcpu(vc) ) { /* Remove from runqueue */ - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); runq_deassign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); /* Remove from sdom list. Don't need a lock for this, as it's called * syncronously when nothing else can happen. */ @@ -962,8 +964,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu * const svc = CSCHED_VCPU(vc); s_time_t now = NOW(); - - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); BUG_ON( !is_idle_vcpu(vc) && svc->rqd != RQD(ops, vc->processor)); @@ -989,7 +990,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) else if ( !is_idle_vcpu(vc) ) update_load(ops, svc->rqd, svc, -1, now); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); } #define MAX_LOAD (1ULL<<60); @@ -1406,14 +1407,14 @@ csched_dom_cntl( * must never lock csched_priv.lock if we're holding a runqueue lock. * Also, calling vcpu_schedule_lock() is enough, since IRQs have already * been disabled. */ - vcpu_schedule_lock(svc->vcpu); + spinlock_t *lock = vcpu_schedule_lock(svc->vcpu); BUG_ON(svc->rqd != RQD(ops, svc->vcpu->processor)); svc->weight = sdom->weight; update_max_weight(svc->rqd, svc->weight, old_weight); - vcpu_schedule_unlock(svc->vcpu); + vcpu_schedule_unlock(lock, svc->vcpu); } } } @@ -1923,6 +1924,7 @@ static void init_pcpu(const struct scheduler *ops, int cpu) cpumask_set_cpu(cpu, &rqd->idle); cpumask_set_cpu(cpu, &rqd->active); + /* _Not_ pcpu_schedule_unlock(): per_cpu().schedule_lock changed! */ spin_unlock(old_lock); cpumask_set_cpu(cpu, &prv->initialized); diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 92ba36a..d126d4f 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -1349,14 +1349,16 @@ static int sedf_adjust_weights(struct cpupool *c, int nr_cpus, int *sumw, s_time if ( EDOM_INFO(p)->weight ) { /* Interrupts already off */ - vcpu_schedule_lock(p); + spinlock_t *lock = vcpu_schedule_lock(p); + EDOM_INFO(p)->period_orig = EDOM_INFO(p)->period = WEIGHT_PERIOD; EDOM_INFO(p)->slice_orig = EDOM_INFO(p)->slice = (EDOM_INFO(p)->weight * (WEIGHT_PERIOD - WEIGHT_SAFETY - sumt[cpu])) / sumw[cpu]; - vcpu_schedule_unlock(p); + + vcpu_schedule_unlock(lock, p); } } } @@ -1417,21 +1419,24 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen { /* (Here and everywhere in the following) IRQs are already off, * hence vcpu_spin_lock() is the one. */ - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->extraweight = op->u.sedf.weight; EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->slice = 0; EDOM_INFO(v)->period = WEIGHT_PERIOD; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else { /* Weight-driven domains with real-time execution */ - for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + for_each_vcpu ( p, v ) + { + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = op->u.sedf.weight; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } } @@ -1453,14 +1458,15 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen /* Time-driven domains */ for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->extraweight = 0; EDOM_INFO(v)->period_orig = EDOM_INFO(v)->period = op->u.sedf.period; EDOM_INFO(v)->slice_orig = EDOM_INFO(v)->slice = op->u.sedf.slice; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } @@ -1470,13 +1476,14 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->status = (EDOM_INFO(v)->status & ~EXTRA_AWARE) | (op->u.sedf.extratime & EXTRA_AWARE); EDOM_INFO(v)->latency = op->u.sedf.latency; extraq_check(v); - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else if ( op->cmd == XEN_DOMCTL_SCHEDOP_getinfo ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3f7d463..38661ea 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -159,18 +159,16 @@ static inline void vcpu_runstate_change( void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate) { + spinlock_t *lock = likely(v == current) ? NULL : vcpu_schedule_lock_irq(v); s_time_t delta; - if ( unlikely(v != current) ) - vcpu_schedule_lock_irq(v); - memcpy(runstate, &v->runstate, sizeof(*runstate)); delta = NOW() - runstate->state_entry_time; if ( delta > 0 ) runstate->time[runstate->state] += delta; - if ( unlikely(v != current) ) - vcpu_schedule_unlock_irq(v); + if ( unlikely(lock != NULL) ) + vcpu_schedule_unlock_irq(lock, v); } uint64_t get_cpu_idle_time(unsigned int cpu) @@ -330,8 +328,7 @@ void sched_destroy_domain(struct domain *d) void vcpu_sleep_nosync(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(!vcpu_runnable(v)) ) { @@ -341,7 +338,7 @@ void vcpu_sleep_nosync(struct vcpu *v) SCHED_OP(VCPU2OP(v), sleep, v); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); } @@ -359,8 +356,7 @@ void vcpu_sleep_sync(struct vcpu *v) void vcpu_wake(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(vcpu_runnable(v)) ) { @@ -374,7 +370,7 @@ void vcpu_wake(struct vcpu *v) vcpu_runstate_change(v, RUNSTATE_offline, NOW()); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); } @@ -525,10 +521,11 @@ static void vcpu_migrate(struct vcpu *v) */ void vcpu_force_reschedule(struct vcpu *v) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); + if ( v->is_running ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); if ( test_bit(_VPF_migrating, &v->pause_flags) ) { @@ -543,7 +540,7 @@ void restore_vcpu_affinity(struct domain *d) for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); if ( v->affinity_broken ) { @@ -556,13 +553,13 @@ void restore_vcpu_affinity(struct domain *d) if ( v->processor == smp_processor_id() ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } } @@ -589,7 +586,7 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -610,13 +607,13 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } /* @@ -638,6 +635,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) { cpumask_t online_affinity; cpumask_t *online; + spinlock_t *lock; if ( v->domain->is_pinned ) return -EINVAL; @@ -646,14 +644,14 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) if ( cpumask_empty(&online_affinity) ) return -EINVAL; - vcpu_schedule_lock_irq(v); + lock = vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); domain_update_node_affinity(v->domain); @@ -764,10 +762,10 @@ static long do_poll(struct sched_poll *sched_poll) static long do_yield(void) { struct vcpu * v=current; + spinlock_t *lock = vcpu_schedule_lock_irq(v); - vcpu_schedule_lock_irq(v); SCHED_OP(VCPU2OP(v), yield, v); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); @@ -1126,6 +1124,7 @@ static void schedule(void) unsigned long *tasklet_work = &this_cpu(tasklet_work_to_do); bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; + spinlock_t *lock; struct task_slice next_slice; int cpu = smp_processor_id(); @@ -1152,7 +1151,7 @@ static void schedule(void) BUG(); } - pcpu_schedule_lock_irq(cpu); + lock = pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1169,7 +1168,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); trace_continue_running(next); return continue_running(prev); } @@ -1207,7 +1206,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); perfc_incr(sched_ctx); @@ -1396,6 +1395,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { unsigned long flags; struct vcpu *idle; + spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; struct scheduler *old_ops = per_cpu(scheduler, cpu); struct scheduler *new_ops = (c == NULL) ? &ops : c->sched; @@ -1414,7 +1414,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1425,7 +1425,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) SCHED_OP(new_ops, tick_resume, cpu); SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); @@ -1483,10 +1483,11 @@ void schedule_dump(struct cpupool *c) for_each_cpu (i, cpus) { - pcpu_schedule_lock(i); + spinlock_t *lock = pcpu_schedule_lock(i); + printk("CPU[%02d] ", i); SCHED_OP(sched, dump_cpu_state, i); - pcpu_schedule_unlock(i); + pcpu_schedule_unlock(lock, i); } } diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index c3be9dc..febd3c1 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -45,96 +45,70 @@ DECLARE_PER_CPU(struct schedule_data, schedule_data); DECLARE_PER_CPU(struct scheduler *, scheduler); DECLARE_PER_CPU(struct cpupool *, cpupool); -static inline spinlock_t * pcpu_schedule_lock(int cpu) -{ - spinlock_t * lock=NULL; - - for ( ; ; ) - { - /* The per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - */ - lock=per_cpu(schedule_data, cpu).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) - break; - spin_unlock(lock); - } - return lock; +#define sched_lock(kind, param, cpu, irq, arg...) \ +static inline spinlock_t *kind##_schedule_lock##irq(param EXTRA_TYPE(arg)) \ +{ \ + for ( ; ; ) \ + { \ + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; \ + /* \ + * v->processor may change when grabbing the lock; but \ + * per_cpu(v->processor) may also change, if changing cpu pool \ + * also changes the scheduler lock. Retry until they match. \ + * \ + * It may also be the case that v->processor may change but the \ + * lock may be the same; this will succeed in that case. \ + */ \ + spin_lock##irq(lock, ## arg); \ + if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) \ + return lock; \ + spin_unlock##irq(lock, ## arg); \ + } \ } -static inline int pcpu_schedule_trylock(int cpu) -{ - spinlock_t * lock=NULL; - - lock=per_cpu(schedule_data, cpu).schedule_lock; - if ( ! spin_trylock(lock) ) - return 0; - if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) - return 1; - else - { - spin_unlock(lock); - return 0; - } -} - -#define pcpu_schedule_lock_irq(p) \ - do { local_irq_disable(); pcpu_schedule_lock(p); } while ( 0 ) -#define pcpu_schedule_lock_irqsave(p, flags) \ - do { local_irq_save(flags); pcpu_schedule_lock(p); } while ( 0 ) - -static inline void pcpu_schedule_unlock(int cpu) -{ - spin_unlock(per_cpu(schedule_data, cpu).schedule_lock); +#define sched_unlock(kind, param, cpu, irq, arg...) \ +static inline void kind##_schedule_unlock##irq(spinlock_t *lock \ + EXTRA_TYPE(arg), param) \ +{ \ + ASSERT(lock == per_cpu(schedule_data, cpu).schedule_lock); \ + spin_unlock##irq(lock, ## arg); \ } -#define pcpu_schedule_unlock_irq(p) \ - do { pcpu_schedule_unlock(p); local_irq_enable(); } while ( 0 ) -#define pcpu_schedule_unlock_irqrestore(p, flags) \ - do { pcpu_schedule_unlock(p); local_irq_restore(flags); } while ( 0 ) - -static inline void vcpu_schedule_lock(struct vcpu *v) +#define EXTRA_TYPE(arg) +sched_lock(pcpu, unsigned int cpu, cpu, ) +sched_lock(vcpu, const struct vcpu *v, v->processor, ) +sched_lock(pcpu, unsigned int cpu, cpu, _irq) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irq) +sched_unlock(pcpu, unsigned int cpu, cpu, ) +sched_unlock(vcpu, const struct vcpu *v, v->processor, ) +sched_unlock(pcpu, unsigned int cpu, cpu, _irq) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irq) +#undef EXTRA_TYPE + +#define EXTRA_TYPE(arg) , unsigned long arg +#define spin_unlock_irqsave spin_unlock_irqrestore +sched_lock(pcpu, unsigned int cpu, cpu, _irqsave, *flags) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irqsave, *flags) +#undef spin_unlock_irqsave +sched_unlock(pcpu, unsigned int cpu, cpu, _irqrestore, flags) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irqrestore, flags) +#undef EXTRA_TYPE + +#undef sched_unlock +#undef sched_lock + +static inline spinlock_t *pcpu_schedule_trylock(unsigned int cpu) { - spinlock_t * lock; - - for ( ; ; ) - { - /* v->processor may change when grabbing the lock; but - * per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - * - * It may also be the case that v->processor may change - * but the lock may be the same; this will succeed - * in that case. - */ - lock=per_cpu(schedule_data, v->processor).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, v->processor).schedule_lock) ) - break; - spin_unlock(lock); - } -} - -#define vcpu_schedule_lock_irq(v) \ - do { local_irq_disable(); vcpu_schedule_lock(v); } while ( 0 ) -#define vcpu_schedule_lock_irqsave(v, flags) \ - do { local_irq_save(flags); vcpu_schedule_lock(v); } while ( 0 ) + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; -static inline void vcpu_schedule_unlock(struct vcpu *v) -{ - spin_unlock(per_cpu(schedule_data, v->processor).schedule_lock); + if ( !spin_trylock(lock) ) + return NULL; + if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) + return lock; + spin_unlock(lock); + return NULL; } -#define vcpu_schedule_unlock_irq(v) \ - do { vcpu_schedule_unlock(v); local_irq_enable(); } while ( 0 ) -#define vcpu_schedule_unlock_irqrestore(v, flags) \ - do { vcpu_schedule_unlock(v); local_irq_restore(flags); } while ( 0 ) - struct task_slice { struct vcpu *task; s_time_t time; -- 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 Nov 15 22:22:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmD-0006kO-Gl; Fri, 15 Nov 2013 22:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmB-0006kG-CN for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:07 +0000 Received: from [85.158.139.211:22807] by server-7.bemta-5.messagelabs.com id E6/8E-13897-E8E96825; Fri, 15 Nov 2013 22:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1384554123!2353937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21396 invoked from network); 15 Nov 2013 22:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRm7-0006kC-N5 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRm7-0000cD-DJ for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:03 +0000 Date: Fri, 15 Nov 2013 22:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] scheduler: adjust internal locking 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 6bed2fe1f08ca86488af66d027192460b395eba4 Author: Jan Beulich AuthorDate: Fri Nov 15 11:32:51 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:32:51 2013 +0100 scheduler: adjust internal locking interface Make the locking functions return the lock pointers, so they can be passed to the unlocking functions (which in turn can check that the lock is still actually providing the intended protection, i.e. the parameters determining which lock is the right one didn't change). Further use proper spin lock primitives rather than open coded local_irq_...() constructs, so that interrupts can be re-enabled as appropriate while spinning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: eedd60391610629b4e8a2e8278b857ff884f750d master date: 2013-10-14 08:57:56 +0200 --- xen/arch/x86/cpu/mcheck/mce.c | 31 +++++----- xen/common/sched_credit.c | 12 +++- xen/common/sched_credit2.c | 20 +++--- xen/common/sched_sedf.c | 29 +++++--- xen/common/schedule.c | 61 +++++++++--------- xen/include/xen/sched-if.h | 138 +++++++++++++++++------------------------ 6 files changed, 139 insertions(+), 152 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d03769c..66d8dfa 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -401,7 +401,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, mctelem_cookie_t mctc = NULL; struct mca_summary bs; struct mc_info *mci = NULL; - int irqlocked = 0; + spinlock_t *lock = NULL; uint64_t gstatus; int ripv; @@ -411,8 +411,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, /* Disable interrupts for the _vcpu_. It may not re-scheduled to * another physical CPU. */ - vcpu_schedule_lock_irq(v); - irqlocked = 1; + lock = vcpu_schedule_lock_irq(v); /* Read global status; if it does not indicate machine check * in progress then bail as long as we have a valid ip to return to. */ @@ -420,8 +419,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, ripv = ((gstatus & MCG_STATUS_RIPV) != 0); if (!(gstatus & MCG_STATUS_MCIP) && ripv) { add_taint(TAINT_MACHINE_CHECK); /* questionable */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; goto cmn_handler_done; } @@ -440,8 +439,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, /* If no valid errors and our stack is intact, we're done */ if (ripv && bs.errcnt == 0) { - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; goto cmn_handler_done; } @@ -484,8 +483,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, if (xen_state_lost) { /* Now we are going to panic anyway. Allow interrupts, so that * printk on serial console can work. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; printk("Terminal machine check exception occurred in " "hypervisor context.\n"); @@ -557,8 +556,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, * domain_crash() the vcpu pointer is invalid. * Therefore, we must unlock the irqs before killing * it. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; /* DomU is impacted. Kill it and continue. */ domain_crash(curdom); @@ -569,8 +568,8 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, case DOM0_TRAP: case DOMU_TRAP: /* Enable interrupts. */ - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; /* guest softirqs and event callbacks are scheduled * immediately after this handler exits. */ @@ -580,13 +579,13 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, break; case DOM_NORMAL: - vcpu_schedule_unlock_irq(v); - irqlocked = 0; + vcpu_schedule_unlock_irq(lock, v); + lock = NULL; break; } cmn_handler_done: - BUG_ON(irqlocked); + BUG_ON(lock != NULL); BUG_ON(!ripv); if (bs.errcnt) { diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 68dc80b..ec30706 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -937,6 +937,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) struct csched_pcpu * const spc = CSCHED_PCPU(cpu); struct list_head *runq, *elem, *next, *last_under; struct csched_vcpu *svc_elem; + spinlock_t *lock; unsigned long flags; int sort_epoch; @@ -946,7 +947,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) spc->runq_sort_last = sort_epoch; - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); runq = &spc->runq; elem = runq->next; @@ -971,7 +972,7 @@ csched_runq_sort(struct csched_private *prv, unsigned int cpu) elem = next; } - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); } static void @@ -1288,6 +1289,8 @@ csched_load_balance(struct csched_private *prv, int cpu, while ( !cpumask_empty(&workers) ) { + spinlock_t *lock; + peer_cpu = cpumask_cycle(peer_cpu, &workers); cpumask_clear_cpu(peer_cpu, &workers); @@ -1298,7 +1301,8 @@ csched_load_balance(struct csched_private *prv, int cpu, * cause a deadlock if the peer CPU is also load balancing and trying * to lock this CPU. */ - if ( !pcpu_schedule_trylock(peer_cpu) ) + lock = pcpu_schedule_trylock(peer_cpu); + if ( !lock ) { CSCHED_STAT_CRANK(steal_trylock_failed); continue; @@ -1309,7 +1313,7 @@ csched_load_balance(struct csched_private *prv, int cpu, */ speer = cpumask_test_cpu(peer_cpu, online) ? csched_runq_steal(peer_cpu, cpu, snext->pri) : NULL; - pcpu_schedule_unlock(peer_cpu); + pcpu_schedule_unlock(lock, peer_cpu); if ( speer != NULL ) { *stolen = 1; diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 471f6d5..26d87b3 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -835,15 +835,17 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) */ if ( ! is_idle_vcpu(vc) ) { + spinlock_t *lock; + /* FIXME: Do we need the private lock here? */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); /* Add vcpu to runqueue of initial processor */ - vcpu_schedule_lock_irq(vc); + lock = vcpu_schedule_lock_irq(vc); runq_assign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); sdom->nr_vcpus++; } @@ -871,11 +873,11 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) if ( ! is_idle_vcpu(vc) ) { /* Remove from runqueue */ - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); runq_deassign(ops, vc); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); /* Remove from sdom list. Don't need a lock for this, as it's called * syncronously when nothing else can happen. */ @@ -962,8 +964,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu * const svc = CSCHED_VCPU(vc); s_time_t now = NOW(); - - vcpu_schedule_lock_irq(vc); + spinlock_t *lock = vcpu_schedule_lock_irq(vc); BUG_ON( !is_idle_vcpu(vc) && svc->rqd != RQD(ops, vc->processor)); @@ -989,7 +990,7 @@ csched_context_saved(const struct scheduler *ops, struct vcpu *vc) else if ( !is_idle_vcpu(vc) ) update_load(ops, svc->rqd, svc, -1, now); - vcpu_schedule_unlock_irq(vc); + vcpu_schedule_unlock_irq(lock, vc); } #define MAX_LOAD (1ULL<<60); @@ -1406,14 +1407,14 @@ csched_dom_cntl( * must never lock csched_priv.lock if we're holding a runqueue lock. * Also, calling vcpu_schedule_lock() is enough, since IRQs have already * been disabled. */ - vcpu_schedule_lock(svc->vcpu); + spinlock_t *lock = vcpu_schedule_lock(svc->vcpu); BUG_ON(svc->rqd != RQD(ops, svc->vcpu->processor)); svc->weight = sdom->weight; update_max_weight(svc->rqd, svc->weight, old_weight); - vcpu_schedule_unlock(svc->vcpu); + vcpu_schedule_unlock(lock, svc->vcpu); } } } @@ -1923,6 +1924,7 @@ static void init_pcpu(const struct scheduler *ops, int cpu) cpumask_set_cpu(cpu, &rqd->idle); cpumask_set_cpu(cpu, &rqd->active); + /* _Not_ pcpu_schedule_unlock(): per_cpu().schedule_lock changed! */ spin_unlock(old_lock); cpumask_set_cpu(cpu, &prv->initialized); diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 92ba36a..d126d4f 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -1349,14 +1349,16 @@ static int sedf_adjust_weights(struct cpupool *c, int nr_cpus, int *sumw, s_time if ( EDOM_INFO(p)->weight ) { /* Interrupts already off */ - vcpu_schedule_lock(p); + spinlock_t *lock = vcpu_schedule_lock(p); + EDOM_INFO(p)->period_orig = EDOM_INFO(p)->period = WEIGHT_PERIOD; EDOM_INFO(p)->slice_orig = EDOM_INFO(p)->slice = (EDOM_INFO(p)->weight * (WEIGHT_PERIOD - WEIGHT_SAFETY - sumt[cpu])) / sumw[cpu]; - vcpu_schedule_unlock(p); + + vcpu_schedule_unlock(lock, p); } } } @@ -1417,21 +1419,24 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen { /* (Here and everywhere in the following) IRQs are already off, * hence vcpu_spin_lock() is the one. */ - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->extraweight = op->u.sedf.weight; EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->slice = 0; EDOM_INFO(v)->period = WEIGHT_PERIOD; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else { /* Weight-driven domains with real-time execution */ - for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + for_each_vcpu ( p, v ) + { + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = op->u.sedf.weight; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } } @@ -1453,14 +1458,15 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen /* Time-driven domains */ for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->weight = 0; EDOM_INFO(v)->extraweight = 0; EDOM_INFO(v)->period_orig = EDOM_INFO(v)->period = op->u.sedf.period; EDOM_INFO(v)->slice_orig = EDOM_INFO(v)->slice = op->u.sedf.slice; - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } @@ -1470,13 +1476,14 @@ static int sedf_adjust(const struct scheduler *ops, struct domain *p, struct xen for_each_vcpu ( p, v ) { - vcpu_schedule_lock(v); + spinlock_t *lock = vcpu_schedule_lock(v); + EDOM_INFO(v)->status = (EDOM_INFO(v)->status & ~EXTRA_AWARE) | (op->u.sedf.extratime & EXTRA_AWARE); EDOM_INFO(v)->latency = op->u.sedf.latency; extraq_check(v); - vcpu_schedule_unlock(v); + vcpu_schedule_unlock(lock, v); } } else if ( op->cmd == XEN_DOMCTL_SCHEDOP_getinfo ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3f7d463..38661ea 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -159,18 +159,16 @@ static inline void vcpu_runstate_change( void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate) { + spinlock_t *lock = likely(v == current) ? NULL : vcpu_schedule_lock_irq(v); s_time_t delta; - if ( unlikely(v != current) ) - vcpu_schedule_lock_irq(v); - memcpy(runstate, &v->runstate, sizeof(*runstate)); delta = NOW() - runstate->state_entry_time; if ( delta > 0 ) runstate->time[runstate->state] += delta; - if ( unlikely(v != current) ) - vcpu_schedule_unlock_irq(v); + if ( unlikely(lock != NULL) ) + vcpu_schedule_unlock_irq(lock, v); } uint64_t get_cpu_idle_time(unsigned int cpu) @@ -330,8 +328,7 @@ void sched_destroy_domain(struct domain *d) void vcpu_sleep_nosync(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(!vcpu_runnable(v)) ) { @@ -341,7 +338,7 @@ void vcpu_sleep_nosync(struct vcpu *v) SCHED_OP(VCPU2OP(v), sleep, v); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); } @@ -359,8 +356,7 @@ void vcpu_sleep_sync(struct vcpu *v) void vcpu_wake(struct vcpu *v) { unsigned long flags; - - vcpu_schedule_lock_irqsave(v, flags); + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); if ( likely(vcpu_runnable(v)) ) { @@ -374,7 +370,7 @@ void vcpu_wake(struct vcpu *v) vcpu_runstate_change(v, RUNSTATE_offline, NOW()); } - vcpu_schedule_unlock_irqrestore(v, flags); + vcpu_schedule_unlock_irqrestore(lock, flags, v); TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); } @@ -525,10 +521,11 @@ static void vcpu_migrate(struct vcpu *v) */ void vcpu_force_reschedule(struct vcpu *v) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); + if ( v->is_running ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); if ( test_bit(_VPF_migrating, &v->pause_flags) ) { @@ -543,7 +540,7 @@ void restore_vcpu_affinity(struct domain *d) for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); if ( v->affinity_broken ) { @@ -556,13 +553,13 @@ void restore_vcpu_affinity(struct domain *d) if ( v->processor == smp_processor_id() ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } } @@ -589,7 +586,7 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - vcpu_schedule_lock_irq(v); + spinlock_t *lock = vcpu_schedule_lock_irq(v); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -610,13 +607,13 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else { - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); } /* @@ -638,6 +635,7 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) { cpumask_t online_affinity; cpumask_t *online; + spinlock_t *lock; if ( v->domain->is_pinned ) return -EINVAL; @@ -646,14 +644,14 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t *affinity) if ( cpumask_empty(&online_affinity) ) return -EINVAL; - vcpu_schedule_lock_irq(v); + lock = vcpu_schedule_lock_irq(v); cpumask_copy(v->cpu_affinity, affinity); if ( VCPU2OP(v)->sched_id == XEN_SCHEDULER_SEDF || !cpumask_test_cpu(v->processor, v->cpu_affinity) ) set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); domain_update_node_affinity(v->domain); @@ -764,10 +762,10 @@ static long do_poll(struct sched_poll *sched_poll) static long do_yield(void) { struct vcpu * v=current; + spinlock_t *lock = vcpu_schedule_lock_irq(v); - vcpu_schedule_lock_irq(v); SCHED_OP(VCPU2OP(v), yield, v); - vcpu_schedule_unlock_irq(v); + vcpu_schedule_unlock_irq(lock, v); TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); @@ -1126,6 +1124,7 @@ static void schedule(void) unsigned long *tasklet_work = &this_cpu(tasklet_work_to_do); bool_t tasklet_work_scheduled = 0; struct schedule_data *sd; + spinlock_t *lock; struct task_slice next_slice; int cpu = smp_processor_id(); @@ -1152,7 +1151,7 @@ static void schedule(void) BUG(); } - pcpu_schedule_lock_irq(cpu); + lock = pcpu_schedule_lock_irq(cpu); stop_timer(&sd->s_timer); @@ -1169,7 +1168,7 @@ static void schedule(void) if ( unlikely(prev == next) ) { - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); trace_continue_running(next); return continue_running(prev); } @@ -1207,7 +1206,7 @@ static void schedule(void) ASSERT(!next->is_running); next->is_running = 1; - pcpu_schedule_unlock_irq(cpu); + pcpu_schedule_unlock_irq(lock, cpu); perfc_incr(sched_ctx); @@ -1396,6 +1395,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { unsigned long flags; struct vcpu *idle; + spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; struct scheduler *old_ops = per_cpu(scheduler, cpu); struct scheduler *new_ops = (c == NULL) ? &ops : c->sched; @@ -1414,7 +1414,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - pcpu_schedule_lock_irqsave(cpu, flags); + lock = pcpu_schedule_lock_irqsave(cpu, &flags); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1425,7 +1425,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) SCHED_OP(new_ops, tick_resume, cpu); SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(cpu, flags); + pcpu_schedule_unlock_irqrestore(lock, flags, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); @@ -1483,10 +1483,11 @@ void schedule_dump(struct cpupool *c) for_each_cpu (i, cpus) { - pcpu_schedule_lock(i); + spinlock_t *lock = pcpu_schedule_lock(i); + printk("CPU[%02d] ", i); SCHED_OP(sched, dump_cpu_state, i); - pcpu_schedule_unlock(i); + pcpu_schedule_unlock(lock, i); } } diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index c3be9dc..febd3c1 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -45,96 +45,70 @@ DECLARE_PER_CPU(struct schedule_data, schedule_data); DECLARE_PER_CPU(struct scheduler *, scheduler); DECLARE_PER_CPU(struct cpupool *, cpupool); -static inline spinlock_t * pcpu_schedule_lock(int cpu) -{ - spinlock_t * lock=NULL; - - for ( ; ; ) - { - /* The per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - */ - lock=per_cpu(schedule_data, cpu).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) - break; - spin_unlock(lock); - } - return lock; +#define sched_lock(kind, param, cpu, irq, arg...) \ +static inline spinlock_t *kind##_schedule_lock##irq(param EXTRA_TYPE(arg)) \ +{ \ + for ( ; ; ) \ + { \ + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; \ + /* \ + * v->processor may change when grabbing the lock; but \ + * per_cpu(v->processor) may also change, if changing cpu pool \ + * also changes the scheduler lock. Retry until they match. \ + * \ + * It may also be the case that v->processor may change but the \ + * lock may be the same; this will succeed in that case. \ + */ \ + spin_lock##irq(lock, ## arg); \ + if ( likely(lock == per_cpu(schedule_data, cpu).schedule_lock) ) \ + return lock; \ + spin_unlock##irq(lock, ## arg); \ + } \ } -static inline int pcpu_schedule_trylock(int cpu) -{ - spinlock_t * lock=NULL; - - lock=per_cpu(schedule_data, cpu).schedule_lock; - if ( ! spin_trylock(lock) ) - return 0; - if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) - return 1; - else - { - spin_unlock(lock); - return 0; - } -} - -#define pcpu_schedule_lock_irq(p) \ - do { local_irq_disable(); pcpu_schedule_lock(p); } while ( 0 ) -#define pcpu_schedule_lock_irqsave(p, flags) \ - do { local_irq_save(flags); pcpu_schedule_lock(p); } while ( 0 ) - -static inline void pcpu_schedule_unlock(int cpu) -{ - spin_unlock(per_cpu(schedule_data, cpu).schedule_lock); +#define sched_unlock(kind, param, cpu, irq, arg...) \ +static inline void kind##_schedule_unlock##irq(spinlock_t *lock \ + EXTRA_TYPE(arg), param) \ +{ \ + ASSERT(lock == per_cpu(schedule_data, cpu).schedule_lock); \ + spin_unlock##irq(lock, ## arg); \ } -#define pcpu_schedule_unlock_irq(p) \ - do { pcpu_schedule_unlock(p); local_irq_enable(); } while ( 0 ) -#define pcpu_schedule_unlock_irqrestore(p, flags) \ - do { pcpu_schedule_unlock(p); local_irq_restore(flags); } while ( 0 ) - -static inline void vcpu_schedule_lock(struct vcpu *v) +#define EXTRA_TYPE(arg) +sched_lock(pcpu, unsigned int cpu, cpu, ) +sched_lock(vcpu, const struct vcpu *v, v->processor, ) +sched_lock(pcpu, unsigned int cpu, cpu, _irq) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irq) +sched_unlock(pcpu, unsigned int cpu, cpu, ) +sched_unlock(vcpu, const struct vcpu *v, v->processor, ) +sched_unlock(pcpu, unsigned int cpu, cpu, _irq) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irq) +#undef EXTRA_TYPE + +#define EXTRA_TYPE(arg) , unsigned long arg +#define spin_unlock_irqsave spin_unlock_irqrestore +sched_lock(pcpu, unsigned int cpu, cpu, _irqsave, *flags) +sched_lock(vcpu, const struct vcpu *v, v->processor, _irqsave, *flags) +#undef spin_unlock_irqsave +sched_unlock(pcpu, unsigned int cpu, cpu, _irqrestore, flags) +sched_unlock(vcpu, const struct vcpu *v, v->processor, _irqrestore, flags) +#undef EXTRA_TYPE + +#undef sched_unlock +#undef sched_lock + +static inline spinlock_t *pcpu_schedule_trylock(unsigned int cpu) { - spinlock_t * lock; - - for ( ; ; ) - { - /* v->processor may change when grabbing the lock; but - * per_cpu(v->processor) may also change, if changing - * cpu pool also changes the scheduler lock. Retry - * until they match. - * - * It may also be the case that v->processor may change - * but the lock may be the same; this will succeed - * in that case. - */ - lock=per_cpu(schedule_data, v->processor).schedule_lock; - - spin_lock(lock); - if ( likely(lock == per_cpu(schedule_data, v->processor).schedule_lock) ) - break; - spin_unlock(lock); - } -} - -#define vcpu_schedule_lock_irq(v) \ - do { local_irq_disable(); vcpu_schedule_lock(v); } while ( 0 ) -#define vcpu_schedule_lock_irqsave(v, flags) \ - do { local_irq_save(flags); vcpu_schedule_lock(v); } while ( 0 ) + spinlock_t *lock = per_cpu(schedule_data, cpu).schedule_lock; -static inline void vcpu_schedule_unlock(struct vcpu *v) -{ - spin_unlock(per_cpu(schedule_data, v->processor).schedule_lock); + if ( !spin_trylock(lock) ) + return NULL; + if ( lock == per_cpu(schedule_data, cpu).schedule_lock ) + return lock; + spin_unlock(lock); + return NULL; } -#define vcpu_schedule_unlock_irq(v) \ - do { vcpu_schedule_unlock(v); local_irq_enable(); } while ( 0 ) -#define vcpu_schedule_unlock_irqrestore(v, flags) \ - do { vcpu_schedule_unlock(v); local_irq_restore(flags); } while ( 0 ) - struct task_slice { struct vcpu *task; s_time_t time; -- 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 Nov 15 22:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmL-0006kq-JS; Fri, 15 Nov 2013 22: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 1VhRmL-0006kk-18 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:17 +0000 Received: from [85.158.137.68:15479] by server-7.bemta-3.messagelabs.com id 58/1D-13052-89E96825; Fri, 15 Nov 2013 22:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384554134!1844971!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5266 invoked from network); 15 Nov 2013 22:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmH-0006kF-US for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmH-0000d9-Pw for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:13 +0000 Date: Fri, 15 Nov 2013 22:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix locking in cpu_disable_scheduler() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1af50411b4a1afda5caf7e914e9554ce9166d7 Author: Jan Beulich AuthorDate: Fri Nov 15 11:34:01 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:34:01 2013 +0100 fix locking in cpu_disable_scheduler() So commit eedd6039 ("scheduler: adjust internal locking interface") uncovered - by now using proper spin lock constructs - a bug after all: When bringing down a CPU, cpu_disable_scheduler() gets called with interrupts disabled, and hence the use of vcpu_schedule_lock_irq() was never really correct (i.e. the caller ended up with interrupts enabled despite having disabled them explicitly). Fixing this however surfaced another problem: The call path vcpu_migrate() -> evtchn_move_pirqs() wants to acquire the event lock, which however is a non-IRQ-safe once, and hence check_lock() doesn't like this lock to be acquired when interrupts are already off. As we're in stop-machine context here, getting things wrong wrt interrupt state management during lock acquire/release is out of question though, so the simple solution to this appears to be to just suppress spin lock debugging for the period of time while the stop machine callback gets run. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 41a0cc9e26160a89245c9ba3233e3f70bf9cd4b4 master date: 2013-10-29 09:57:14 +0100 --- xen/common/schedule.c | 9 ++++----- xen/common/stop_machine.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 38661ea..3d516e6 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -586,7 +586,8 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - spinlock_t *lock = vcpu_schedule_lock_irq(v); + unsigned long flags; + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -607,14 +608,12 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(lock, v); + vcpu_schedule_unlock_irqrestore(lock, flags, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else - { - vcpu_schedule_unlock_irq(lock, v); - } + vcpu_schedule_unlock_irqrestore(lock, flags, v); /* * A vcpu active in the hypervisor will not be migratable. diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c index 0590504..932e5a7 100644 --- a/xen/common/stop_machine.c +++ b/xen/common/stop_machine.c @@ -110,6 +110,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) local_irq_disable(); stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); stopmachine_wait_state(); + spin_debug_disable(); stopmachine_set_state(STOPMACHINE_INVOKE); if ( (cpu == smp_processor_id()) || (cpu == NR_CPUS) ) @@ -117,6 +118,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) stopmachine_wait_state(); ret = stopmachine_data.fn_result; + spin_debug_enable(); stopmachine_set_state(STOPMACHINE_EXIT); stopmachine_wait_state(); local_irq_enable(); -- 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 Nov 15 22:22:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmL-0006kq-JS; Fri, 15 Nov 2013 22: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 1VhRmL-0006kk-18 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:17 +0000 Received: from [85.158.137.68:15479] by server-7.bemta-3.messagelabs.com id 58/1D-13052-89E96825; Fri, 15 Nov 2013 22:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1384554134!1844971!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5266 invoked from network); 15 Nov 2013 22:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmH-0006kF-US for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmH-0000d9-Pw for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:13 +0000 Date: Fri, 15 Nov 2013 22:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] fix locking in cpu_disable_scheduler() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd1af50411b4a1afda5caf7e914e9554ce9166d7 Author: Jan Beulich AuthorDate: Fri Nov 15 11:34:01 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:34:01 2013 +0100 fix locking in cpu_disable_scheduler() So commit eedd6039 ("scheduler: adjust internal locking interface") uncovered - by now using proper spin lock constructs - a bug after all: When bringing down a CPU, cpu_disable_scheduler() gets called with interrupts disabled, and hence the use of vcpu_schedule_lock_irq() was never really correct (i.e. the caller ended up with interrupts enabled despite having disabled them explicitly). Fixing this however surfaced another problem: The call path vcpu_migrate() -> evtchn_move_pirqs() wants to acquire the event lock, which however is a non-IRQ-safe once, and hence check_lock() doesn't like this lock to be acquired when interrupts are already off. As we're in stop-machine context here, getting things wrong wrt interrupt state management during lock acquire/release is out of question though, so the simple solution to this appears to be to just suppress spin lock debugging for the period of time while the stop machine callback gets run. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 41a0cc9e26160a89245c9ba3233e3f70bf9cd4b4 master date: 2013-10-29 09:57:14 +0100 --- xen/common/schedule.c | 9 ++++----- xen/common/stop_machine.c | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 38661ea..3d516e6 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -586,7 +586,8 @@ int cpu_disable_scheduler(unsigned int cpu) { for_each_vcpu ( d, v ) { - spinlock_t *lock = vcpu_schedule_lock_irq(v); + unsigned long flags; + spinlock_t *lock = vcpu_schedule_lock_irqsave(v, &flags); cpumask_and(&online_affinity, v->cpu_affinity, c->cpu_valid); if ( cpumask_empty(&online_affinity) && @@ -607,14 +608,12 @@ int cpu_disable_scheduler(unsigned int cpu) if ( v->processor == cpu ) { set_bit(_VPF_migrating, &v->pause_flags); - vcpu_schedule_unlock_irq(lock, v); + vcpu_schedule_unlock_irqrestore(lock, flags, v); vcpu_sleep_nosync(v); vcpu_migrate(v); } else - { - vcpu_schedule_unlock_irq(lock, v); - } + vcpu_schedule_unlock_irqrestore(lock, flags, v); /* * A vcpu active in the hypervisor will not be migratable. diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c index 0590504..932e5a7 100644 --- a/xen/common/stop_machine.c +++ b/xen/common/stop_machine.c @@ -110,6 +110,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) local_irq_disable(); stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); stopmachine_wait_state(); + spin_debug_disable(); stopmachine_set_state(STOPMACHINE_INVOKE); if ( (cpu == smp_processor_id()) || (cpu == NR_CPUS) ) @@ -117,6 +118,7 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) stopmachine_wait_state(); ret = stopmachine_data.fn_result; + spin_debug_enable(); stopmachine_set_state(STOPMACHINE_EXIT); stopmachine_wait_state(); local_irq_enable(); -- 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 Nov 15 22:22:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmV-0006mD-OC; Fri, 15 Nov 2013 22:22:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmU-0006m1-Tt for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:27 +0000 Received: from [85.158.139.211:23300] by server-11.bemta-5.messagelabs.com id 1E/12-03454-2AE96825; Fri, 15 Nov 2013 22:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384554144!2312262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16772 invoked from network); 15 Nov 2013 22:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmS-0006kO-6L for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmS-0000dd-2V for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:24 +0000 Date: Fri, 15 Nov 2013 22:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] sched: fix race between sched_move_domain() and vcpu_wake() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d6e9bf5201d9b662a04d9f007f22f06fb9c9981 Author: David Vrabel AuthorDate: Fri Nov 15 11:34:43 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:34:43 2013 +0100 sched: fix race between sched_move_domain() and vcpu_wake() From: David Vrabel sched_move_domain() changes v->processor for all the domain's VCPUs. If another domain, softirq etc. triggers a simultaneous call to vcpu_wake() (e.g., by setting an event channel as pending), then vcpu_wake() may lock one schedule lock and try to unlock another. vcpu_schedule_lock() attempts to handle this but only does so for the window between reading the schedule_lock from the per-CPU data and the spin_lock() call. This does not help with sched_move_domain() changing v->processor between the calls to vcpu_schedule_lock() and vcpu_schedule_unlock(). Fix the race by taking the schedule_lock for v->processor in sched_move_domain(). Signed-off-by: David Vrabel Acked-by: Juergen Gross Use vcpu_schedule_lock_irq() (which now returns the lock) to properly retry the locking should the to be used lock have changed in the course of acquiring it (issue pointed out by George Dunlap). Add a comment explaining the state after the v->processor adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: ef55257bc81204e34691f1c2aa9e01f2d0768bdd master date: 2013-10-14 08:58:31 +0200 --- xen/common/schedule.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3d516e6..e2c6ce7 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -275,6 +275,8 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + spinlock_t *lock; + vcpudata = v->sched_priv; migrate_timer(&v->periodic_timer, new_p); @@ -282,7 +284,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) migrate_timer(&v->poll_timer, new_p); cpumask_setall(v->cpu_affinity); + + lock = vcpu_schedule_lock_irq(v); v->processor = new_p; + /* + * With v->processor modified we must not + * - make any further changes assuming we hold the scheduler lock, + * - use vcpu_schedule_unlock_irq(). + */ + spin_unlock_irq(lock); + v->sched_priv = vcpu_priv[v->vcpu_id]; evtchn_move_pirqs(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:22:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRmV-0006mD-OC; Fri, 15 Nov 2013 22:22:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmU-0006m1-Tt for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:27 +0000 Received: from [85.158.139.211:23300] by server-11.bemta-5.messagelabs.com id 1E/12-03454-2AE96825; Fri, 15 Nov 2013 22:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1384554144!2312262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16772 invoked from network); 15 Nov 2013 22:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmS-0006kO-6L for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmS-0000dd-2V for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:24 +0000 Date: Fri, 15 Nov 2013 22:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] sched: fix race between sched_move_domain() and vcpu_wake() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d6e9bf5201d9b662a04d9f007f22f06fb9c9981 Author: David Vrabel AuthorDate: Fri Nov 15 11:34:43 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:34:43 2013 +0100 sched: fix race between sched_move_domain() and vcpu_wake() From: David Vrabel sched_move_domain() changes v->processor for all the domain's VCPUs. If another domain, softirq etc. triggers a simultaneous call to vcpu_wake() (e.g., by setting an event channel as pending), then vcpu_wake() may lock one schedule lock and try to unlock another. vcpu_schedule_lock() attempts to handle this but only does so for the window between reading the schedule_lock from the per-CPU data and the spin_lock() call. This does not help with sched_move_domain() changing v->processor between the calls to vcpu_schedule_lock() and vcpu_schedule_unlock(). Fix the race by taking the schedule_lock for v->processor in sched_move_domain(). Signed-off-by: David Vrabel Acked-by: Juergen Gross Use vcpu_schedule_lock_irq() (which now returns the lock) to properly retry the locking should the to be used lock have changed in the course of acquiring it (issue pointed out by George Dunlap). Add a comment explaining the state after the v->processor adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: ef55257bc81204e34691f1c2aa9e01f2d0768bdd master date: 2013-10-14 08:58:31 +0200 --- xen/common/schedule.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3d516e6..e2c6ce7 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -275,6 +275,8 @@ int sched_move_domain(struct domain *d, struct cpupool *c) new_p = cpumask_first(c->cpu_valid); for_each_vcpu ( d, v ) { + spinlock_t *lock; + vcpudata = v->sched_priv; migrate_timer(&v->periodic_timer, new_p); @@ -282,7 +284,16 @@ int sched_move_domain(struct domain *d, struct cpupool *c) migrate_timer(&v->poll_timer, new_p); cpumask_setall(v->cpu_affinity); + + lock = vcpu_schedule_lock_irq(v); v->processor = new_p; + /* + * With v->processor modified we must not + * - make any further changes assuming we hold the scheduler lock, + * - use vcpu_schedule_unlock_irq(). + */ + spin_unlock_irq(lock); + v->sched_priv = vcpu_priv[v->vcpu_id]; evtchn_move_pirqs(v); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:22:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmg-0006nG-Qz; Fri, 15 Nov 2013 22:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmf-0006nB-PG for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:37 +0000 Received: from [193.109.254.147:59033] by server-2.bemta-14.messagelabs.com id D2/9A-08076-DAE96825; Fri, 15 Nov 2013 22:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384554154!3099202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4188 invoked from network); 15 Nov 2013 22:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmc-0006kW-J9 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmc-0000e3-9U for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:34 +0000 Date: Fri, 15 Nov 2013 22:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] credit: unpause parked vcpu before destroying 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 b37536a7cf0a4baeda5ffe54b8fe8c821aacca26 Author: Juergen Gross AuthorDate: Fri Nov 15 11:35:28 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:35:28 2013 +0100 credit: unpause parked vcpu before destroying it A capped out vcpu must be unpaused in case of moving it to another cpupool, otherwise it will be paused forever. Signed-off-by: Juergen Gross Acked-by: George Dunlap master commit: d38a668b6ef8c84d1d3fda9947ffb0056d01fe3a master date: 2013-10-16 12:26:48 +0200 --- xen/common/sched_credit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index ec30706..ee3df06 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -702,6 +702,12 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) CSCHED_STAT_CRANK(vcpu_destroy); + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) + { + CSCHED_STAT_CRANK(vcpu_unpark); + vcpu_unpause(svc->vcpu); + } + if ( __vcpu_on_runq(svc) ) __runq_remove(svc); -- 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 Nov 15 22:22:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmg-0006nG-Qz; Fri, 15 Nov 2013 22:22:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmf-0006nB-PG for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:37 +0000 Received: from [193.109.254.147:59033] by server-2.bemta-14.messagelabs.com id D2/9A-08076-DAE96825; Fri, 15 Nov 2013 22:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1384554154!3099202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4188 invoked from network); 15 Nov 2013 22:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRmc-0006kW-J9 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmc-0000e3-9U for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:34 +0000 Date: Fri, 15 Nov 2013 22:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] credit: unpause parked vcpu before destroying 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 b37536a7cf0a4baeda5ffe54b8fe8c821aacca26 Author: Juergen Gross AuthorDate: Fri Nov 15 11:35:28 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:35:28 2013 +0100 credit: unpause parked vcpu before destroying it A capped out vcpu must be unpaused in case of moving it to another cpupool, otherwise it will be paused forever. Signed-off-by: Juergen Gross Acked-by: George Dunlap master commit: d38a668b6ef8c84d1d3fda9947ffb0056d01fe3a master date: 2013-10-16 12:26:48 +0200 --- xen/common/sched_credit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index ec30706..ee3df06 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -702,6 +702,12 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) CSCHED_STAT_CRANK(vcpu_destroy); + if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) ) + { + CSCHED_STAT_CRANK(vcpu_unpark); + vcpu_unpause(svc->vcpu); + } + if ( __vcpu_on_runq(svc) ) __runq_remove(svc); -- 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 Nov 15 22:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 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 1VhRmq-0006oY-To; Fri, 15 Nov 2013 22: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 1VhRmp-0006oM-F0 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:47 +0000 Received: from [85.158.139.211:23799] by server-8.bemta-5.messagelabs.com id 67/82-32206-6BE96825; Fri, 15 Nov 2013 22:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384554164!2251183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27508 invoked from network); 15 Nov 2013 22:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmm-0006kc-Og for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmm-0000eP-Mg for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:44 +0000 Date: Fri, 15 Nov 2013 22:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: also save/restore XCR0 across suspend (ACPI S3) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b33bae46944a6d0d3811418aca50ad72474bcec Author: Jan Beulich AuthorDate: Fri Nov 15 11:36:12 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:36:12 2013 +0100 x86/xsave: also save/restore XCR0 across suspend (ACPI S3) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: e47a90e6dca491c0ceea6ffa18055e7e32565e8e master date: 2013-10-21 17:26:16 +0200 --- xen/arch/x86/acpi/suspend.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index f2e2133..3f39388 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #if defined(CONFIG_X86_64) @@ -21,6 +22,7 @@ static unsigned long saved_sysenter_esp, saved_sysenter_eip; static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base; static uint16_t saved_segs[4]; #endif +static uint64_t saved_xcr0; void save_rest_processor_state(void) { @@ -41,6 +43,8 @@ void save_rest_processor_state(void) rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip); } #endif + if ( cpu_has_xsave ) + saved_xcr0 = get_xcr0(); } @@ -89,6 +93,9 @@ void restore_rest_processor_state(void) } #endif + if ( cpu_has_xsave && !set_xcr0(saved_xcr0) ) + BUG(); + /* Maybe load the debug registers. */ BUG_ON(is_hvm_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) -- 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 Nov 15 22:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 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 1VhRmq-0006oY-To; Fri, 15 Nov 2013 22: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 1VhRmp-0006oM-F0 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:47 +0000 Received: from [85.158.139.211:23799] by server-8.bemta-5.messagelabs.com id 67/82-32206-6BE96825; Fri, 15 Nov 2013 22:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384554164!2251183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27508 invoked from network); 15 Nov 2013 22:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRmm-0006kc-Og for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmm-0000eP-Mg for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:44 +0000 Date: Fri, 15 Nov 2013 22:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/xsave: also save/restore XCR0 across suspend (ACPI S3) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b33bae46944a6d0d3811418aca50ad72474bcec Author: Jan Beulich AuthorDate: Fri Nov 15 11:36:12 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:36:12 2013 +0100 x86/xsave: also save/restore XCR0 across suspend (ACPI S3) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: e47a90e6dca491c0ceea6ffa18055e7e32565e8e master date: 2013-10-21 17:26:16 +0200 --- xen/arch/x86/acpi/suspend.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index f2e2133..3f39388 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #if defined(CONFIG_X86_64) @@ -21,6 +22,7 @@ static unsigned long saved_sysenter_esp, saved_sysenter_eip; static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base; static uint16_t saved_segs[4]; #endif +static uint64_t saved_xcr0; void save_rest_processor_state(void) { @@ -41,6 +43,8 @@ void save_rest_processor_state(void) rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip); } #endif + if ( cpu_has_xsave ) + saved_xcr0 = get_xcr0(); } @@ -89,6 +93,9 @@ void restore_rest_processor_state(void) } #endif + if ( cpu_has_xsave && !set_xcr0(saved_xcr0) ) + BUG(); + /* Maybe load the debug registers. */ BUG_ON(is_hvm_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) -- 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 Nov 15 22:22:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRn1-0006qC-0f; Fri, 15 Nov 2013 22: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 1VhRmz-0006q0-TR for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:58 +0000 Received: from [85.158.137.68:50957] by server-8.bemta-3.messagelabs.com id F5/D7-06638-1CE96825; Fri, 15 Nov 2013 22:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1384554175!1859397!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16370 invoked from network); 15 Nov 2013 22:22:56 -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; 15 Nov 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 1VhRmx-0006kl-0r for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmw-0000el-Tu for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:54 +0000 Date: Fri, 15 Nov 2013 22:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: refine address validity checks before accessing page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95b9323eea99c39ec78d335d57e2500895999133 Author: Jan Beulich AuthorDate: Fri Nov 15 11:36:39 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:36:39 2013 +0100 x86: refine address validity checks before accessing page tables In commit 40d66baa ("x86: correct LDT checks") and d06a0d71 ("x86: add address validity check to guest_map_l1e()") I didn't really pay attention to the fact that these checks would better be done before the paging_mode_translate() ones, as there's also no equivalent check down the shadow code paths involved here (at least not up to the first use of the address), and such generic checks shouldn't really be done by particular backend functions anyway. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: 343cad8c70585c4dba8afc75e1ec1b7610605ab2 master date: 2013-10-28 12:00:36 +0100 --- xen/include/asm-x86/paging.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 60335ed..7ec438a 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -378,12 +378,14 @@ guest_map_l1e(struct vcpu *v, unsigned long addr, unsigned long *gl1mfn) { l2_pgentry_t l2e; + if ( unlikely(!__addr_ok(addr)) ) + return NULL; + if ( unlikely(paging_mode_translate(v->domain)) ) return paging_get_hostmode(v)->guest_map_l1e(v, addr, gl1mfn); /* Find this l1e and its enclosing l1mfn in the linear map */ - if ( !__addr_ok(addr) || - __copy_from_user(&l2e, + if ( __copy_from_user(&l2e, &__linear_l2_table[l2_linear_offset(addr)], sizeof(l2_pgentry_t)) != 0 ) return NULL; @@ -404,16 +406,21 @@ guest_unmap_l1e(struct vcpu *v, void *p) /* Read the guest's l1e that maps this address. */ static inline void -guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) +guest_get_eff_l1e(struct vcpu *v, unsigned long addr, l1_pgentry_t *eff_l1e) { + if ( unlikely(!__addr_ok(addr)) ) + { + *eff_l1e = l1e_empty(); + return; + } + if ( likely(!paging_mode_translate(v->domain)) ) { ASSERT(!paging_mode_external(v->domain)); - if ( !__addr_ok(addr) || - __copy_from_user(eff_l1e, + if ( __copy_from_user(eff_l1e, &__linear_l1_table[l1_linear_offset(addr)], sizeof(l1_pgentry_t)) != 0 ) - *(l1_pgentry_t *)eff_l1e = l1e_empty(); + *eff_l1e = l1e_empty(); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:22:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRn1-0006qC-0f; Fri, 15 Nov 2013 22: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 1VhRmz-0006q0-TR for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:58 +0000 Received: from [85.158.137.68:50957] by server-8.bemta-3.messagelabs.com id F5/D7-06638-1CE96825; Fri, 15 Nov 2013 22:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1384554175!1859397!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16370 invoked from network); 15 Nov 2013 22:22:56 -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; 15 Nov 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 1VhRmx-0006kl-0r for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRmw-0000el-Tu for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:22:54 +0000 Date: Fri, 15 Nov 2013 22:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: refine address validity checks before accessing page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95b9323eea99c39ec78d335d57e2500895999133 Author: Jan Beulich AuthorDate: Fri Nov 15 11:36:39 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:36:39 2013 +0100 x86: refine address validity checks before accessing page tables In commit 40d66baa ("x86: correct LDT checks") and d06a0d71 ("x86: add address validity check to guest_map_l1e()") I didn't really pay attention to the fact that these checks would better be done before the paging_mode_translate() ones, as there's also no equivalent check down the shadow code paths involved here (at least not up to the first use of the address), and such generic checks shouldn't really be done by particular backend functions anyway. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: 343cad8c70585c4dba8afc75e1ec1b7610605ab2 master date: 2013-10-28 12:00:36 +0100 --- xen/include/asm-x86/paging.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 60335ed..7ec438a 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -378,12 +378,14 @@ guest_map_l1e(struct vcpu *v, unsigned long addr, unsigned long *gl1mfn) { l2_pgentry_t l2e; + if ( unlikely(!__addr_ok(addr)) ) + return NULL; + if ( unlikely(paging_mode_translate(v->domain)) ) return paging_get_hostmode(v)->guest_map_l1e(v, addr, gl1mfn); /* Find this l1e and its enclosing l1mfn in the linear map */ - if ( !__addr_ok(addr) || - __copy_from_user(&l2e, + if ( __copy_from_user(&l2e, &__linear_l2_table[l2_linear_offset(addr)], sizeof(l2_pgentry_t)) != 0 ) return NULL; @@ -404,16 +406,21 @@ guest_unmap_l1e(struct vcpu *v, void *p) /* Read the guest's l1e that maps this address. */ static inline void -guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) +guest_get_eff_l1e(struct vcpu *v, unsigned long addr, l1_pgentry_t *eff_l1e) { + if ( unlikely(!__addr_ok(addr)) ) + { + *eff_l1e = l1e_empty(); + return; + } + if ( likely(!paging_mode_translate(v->domain)) ) { ASSERT(!paging_mode_external(v->domain)); - if ( !__addr_ok(addr) || - __copy_from_user(eff_l1e, + if ( __copy_from_user(eff_l1e, &__linear_l1_table[l1_linear_offset(addr)], sizeof(l1_pgentry_t)) != 0 ) - *(l1_pgentry_t *)eff_l1e = l1e_empty(); + *eff_l1e = l1e_empty(); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:23:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnB-0006s9-3O; Fri, 15 Nov 2013 22:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRn9-0006ro-Pi for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:07 +0000 Received: from [193.109.254.147:61927] by server-6.bemta-14.messagelabs.com id B8/D6-19621-BCE96825; Fri, 15 Nov 2013 22:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384554185!3063522!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9338 invoked from network); 15 Nov 2013 22:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRn7-0006lK-6V for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRn7-0000fH-5A for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:05 +0000 Date: Fri, 15 Nov 2013 22:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 478a05ca4ebd3c22aa538dd17bea3d52090b8eba Author: Jan Beulich AuthorDate: Fri Nov 15 11:37:39 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:37:39 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser master commit: 2c24cdcce3269f3286790c63821951a1de93c66a master date: 2013-11-04 10:10:04 +0100 --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 57f2baf..02b983f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -96,7 +96,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- 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 Nov 15 22:23:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnB-0006s9-3O; Fri, 15 Nov 2013 22:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRn9-0006ro-Pi for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:07 +0000 Received: from [193.109.254.147:61927] by server-6.bemta-14.messagelabs.com id B8/D6-19621-BCE96825; Fri, 15 Nov 2013 22:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384554185!3063522!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9338 invoked from network); 15 Nov 2013 22:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 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 1VhRn7-0006lK-6V for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRn7-0000fH-5A for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:05 +0000 Date: Fri, 15 Nov 2013 22:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 478a05ca4ebd3c22aa538dd17bea3d52090b8eba Author: Jan Beulich AuthorDate: Fri Nov 15 11:37:39 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:37:39 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser master commit: 2c24cdcce3269f3286790c63821951a1de93c66a master date: 2013-11-04 10:10:04 +0100 --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 57f2baf..02b983f 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -96,7 +96,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- 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 Nov 15 22:23:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnL-0006u6-6M; Fri, 15 Nov 2013 22:23:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnK-0006tr-A1 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:18 +0000 Received: from [85.158.139.211:34605] by server-1.bemta-5.messagelabs.com id C7/13-16887-5DE96825; Fri, 15 Nov 2013 22:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384554195!2329726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9589 invoked from network); 15 Nov 2013 22:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnH-0006lQ-DE for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnH-0000gR-AO for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:15 +0000 Date: Fri, 15 Nov 2013 22:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: 32-bit IN result must be zero-extended to 64 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 762aeb5be310d3a40f1d1ee4474319f0a7f887aa Author: Jan Beulich AuthorDate: Fri Nov 15 11:42:36 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:42:36 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c master date: 2013-11-05 14:51:53 +0100 master commit: 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 master date: 2013-11-15 11:01:49 +0100 --- xen/arch/x86/hvm/io.c | 21 +++++++++++++++++---- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 7cf0d36..b04083b 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,14 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { +#ifdef __x86_64__ + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else +#endif + memcpy(&guest_cpu_user_regs()->eax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) @@ -281,8 +290,12 @@ void hvm_io_assist(void) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); +#ifdef __x86_64__ + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else +#endif + memcpy(&guest_cpu_user_regs()->eax, &p->data, vio->io_size); break; default: break; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- 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 Nov 15 22:23:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnL-0006u6-6M; Fri, 15 Nov 2013 22:23:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnK-0006tr-A1 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:18 +0000 Received: from [85.158.139.211:34605] by server-1.bemta-5.messagelabs.com id C7/13-16887-5DE96825; Fri, 15 Nov 2013 22:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1384554195!2329726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9589 invoked from network); 15 Nov 2013 22:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnH-0006lQ-DE for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnH-0000gR-AO for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:15 +0000 Date: Fri, 15 Nov 2013 22:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: 32-bit IN result must be zero-extended to 64 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 762aeb5be310d3a40f1d1ee4474319f0a7f887aa Author: Jan Beulich AuthorDate: Fri Nov 15 11:42:36 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:42:36 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c master date: 2013-11-05 14:51:53 +0100 master commit: 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 master date: 2013-11-15 11:01:49 +0100 --- xen/arch/x86/hvm/io.c | 21 +++++++++++++++++---- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 7cf0d36..b04083b 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,14 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { +#ifdef __x86_64__ + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else +#endif + memcpy(&guest_cpu_user_regs()->eax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) @@ -281,8 +290,12 @@ void hvm_io_assist(void) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); +#ifdef __x86_64__ + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else +#endif + memcpy(&guest_cpu_user_regs()->eax, &p->data, vio->io_size); break; default: break; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- 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 Nov 15 22:23:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnV-0006vs-92; Fri, 15 Nov 2013 22:23:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnU-0006vi-DL for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:28 +0000 Received: from [193.109.254.147:5784] by server-11.bemta-14.messagelabs.com id A7/E0-08419-FDE96825; Fri, 15 Nov 2013 22:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1384554205!3097591!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15973 invoked from network); 15 Nov 2013 22:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnR-0006lW-OS for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnR-0000gn-Gm for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:25 +0000 Date: Fri, 15 Nov 2013 22:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9def91db8a25b666928f686b6450a5b783d2d69 Author: Jan Beulich AuthorDate: Fri Nov 15 11:44:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:44:17 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c1f2dfe8f6a559bc28935f24e31bb33d17d9713d master date: 2013-11-08 11:08:32 +0100 --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 5fe31d6..6c0b689 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -621,6 +621,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -638,7 +654,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1095,23 +1110,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and xen page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1255,10 +1260,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1286,6 +1295,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- 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 Nov 15 22:23:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnV-0006vs-92; Fri, 15 Nov 2013 22:23:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnU-0006vi-DL for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:28 +0000 Received: from [193.109.254.147:5784] by server-11.bemta-14.messagelabs.com id A7/E0-08419-FDE96825; Fri, 15 Nov 2013 22:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1384554205!3097591!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15973 invoked from network); 15 Nov 2013 22:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnR-0006lW-OS for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnR-0000gn-Gm for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:25 +0000 Date: Fri, 15 Nov 2013 22:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9def91db8a25b666928f686b6450a5b783d2d69 Author: Jan Beulich AuthorDate: Fri Nov 15 11:44:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:44:17 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c1f2dfe8f6a559bc28935f24e31bb33d17d9713d master date: 2013-11-08 11:08:32 +0100 --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 5fe31d6..6c0b689 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -621,6 +621,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -638,7 +654,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1095,23 +1110,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and xen page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1255,10 +1260,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1286,6 +1295,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- 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 Nov 15 22:23:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRng-0006yD-Dp; Fri, 15 Nov 2013 22: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 1VhRne-0006xv-My for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:38 +0000 Received: from [85.158.143.35:22523] by server-3.bemta-4.messagelabs.com id 58/10-32360-AEE96825; Fri, 15 Nov 2013 22:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1384554216!3563698!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 499 invoked from network); 15 Nov 2013 22:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnb-0006le-U7 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnb-0000hD-SS for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:35 +0000 Date: Fri, 15 Nov 2013 22:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 654811f08827ac35a42a706c14b6b53800e998b2 Author: Jan Beulich AuthorDate: Fri Nov 15 11:46:26 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:46:26 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 58929248461ecadce13e92eb5a5d9ef718a7c88e master date: 2013-11-12 11:52:19 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index d98024b..11c19f1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -561,16 +561,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -593,6 +593,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5a3a152..d7563c3 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -714,7 +714,27 @@ static void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { uint32_t attr = 0; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 6100619..7c51b49 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -128,6 +128,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- 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 Nov 15 22:23:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22: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 1VhRng-0006yD-Dp; Fri, 15 Nov 2013 22: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 1VhRne-0006xv-My for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:38 +0000 Received: from [85.158.143.35:22523] by server-3.bemta-4.messagelabs.com id 58/10-32360-AEE96825; Fri, 15 Nov 2013 22:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1384554216!3563698!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 499 invoked from network); 15 Nov 2013 22:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnb-0006le-U7 for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnb-0000hD-SS for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:35 +0000 Date: Fri, 15 Nov 2013 22:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 654811f08827ac35a42a706c14b6b53800e998b2 Author: Jan Beulich AuthorDate: Fri Nov 15 11:46:26 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:46:26 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 58929248461ecadce13e92eb5a5d9ef718a7c88e master date: 2013-11-12 11:52:19 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index d98024b..11c19f1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -561,16 +561,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -593,6 +593,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5a3a152..d7563c3 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -714,7 +714,27 @@ static void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { uint32_t attr = 0; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 6100619..7c51b49 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -128,6 +128,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- 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 Nov 15 22:23:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnq-0006zq-Gr; Fri, 15 Nov 2013 22: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 1VhRno-0006zg-QW for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:49 +0000 Received: from [85.158.143.35:8897] by server-2.bemta-4.messagelabs.com id 38/6E-11386-4FE96825; Fri, 15 Nov 2013 22:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384554226!3532850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2270 invoked from network); 15 Nov 2013 22:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnm-0006lk-6Q for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnm-0000hd-3P for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:46 +0000 Date: Fri, 15 Nov 2013 22:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9d1af481a5b73ea0c5ca86cbea3938c343ee51b Author: Jan Beulich AuthorDate: Fri Nov 15 11:47:41 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:47:41 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 master date: 2013-11-12 16:28:47 +0100 --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 02b9b55..f7b3137 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1738,7 +1739,7 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) + if ( cache_flush_permitted(v->domain) ) { if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) { diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 48a3f01..c4da848 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1994,7 +1995,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d7563c3..1e30557 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2130,10 +2131,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9412395..9be5239 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -328,7 +328,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #ifdef CONFIG_X86_64 #define perdomain_pt_pgidx(v) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 15 22:23:50 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Nov 2013 22:23:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnq-0006zq-Gr; Fri, 15 Nov 2013 22: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 1VhRno-0006zg-QW for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:49 +0000 Received: from [85.158.143.35:8897] by server-2.bemta-4.messagelabs.com id 38/6E-11386-4FE96825; Fri, 15 Nov 2013 22:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1384554226!3532850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2270 invoked from network); 15 Nov 2013 22:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 15 Nov 2013 22:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VhRnm-0006lk-6Q for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VhRnm-0000hd-3P for xen-changelog@lists.xensource.com; Fri, 15 Nov 2013 22:23:46 +0000 Date: Fri, 15 Nov 2013 22:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9d1af481a5b73ea0c5ca86cbea3938c343ee51b Author: Jan Beulich AuthorDate: Fri Nov 15 11:47:41 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:47:41 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 master date: 2013-11-12 16:28:47 +0100 --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 02b9b55..f7b3137 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1738,7 +1739,7 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) + if ( cache_flush_permitted(v->domain) ) { if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) { diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 48a3f01..c4da848 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1994,7 +1995,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d7563c3..1e30557 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2130,10 +2131,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9412395..9be5239 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -328,7 +328,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #ifdef CONFIG_X86_64 #define perdomain_pt_pgidx(v) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 17 16:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SC-0005zJ-68; Sun, 17 Nov 2013 16: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 1Vi5SA-0005zB-HN for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:06 +0000 Received: from [85.158.143.35:37165] by server-3.bemta-4.messagelabs.com id 6A/65-32360-552F8825; Sun, 17 Nov 2013 16:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384706644!3782597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5438 invoked from network); 17 Nov 2013 16:44: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; 17 Nov 2013 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5S7-0007Ty-QK for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5S7-0001yq-IY for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:03 +0000 Date: Sun, 17 Nov 2013 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fix kexec_lock use in kexec_swap_images() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 029c84d2efbebc02a4e9a6ee9a3a94289ca36f72 Author: David Vrabel AuthorDate: Fri Nov 15 10:59:41 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 10:59:41 2013 +0100 kexec: fix kexec_lock use in kexec_swap_images() CID 1128573 If a bad image type is supplied in a KEXECOP_unload hypercall, the kexec_lock in kexec_swap_images() was left locked, causing a deadlock on a subsequent image load or unload. The kexec_lock is only required to serialize the swap operation itself. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kexec.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 9999bab..17f3ed7 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -785,17 +785,14 @@ static int kexec_swap_images(int type, struct kexec_image *new, *old = NULL; - spin_lock(&kexec_lock); - if ( test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) - { - spin_unlock(&kexec_lock); return -EBUSY; - } if ( kexec_load_get_bits(type, &base, &bit) ) return -EINVAL; + spin_lock(&kexec_lock); + pos = (test_bit(bit, &kexec_flags) != 0); old_slot = base + pos; new_slot = base + !pos; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SC-0005zJ-68; Sun, 17 Nov 2013 16: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 1Vi5SA-0005zB-HN for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:06 +0000 Received: from [85.158.143.35:37165] by server-3.bemta-4.messagelabs.com id 6A/65-32360-552F8825; Sun, 17 Nov 2013 16:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384706644!3782597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5438 invoked from network); 17 Nov 2013 16:44: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; 17 Nov 2013 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5S7-0007Ty-QK for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5S7-0001yq-IY for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:03 +0000 Date: Sun, 17 Nov 2013 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fix kexec_lock use in kexec_swap_images() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 029c84d2efbebc02a4e9a6ee9a3a94289ca36f72 Author: David Vrabel AuthorDate: Fri Nov 15 10:59:41 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 10:59:41 2013 +0100 kexec: fix kexec_lock use in kexec_swap_images() CID 1128573 If a bad image type is supplied in a KEXECOP_unload hypercall, the kexec_lock in kexec_swap_images() was left locked, causing a deadlock on a subsequent image load or unload. The kexec_lock is only required to serialize the swap operation itself. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kexec.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 9999bab..17f3ed7 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -785,17 +785,14 @@ static int kexec_swap_images(int type, struct kexec_image *new, *old = NULL; - spin_lock(&kexec_lock); - if ( test_bit(KEXEC_FLAG_IN_PROGRESS, &kexec_flags) ) - { - spin_unlock(&kexec_lock); return -EBUSY; - } if ( kexec_load_get_bits(type, &base, &bit) ) return -EINVAL; + spin_lock(&kexec_lock); + pos = (test_bit(bit, &kexec_flags) != 0); old_slot = base + pos; new_slot = base + !pos; -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SM-0005zz-Af; Sun, 17 Nov 2013 16: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 1Vi5SK-0005zn-H7 for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:16 +0000 Received: from [85.158.143.35:37446] by server-1.bemta-4.messagelabs.com id CF/E0-02132-F52F8825; Sun, 17 Nov 2013 16:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1384706654!651065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1029 invoked from network); 17 Nov 2013 16:44:15 -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; 17 Nov 2013 16:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SI-0007U1-13 for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5SH-0001zE-Ub for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:13 +0000 Date: Sun, 17 Nov 2013 16:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fail image loads if the page tables cannot be built X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 317ac0adf7f76a999c8af09f66beb625bbc02e32 Author: David Vrabel AuthorDate: Fri Nov 15 11:00:46 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:00:46 2013 +0100 kexec: fail image loads if the page tables cannot be built CID 1128566 If an image source page is allocated in kimage_alloc_page() but the machine_kexec_add_page() fails, the image may appear to load succesfully but it will not execute. The relocation will fault (rebooting the host) when trying to copy the source page, as it is not mapped. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kimage.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/common/kimage.c b/xen/common/kimage.c index 5c3e3b3..91943f1 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -592,6 +592,7 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, */ struct page_info *page; paddr_t addr; + int ret; /* * Walk through the list of destination pages, and see if I have a @@ -656,7 +657,13 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, } } found: - machine_kexec_add_page(image, page_to_maddr(page), page_to_maddr(page)); + ret = machine_kexec_add_page(image, page_to_maddr(page), + page_to_maddr(page)); + if ( ret < 0 ) + { + free_domheap_page(page); + return NULL; + } return 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 Nov 17 16:44:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SM-0005zz-Af; Sun, 17 Nov 2013 16: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 1Vi5SK-0005zn-H7 for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:16 +0000 Received: from [85.158.143.35:37446] by server-1.bemta-4.messagelabs.com id CF/E0-02132-F52F8825; Sun, 17 Nov 2013 16:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1384706654!651065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1029 invoked from network); 17 Nov 2013 16:44:15 -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; 17 Nov 2013 16:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SI-0007U1-13 for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5SH-0001zE-Ub for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:13 +0000 Date: Sun, 17 Nov 2013 16:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] kexec: fail image loads if the page tables cannot be built X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 317ac0adf7f76a999c8af09f66beb625bbc02e32 Author: David Vrabel AuthorDate: Fri Nov 15 11:00:46 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:00:46 2013 +0100 kexec: fail image loads if the page tables cannot be built CID 1128566 If an image source page is allocated in kimage_alloc_page() but the machine_kexec_add_page() fails, the image may appear to load succesfully but it will not execute. The relocation will fault (rebooting the host) when trying to copy the source page, as it is not mapped. Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper --- xen/common/kimage.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/common/kimage.c b/xen/common/kimage.c index 5c3e3b3..91943f1 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -592,6 +592,7 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, */ struct page_info *page; paddr_t addr; + int ret; /* * Walk through the list of destination pages, and see if I have a @@ -656,7 +657,13 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, } } found: - machine_kexec_add_page(image, page_to_maddr(page), page_to_maddr(page)); + ret = machine_kexec_add_page(image, page_to_maddr(page), + page_to_maddr(page)); + if ( ret < 0 ) + { + free_domheap_page(page); + return NULL; + } return 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 Nov 17 16:44:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SV-000614-II; Sun, 17 Nov 2013 16:44:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SU-00060u-Kj for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:26 +0000 Received: from [85.158.143.35:39740] by server-3.bemta-4.messagelabs.com id A2/85-32360-A62F8825; Sun, 17 Nov 2013 16:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384706664!3782638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6451 invoked from network); 17 Nov 2013 16:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2013 16:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SS-0007UA-5Y for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5SS-00020K-3s for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:24 +0000 Date: Sun, 17 Nov 2013 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 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 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 Author: Jan Beulich AuthorDate: Fri Nov 15 11:01:49 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:01:49 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/io.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index deb7b92..15e0b4c 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -290,8 +290,10 @@ void hvm_io_assist(ioreq_t *p) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else + memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size); break; default: 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 Sun Nov 17 16:44:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SV-000614-II; Sun, 17 Nov 2013 16:44:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SU-00060u-Kj for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:26 +0000 Received: from [85.158.143.35:39740] by server-3.bemta-4.messagelabs.com id A2/85-32360-A62F8825; Sun, 17 Nov 2013 16:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384706664!3782638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6451 invoked from network); 17 Nov 2013 16:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2013 16:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5SS-0007UA-5Y for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5SS-00020K-3s for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:24 +0000 Date: Sun, 17 Nov 2013 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 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 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 Author: Jan Beulich AuthorDate: Fri Nov 15 11:01:49 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:01:49 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/arch/x86/hvm/io.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index deb7b92..15e0b4c 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -290,8 +290,10 @@ void hvm_io_assist(ioreq_t *p) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else + memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size); break; default: 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 Sun Nov 17 16:44:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sf-00062P-Nt; Sun, 17 Nov 2013 16:44:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sf-00062D-3U for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:37 +0000 Received: from [85.158.137.68:32107] by server-10.bemta-3.messagelabs.com id FC/B4-17212-472F8825; Sun, 17 Nov 2013 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384706674!2015145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13479 invoked from network); 17 Nov 2013 16:44:35 -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; 17 Nov 2013 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sc-0007UI-Ev for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sc-00020k-9w for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:34 +0000 Date: Sun, 17 Nov 2013 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VT-x: Disable MSR intercept for SHADOW_GS_BASE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82e98d473fd212316ea5aa078a7588324b020e5 Author: Paul Durrant AuthorDate: Fri Nov 15 11:02:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:02:17 2013 +0100 x86/VT-x: Disable MSR intercept for SHADOW_GS_BASE Intercepting this MSR is pointless - The swapgs instruction does not cause a vmexit, so the cached result of this is potentially stale after the next guest instruction. It is correctly saved and restored on vcpu context switch. Furthermore, 64bit Windows writes to this MSR on every thread context switch, so interception causes a substantial performance hit. Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vmcs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 290b42f..4aab971 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -950,6 +950,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_FS_BASE, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_GS_BASE, MSR_TYPE_R | MSR_TYPE_W); + vmx_disable_intercept_for_msr(v, MSR_SHADOW_GS_BASE, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sf-00062P-Nt; Sun, 17 Nov 2013 16:44:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sf-00062D-3U for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:37 +0000 Received: from [85.158.137.68:32107] by server-10.bemta-3.messagelabs.com id FC/B4-17212-472F8825; Sun, 17 Nov 2013 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384706674!2015145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13479 invoked from network); 17 Nov 2013 16:44:35 -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; 17 Nov 2013 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sc-0007UI-Ev for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sc-00020k-9w for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:34 +0000 Date: Sun, 17 Nov 2013 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VT-x: Disable MSR intercept for SHADOW_GS_BASE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82e98d473fd212316ea5aa078a7588324b020e5 Author: Paul Durrant AuthorDate: Fri Nov 15 11:02:17 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:02:17 2013 +0100 x86/VT-x: Disable MSR intercept for SHADOW_GS_BASE Intercepting this MSR is pointless - The swapgs instruction does not cause a vmexit, so the cached result of this is potentially stale after the next guest instruction. It is correctly saved and restored on vcpu context switch. Furthermore, 64bit Windows writes to this MSR on every thread context switch, so interception causes a substantial performance hit. Signed-off-by: Paul Durrant Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Acked-by: Jun Nakajima --- xen/arch/x86/hvm/vmx/vmcs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 290b42f..4aab971 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -950,6 +950,7 @@ static int construct_vmcs(struct vcpu *v) vmx_disable_intercept_for_msr(v, MSR_FS_BASE, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_GS_BASE, MSR_TYPE_R | MSR_TYPE_W); + vmx_disable_intercept_for_msr(v, MSR_SHADOW_GS_BASE, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_CS, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_ESP, MSR_TYPE_R | MSR_TYPE_W); vmx_disable_intercept_for_msr(v, MSR_IA32_SYSENTER_EIP, MSR_TYPE_R | MSR_TYPE_W); -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sq-00064H-SN; Sun, 17 Nov 2013 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sp-00063x-DA for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:47 +0000 Received: from [85.158.139.211:62266] by server-6.bemta-5.messagelabs.com id F9/42-04949-E72F8825; Sun, 17 Nov 2013 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384706684!2428585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20642 invoked from network); 17 Nov 2013 16:44: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; 17 Nov 2013 16:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sm-0007UO-Jf for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sm-000216-He for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:44 +0000 Date: Sun, 17 Nov 2013 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: Update other parameters when setting tslice_ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1320b8100c2ed390fc640557a050f5c700d8338d Author: Nate Studer AuthorDate: Fri Nov 15 17:38:10 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 17:38:10 2013 +0100 credit: Update other parameters when setting tslice_ms Add a utility function to update the rest of the timeslice accounting fields when updating the timeslice of the credit scheduler, so that capped CPUs behave correctly. Before this patch changing the timeslice to a value higher than the default would result in a domain not utilizing its full capacity and changing the timeslice to a value lower than the default would result in a domain exceeding its capacity. Signed-off-by: Nate Studer Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 28dafcf..db5512e 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1071,6 +1071,17 @@ csched_dom_cntl( return 0; } +static inline void +__csched_set_tslice(struct csched_private *prv, unsigned timeslice) +{ + prv->tslice_ms = timeslice; + prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; + if ( prv->tslice_ms < prv->ticks_per_tslice ) + prv->ticks_per_tslice = 1; + prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; + prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; +} + static int csched_sys_cntl(const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) @@ -1089,7 +1100,7 @@ csched_sys_cntl(const struct scheduler *ops, || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN)) || MICROSECS(params->ratelimit_us) > MILLISECS(params->tslice_ms) ) goto out; - prv->tslice_ms = params->tslice_ms; + __csched_set_tslice(prv, params->tslice_ms); prv->ratelimit_us = params->ratelimit_us; /* FALLTHRU */ case XEN_SYSCTL_SCHEDOP_getinfo: @@ -1899,12 +1910,7 @@ csched_init(struct scheduler *ops) sched_credit_tslice_ms = CSCHED_DEFAULT_TSLICE_MS; } - prv->tslice_ms = sched_credit_tslice_ms; - prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; - if ( prv->tslice_ms < prv->ticks_per_tslice ) - prv->ticks_per_tslice = 1; - prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; - prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; + __csched_set_tslice(prv, sched_credit_tslice_ms); if ( MICROSECS(sched_ratelimit_us) > MILLISECS(sched_credit_tslice_ms) ) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sq-00064H-SN; Sun, 17 Nov 2013 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sp-00063x-DA for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:47 +0000 Received: from [85.158.139.211:62266] by server-6.bemta-5.messagelabs.com id F9/42-04949-E72F8825; Sun, 17 Nov 2013 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384706684!2428585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20642 invoked from network); 17 Nov 2013 16:44: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; 17 Nov 2013 16:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sm-0007UO-Jf for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sm-000216-He for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:44 +0000 Date: Sun, 17 Nov 2013 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] credit: Update other parameters when setting tslice_ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1320b8100c2ed390fc640557a050f5c700d8338d Author: Nate Studer AuthorDate: Fri Nov 15 17:38:10 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 17:38:10 2013 +0100 credit: Update other parameters when setting tslice_ms Add a utility function to update the rest of the timeslice accounting fields when updating the timeslice of the credit scheduler, so that capped CPUs behave correctly. Before this patch changing the timeslice to a value higher than the default would result in a domain not utilizing its full capacity and changing the timeslice to a value lower than the default would result in a domain exceeding its capacity. Signed-off-by: Nate Studer Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 28dafcf..db5512e 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1071,6 +1071,17 @@ csched_dom_cntl( return 0; } +static inline void +__csched_set_tslice(struct csched_private *prv, unsigned timeslice) +{ + prv->tslice_ms = timeslice; + prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; + if ( prv->tslice_ms < prv->ticks_per_tslice ) + prv->ticks_per_tslice = 1; + prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; + prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; +} + static int csched_sys_cntl(const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) @@ -1089,7 +1100,7 @@ csched_sys_cntl(const struct scheduler *ops, || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN)) || MICROSECS(params->ratelimit_us) > MILLISECS(params->tslice_ms) ) goto out; - prv->tslice_ms = params->tslice_ms; + __csched_set_tslice(prv, params->tslice_ms); prv->ratelimit_us = params->ratelimit_us; /* FALLTHRU */ case XEN_SYSCTL_SCHEDOP_getinfo: @@ -1899,12 +1910,7 @@ csched_init(struct scheduler *ops) sched_credit_tslice_ms = CSCHED_DEFAULT_TSLICE_MS; } - prv->tslice_ms = sched_credit_tslice_ms; - prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; - if ( prv->tslice_ms < prv->ticks_per_tslice ) - prv->ticks_per_tslice = 1; - prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; - prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; + __csched_set_tslice(prv, sched_credit_tslice_ms); if ( MICROSECS(sched_ratelimit_us) > MILLISECS(sched_credit_tslice_ms) ) { -- generated by git-patchbot for /home/xen/git/xen.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 Nov 17 16:44:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5T0-00065s-Rp; Sun, 17 Nov 2013 16:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sz-00065d-CC for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:57 +0000 Received: from [85.158.139.211:29907] by server-10.bemta-5.messagelabs.com id 6F/11-28640-882F8825; Sun, 17 Nov 2013 16:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384706694!2428599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20840 invoked from network); 17 Nov 2013 16:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2013 16:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sw-0007UX-Oq for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sw-00021S-Mt for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:54 +0000 Date: Sun, 17 Nov 2013 16:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix leaking of v->cpu_affinity_saved on domain destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6757efe1bf50ac7ff68fa4dd7d9333529f70ae9a Author: Dario Faggioli AuthorDate: Fri Nov 15 17:43:28 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 17:43:28 2013 +0100 fix leaking of v->cpu_affinity_saved on domain destruction Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Jackson Reviewed-by: Jan Beulich --- xen/common/domain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1162e55..2cbc489 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -736,6 +736,7 @@ static void complete_domain_destroy(struct rcu_head *head) { free_cpumask_var(v->cpu_affinity); free_cpumask_var(v->cpu_affinity_tmp); + free_cpumask_var(v->cpu_affinity_saved); free_cpumask_var(v->vcpu_dirty_cpumask); free_vcpu_struct(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 17 16:44:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Nov 2013 16:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5T0-00065s-Rp; Sun, 17 Nov 2013 16:44:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sz-00065d-CC for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:57 +0000 Received: from [85.158.139.211:29907] by server-10.bemta-5.messagelabs.com id 6F/11-28640-882F8825; Sun, 17 Nov 2013 16:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1384706694!2428599!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20840 invoked from network); 17 Nov 2013 16:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2013 16:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vi5Sw-0007UX-Oq for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vi5Sw-00021S-Mt for xen-changelog@lists.xensource.com; Sun, 17 Nov 2013 16:44:54 +0000 Date: Sun, 17 Nov 2013 16:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix leaking of v->cpu_affinity_saved on domain destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6757efe1bf50ac7ff68fa4dd7d9333529f70ae9a Author: Dario Faggioli AuthorDate: Fri Nov 15 17:43:28 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 17:43:28 2013 +0100 fix leaking of v->cpu_affinity_saved on domain destruction Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Jackson Reviewed-by: Jan Beulich --- xen/common/domain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1162e55..2cbc489 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -736,6 +736,7 @@ static void complete_domain_destroy(struct rcu_head *head) { free_cpumask_var(v->cpu_affinity); free_cpumask_var(v->cpu_affinity_tmp); + free_cpumask_var(v->cpu_affinity_saved); free_cpumask_var(v->vcpu_dirty_cpumask); free_vcpu_struct(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 18 04:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGB1-0005Uh-4z; Mon, 18 Nov 2013 04: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 1ViGB0-0005Ua-6t for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:06 +0000 Received: from [85.158.143.35:51616] by server-1.bemta-4.messagelabs.com id 51/D1-02132-95399825; Mon, 18 Nov 2013 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384747863!3784478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22567 invoked from network); 18 Nov 2013 04: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; 18 Nov 2013 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGAx-0005eU-Eu for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGAx-0003vV-6u for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:03 +0000 Date: Mon, 18 Nov 2013 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: also save/restore XCR0 across suspend (ACPI S3) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92503639bd8bedd7f9097629f77e2de5a31659b2 Author: Jan Beulich AuthorDate: Fri Nov 15 11:20:04 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:20:04 2013 +0100 x86/xsave: also save/restore XCR0 across suspend (ACPI S3) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: e47a90e6dca491c0ceea6ffa18055e7e32565e8e master date: 2013-10-21 17:26:16 +0200 --- xen/arch/x86/acpi/suspend.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index c690b45..f4cc041 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -13,12 +13,14 @@ #include #include #include +#include #include static unsigned long saved_lstar, saved_cstar; static unsigned long saved_sysenter_esp, saved_sysenter_eip; static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base; static uint16_t saved_segs[4]; +static uint64_t saved_xcr0; void save_rest_processor_state(void) { @@ -38,6 +40,8 @@ void save_rest_processor_state(void) rdmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp); rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip); } + if ( cpu_has_xsave ) + saved_xcr0 = get_xcr0(); } @@ -77,6 +81,9 @@ void restore_rest_processor_state(void) do_set_segment_base(SEGBASE_GS_USER_SEL, saved_segs[3]); } + if ( cpu_has_xsave && !set_xcr0(saved_xcr0) ) + BUG(); + /* Maybe load the debug registers. */ BUG_ON(is_hvm_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) -- 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 Nov 18 04:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGB1-0005Uh-4z; Mon, 18 Nov 2013 04: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 1ViGB0-0005Ua-6t for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:06 +0000 Received: from [85.158.143.35:51616] by server-1.bemta-4.messagelabs.com id 51/D1-02132-95399825; Mon, 18 Nov 2013 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384747863!3784478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22567 invoked from network); 18 Nov 2013 04: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; 18 Nov 2013 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGAx-0005eU-Eu for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGAx-0003vV-6u for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:03 +0000 Date: Mon, 18 Nov 2013 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: also save/restore XCR0 across suspend (ACPI S3) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92503639bd8bedd7f9097629f77e2de5a31659b2 Author: Jan Beulich AuthorDate: Fri Nov 15 11:20:04 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:20:04 2013 +0100 x86/xsave: also save/restore XCR0 across suspend (ACPI S3) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: e47a90e6dca491c0ceea6ffa18055e7e32565e8e master date: 2013-10-21 17:26:16 +0200 --- xen/arch/x86/acpi/suspend.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index c690b45..f4cc041 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -13,12 +13,14 @@ #include #include #include +#include #include static unsigned long saved_lstar, saved_cstar; static unsigned long saved_sysenter_esp, saved_sysenter_eip; static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base; static uint16_t saved_segs[4]; +static uint64_t saved_xcr0; void save_rest_processor_state(void) { @@ -38,6 +40,8 @@ void save_rest_processor_state(void) rdmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp); rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip); } + if ( cpu_has_xsave ) + saved_xcr0 = get_xcr0(); } @@ -77,6 +81,9 @@ void restore_rest_processor_state(void) do_set_segment_base(SEGBASE_GS_USER_SEL, saved_segs[3]); } + if ( cpu_has_xsave && !set_xcr0(saved_xcr0) ) + BUG(); + /* Maybe load the debug registers. */ BUG_ON(is_hvm_vcpu(curr)); if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] ) -- 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 Nov 18 04:11:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBC-0005Va-7f; Mon, 18 Nov 2013 04:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBA-0005VM-Kl for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:16 +0000 Received: from [85.158.137.68:12192] by server-13.bemta-3.messagelabs.com id 3D/14-02689-36399825; Mon, 18 Nov 2013 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384747874!1150465!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9337 invoked from network); 18 Nov 2013 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGB7-0005eY-Jn for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGB7-0003wc-I0 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:13 +0000 Date: Mon, 18 Nov 2013 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: refine address validity checks before accessing page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c1dcf7d2c03fc9f256313cf99bfd81bddcc967d Author: Jan Beulich AuthorDate: Fri Nov 15 11:20:55 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:20:55 2013 +0100 x86: refine address validity checks before accessing page tables In commit 40d66baa ("x86: correct LDT checks") and d06a0d71 ("x86: add address validity check to guest_map_l1e()") I didn't really pay attention to the fact that these checks would better be done before the paging_mode_translate() ones, as there's also no equivalent check down the shadow code paths involved here (at least not up to the first use of the address), and such generic checks shouldn't really be done by particular backend functions anyway. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: 343cad8c70585c4dba8afc75e1ec1b7610605ab2 master date: 2013-10-28 12:00:36 +0100 --- xen/include/asm-x86/paging.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index e957b2f..cd7ee3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -356,12 +356,14 @@ guest_map_l1e(struct vcpu *v, unsigned long addr, unsigned long *gl1mfn) { l2_pgentry_t l2e; + if ( unlikely(!__addr_ok(addr)) ) + return NULL; + if ( unlikely(paging_mode_translate(v->domain)) ) return paging_get_hostmode(v)->guest_map_l1e(v, addr, gl1mfn); /* Find this l1e and its enclosing l1mfn in the linear map */ - if ( !__addr_ok(addr) || - __copy_from_user(&l2e, + if ( __copy_from_user(&l2e, &__linear_l2_table[l2_linear_offset(addr)], sizeof(l2_pgentry_t)) != 0 ) return NULL; @@ -382,16 +384,21 @@ guest_unmap_l1e(struct vcpu *v, void *p) /* Read the guest's l1e that maps this address. */ static inline void -guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) +guest_get_eff_l1e(struct vcpu *v, unsigned long addr, l1_pgentry_t *eff_l1e) { + if ( unlikely(!__addr_ok(addr)) ) + { + *eff_l1e = l1e_empty(); + return; + } + if ( likely(!paging_mode_translate(v->domain)) ) { ASSERT(!paging_mode_external(v->domain)); - if ( !__addr_ok(addr) || - __copy_from_user(eff_l1e, + if ( __copy_from_user(eff_l1e, &__linear_l1_table[l1_linear_offset(addr)], sizeof(l1_pgentry_t)) != 0 ) - *(l1_pgentry_t *)eff_l1e = l1e_empty(); + *eff_l1e = l1e_empty(); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 18 04:11:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBC-0005Va-7f; Mon, 18 Nov 2013 04:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBA-0005VM-Kl for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:16 +0000 Received: from [85.158.137.68:12192] by server-13.bemta-3.messagelabs.com id 3D/14-02689-36399825; Mon, 18 Nov 2013 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384747874!1150465!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9337 invoked from network); 18 Nov 2013 04:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGB7-0005eY-Jn for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGB7-0003wc-I0 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:13 +0000 Date: Mon, 18 Nov 2013 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: refine address validity checks before accessing page tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c1dcf7d2c03fc9f256313cf99bfd81bddcc967d Author: Jan Beulich AuthorDate: Fri Nov 15 11:20:55 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:20:55 2013 +0100 x86: refine address validity checks before accessing page tables In commit 40d66baa ("x86: correct LDT checks") and d06a0d71 ("x86: add address validity check to guest_map_l1e()") I didn't really pay attention to the fact that these checks would better be done before the paging_mode_translate() ones, as there's also no equivalent check down the shadow code paths involved here (at least not up to the first use of the address), and such generic checks shouldn't really be done by particular backend functions anyway. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: 343cad8c70585c4dba8afc75e1ec1b7610605ab2 master date: 2013-10-28 12:00:36 +0100 --- xen/include/asm-x86/paging.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index e957b2f..cd7ee3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -356,12 +356,14 @@ guest_map_l1e(struct vcpu *v, unsigned long addr, unsigned long *gl1mfn) { l2_pgentry_t l2e; + if ( unlikely(!__addr_ok(addr)) ) + return NULL; + if ( unlikely(paging_mode_translate(v->domain)) ) return paging_get_hostmode(v)->guest_map_l1e(v, addr, gl1mfn); /* Find this l1e and its enclosing l1mfn in the linear map */ - if ( !__addr_ok(addr) || - __copy_from_user(&l2e, + if ( __copy_from_user(&l2e, &__linear_l2_table[l2_linear_offset(addr)], sizeof(l2_pgentry_t)) != 0 ) return NULL; @@ -382,16 +384,21 @@ guest_unmap_l1e(struct vcpu *v, void *p) /* Read the guest's l1e that maps this address. */ static inline void -guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e) +guest_get_eff_l1e(struct vcpu *v, unsigned long addr, l1_pgentry_t *eff_l1e) { + if ( unlikely(!__addr_ok(addr)) ) + { + *eff_l1e = l1e_empty(); + return; + } + if ( likely(!paging_mode_translate(v->domain)) ) { ASSERT(!paging_mode_external(v->domain)); - if ( !__addr_ok(addr) || - __copy_from_user(eff_l1e, + if ( __copy_from_user(eff_l1e, &__linear_l1_table[l1_linear_offset(addr)], sizeof(l1_pgentry_t)) != 0 ) - *(l1_pgentry_t *)eff_l1e = l1e_empty(); + *eff_l1e = l1e_empty(); return; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 18 04:11:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBL-0005X1-Cd; Mon, 18 Nov 2013 04:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBK-0005Wn-Fg for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:26 +0000 Received: from [85.158.143.35:61622] by server-3.bemta-4.messagelabs.com id 94/B9-32360-D6399825; Mon, 18 Nov 2013 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384747884!3836984!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23148 invoked from network); 18 Nov 2013 04: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; 18 Nov 2013 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBH-0005eg-PR for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBH-0003wy-NM for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:23 +0000 Date: Mon, 18 Nov 2013 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53b20077f9f15cd78bad42bfdd98e27c7fe32d5e Author: Jan Beulich AuthorDate: Fri Nov 15 11:22:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:22:24 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser master commit: 2c24cdcce3269f3286790c63821951a1de93c66a master date: 2013-11-04 10:10:04 +0100 --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0e1d570..df26423 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -97,7 +97,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- 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 Nov 18 04:11:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBL-0005X1-Cd; Mon, 18 Nov 2013 04:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBK-0005Wn-Fg for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:26 +0000 Received: from [85.158.143.35:61622] by server-3.bemta-4.messagelabs.com id 94/B9-32360-D6399825; Mon, 18 Nov 2013 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384747884!3836984!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23148 invoked from network); 18 Nov 2013 04: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; 18 Nov 2013 04:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBH-0005eg-PR for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBH-0003wy-NM for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:23 +0000 Date: Mon, 18 Nov 2013 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53b20077f9f15cd78bad42bfdd98e27c7fe32d5e Author: Jan Beulich AuthorDate: Fri Nov 15 11:22:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:22:24 2013 +0100 x86/ACPI/x2APIC: guard against out of range ACPI or APIC IDs Other than for the legacy APIC, the x2APIC MADT entries have valid ranges possibly extending beyond what our internal arrays can handle, and hence we need to guard ourselves against corrupting memory here. Signed-off-by: Jan Beulich Reviewed-by: Keir Fraser master commit: 2c24cdcce3269f3286790c63821951a1de93c66a master date: 2013-11-04 10:10:04 +0100 --- xen/arch/x86/acpi/boot.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0e1d570..df26423 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -97,7 +97,20 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) acpi_table_print_madt_entry(header); - /* Record local apic id only when enabled */ + /* Record local apic id only when enabled and fitting. */ + if (processor->local_apic_id >= MAX_APICS || + processor->uid >= MAX_MADT_ENTRIES) { + printk("%sAPIC ID %#x and/or ACPI ID %#x beyond limit" + " - processor ignored\n", + processor->lapic_flags & ACPI_MADT_ENABLED ? + KERN_WARNING "WARNING: " : KERN_INFO, + processor->local_apic_id, processor->uid); + /* + * Must not return an error here, to prevent + * acpi_table_parse_entries() from terminating early. + */ + return 0 /* -ENOSPC */; + } if (processor->lapic_flags & ACPI_MADT_ENABLED) { x86_acpiid_to_apicid[processor->uid] = processor->local_apic_id; -- 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 Nov 18 04:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBV-0005YQ-FJ; Mon, 18 Nov 2013 04:11:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBU-0005YF-EB for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:36 +0000 Received: from [193.109.254.147:61614] by server-15.bemta-14.messagelabs.com id EA/88-06807-77399825; Mon, 18 Nov 2013 04:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384747894!3347962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4024 invoked from network); 18 Nov 2013 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBR-0005eo-VQ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBR-0003xO-S4 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:33 +0000 Date: Mon, 18 Nov 2013 04:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: make sure memory block is RAM before passing to the allocator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff8c797392bddc04a35463958bfc2d981734d345 Author: Jan Beulich AuthorDate: Fri Nov 15 11:23:04 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:23:04 2013 +0100 x86: make sure memory block is RAM before passing to the allocator Memory blocks outside of the always visible 1:1 mapping range get passed to the allocator separately (once enough other setup was done). Skipping non-RAM regions, however, was forgotten in adc5afbf ("x86: support up to 16Tb"). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 227258983401b7e6091967ffaf22ad83f4ebaf6f master date: 2013-11-04 14:29:24 +0100 --- xen/arch/x86/setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0b92874..cd524e3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1154,6 +1154,8 @@ void __init __start_xen(unsigned long mbi_p) { uint64_t s, e; + if ( boot_e820.map[i].type != E820_RAM ) + continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; if ( PFN_DOWN(e) <= limit ) -- 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 Nov 18 04:11:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBV-0005YQ-FJ; Mon, 18 Nov 2013 04:11:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBU-0005YF-EB for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:36 +0000 Received: from [193.109.254.147:61614] by server-15.bemta-14.messagelabs.com id EA/88-06807-77399825; Mon, 18 Nov 2013 04:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384747894!3347962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4024 invoked from network); 18 Nov 2013 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBR-0005eo-VQ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBR-0003xO-S4 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:33 +0000 Date: Mon, 18 Nov 2013 04:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: make sure memory block is RAM before passing to the allocator X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff8c797392bddc04a35463958bfc2d981734d345 Author: Jan Beulich AuthorDate: Fri Nov 15 11:23:04 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:23:04 2013 +0100 x86: make sure memory block is RAM before passing to the allocator Memory blocks outside of the always visible 1:1 mapping range get passed to the allocator separately (once enough other setup was done). Skipping non-RAM regions, however, was forgotten in adc5afbf ("x86: support up to 16Tb"). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 227258983401b7e6091967ffaf22ad83f4ebaf6f master date: 2013-11-04 14:29:24 +0100 --- xen/arch/x86/setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0b92874..cd524e3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1154,6 +1154,8 @@ void __init __start_xen(unsigned long mbi_p) { uint64_t s, e; + if ( boot_e820.map[i].type != E820_RAM ) + continue; s = (boot_e820.map[i].addr + mask) & ~mask; e = (boot_e820.map[i].addr + boot_e820.map[i].size) & ~mask; if ( PFN_DOWN(e) <= limit ) -- 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 Nov 18 04:11:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBg-0005aG-IG; Mon, 18 Nov 2013 04:11:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBf-0005a2-4A for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:47 +0000 Received: from [85.158.139.211:35209] by server-17.bemta-5.messagelabs.com id F6/4F-17059-28399825; Mon, 18 Nov 2013 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384747904!620405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6722 invoked from network); 18 Nov 2013 04:11:45 -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; 18 Nov 2013 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBc-0005eu-46 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBc-0003xk-2t for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:44 +0000 Date: Mon, 18 Nov 2013 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: 32-bit IN result must be zero-extended to 64 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 c179b2fd803b8b6cc29046088a90791a65d9cb32 Author: Jan Beulich AuthorDate: Fri Nov 15 11:24:16 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:24:16 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c master date: 2013-11-05 14:51:53 +0100 master commit: 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 master date: 2013-11-15 11:01:49 +0100 --- xen/arch/x86/hvm/io.c | 17 +++++++++++++---- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 5f5009a..53acd01 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else + memcpy(&guest_cpu_user_regs()->rax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) @@ -281,8 +288,10 @@ void hvm_io_assist(void) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else + memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size); break; default: break; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- 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 Nov 18 04:11:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBg-0005aG-IG; Mon, 18 Nov 2013 04:11:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBf-0005a2-4A for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:47 +0000 Received: from [85.158.139.211:35209] by server-17.bemta-5.messagelabs.com id F6/4F-17059-28399825; Mon, 18 Nov 2013 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1384747904!620405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6722 invoked from network); 18 Nov 2013 04:11:45 -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; 18 Nov 2013 04:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBc-0005eu-46 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBc-0003xk-2t for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:44 +0000 Date: Mon, 18 Nov 2013 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: 32-bit IN result must be zero-extended to 64 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 c179b2fd803b8b6cc29046088a90791a65d9cb32 Author: Jan Beulich AuthorDate: Fri Nov 15 11:24:16 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:24:16 2013 +0100 x86/HVM: 32-bit IN result must be zero-extended to 64 bits Just like for all other operations with 32-bit operand size. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2) Just spotted a counterpart of what commit 9d89100b (same title) dealt with. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c master date: 2013-11-05 14:51:53 +0100 master commit: 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41 master date: 2013-11-15 11:01:49 +0100 --- xen/arch/x86/hvm/io.c | 17 +++++++++++++---- xen/include/asm-x86/hvm/io.h | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 5f5009a..53acd01 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) return handle_mmio(); } -int handle_pio(uint16_t port, int size, int dir) +int handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; unsigned long data, reps = 1; int rc; + ASSERT((size - 1) < 4 && size != 3); + if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; @@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size, int dir) { case X86EMUL_OKAY: if ( dir == IOREQ_READ ) - memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size); + { + if ( size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)data; + else + memcpy(&guest_cpu_user_regs()->rax, &data, size); + } break; case X86EMUL_RETRY: if ( vio->io_state != HVMIO_awaiting_completion ) @@ -281,8 +288,10 @@ void hvm_io_assist(void) (void)handle_mmio(); break; case HVMIO_handle_pio_awaiting_completion: - memcpy(&guest_cpu_user_regs()->eax, - &p->data, vio->io_size); + if ( vio->io_size == 4 ) /* Needs zero extension. */ + guest_cpu_user_regs()->rax = (uint32_t)p->data; + else + memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size); break; default: break; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 410a5f6..b0718b8 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); -int handle_pio(uint16_t port, int size, int dir); +int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(void); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, -- 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 Nov 18 04:11:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBq-0005bx-LF; Mon, 18 Nov 2013 04:11:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBp-0005bl-0p for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:57 +0000 Received: from [85.158.143.35:53027] by server-3.bemta-4.messagelabs.com id 6C/D9-32360-C8399825; Mon, 18 Nov 2013 04:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384747914!3837030!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24414 invoked from network); 18 Nov 2013 04:11:55 -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; 18 Nov 2013 04:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBm-0005f3-De for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBm-0003yC-8J for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:54 +0000 Date: Mon, 18 Nov 2013 04:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] call sched_destroy_domain before cpupool_rm_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 406323bdf652767fa2168e5ea4dfaf619d67867b Author: Nathan Studer AuthorDate: Fri Nov 15 11:25:05 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:25:05 2013 +0100 call sched_destroy_domain before cpupool_rm_domain The domain destruction code, removes a domain from its cpupool before attempting to destroy its scheduler information. Since the scheduler framework uses the domain's cpupool information to decide on which scheduler ops to use, this results in the the wrong scheduler's destroy domain function being called when the cpupool scheduler and the initial scheduler are different. Correct this by destroying the domain's scheduling information before removing it from the pool. Signed-off-by: Nathan Studer Reviewed-by: Juergen Gross Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Acked-by: Keir Fraser master commit: 117f67350fd18b11ab09d628b4edea3364b09441 master date: 2013-11-06 10:21:09 +0100 --- xen/common/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index fac3470..2ea4686 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -720,10 +720,10 @@ static void complete_domain_destroy(struct rcu_head *head) rangeset_domain_destroy(d); - cpupool_rm_domain(d); - sched_destroy_domain(d); + cpupool_rm_domain(d); + /* Free page used by xen oprofile buffer. */ #ifdef CONFIG_XENOPROF free_xenoprof_pages(d); -- 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 Nov 18 04:11:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:11: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 1ViGBq-0005bx-LF; Mon, 18 Nov 2013 04:11:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBp-0005bl-0p for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:57 +0000 Received: from [85.158.143.35:53027] by server-3.bemta-4.messagelabs.com id 6C/D9-32360-C8399825; Mon, 18 Nov 2013 04:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1384747914!3837030!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24414 invoked from network); 18 Nov 2013 04:11:55 -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; 18 Nov 2013 04:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBm-0005f3-De for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBm-0003yC-8J for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:11:54 +0000 Date: Mon, 18 Nov 2013 04:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] call sched_destroy_domain before cpupool_rm_domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 406323bdf652767fa2168e5ea4dfaf619d67867b Author: Nathan Studer AuthorDate: Fri Nov 15 11:25:05 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:25:05 2013 +0100 call sched_destroy_domain before cpupool_rm_domain The domain destruction code, removes a domain from its cpupool before attempting to destroy its scheduler information. Since the scheduler framework uses the domain's cpupool information to decide on which scheduler ops to use, this results in the the wrong scheduler's destroy domain function being called when the cpupool scheduler and the initial scheduler are different. Correct this by destroying the domain's scheduling information before removing it from the pool. Signed-off-by: Nathan Studer Reviewed-by: Juergen Gross Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Acked-by: Keir Fraser master commit: 117f67350fd18b11ab09d628b4edea3364b09441 master date: 2013-11-06 10:21:09 +0100 --- xen/common/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index fac3470..2ea4686 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -720,10 +720,10 @@ static void complete_domain_destroy(struct rcu_head *head) rangeset_domain_destroy(d); - cpupool_rm_domain(d); - sched_destroy_domain(d); + cpupool_rm_domain(d); + /* Free page used by xen oprofile buffer. */ #ifdef CONFIG_XENOPROF free_xenoprof_pages(d); -- 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 Nov 18 04:12:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC0-0005dV-O0; Mon, 18 Nov 2013 04:12:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBz-0005dE-2o for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:07 +0000 Received: from [193.109.254.147:44544] by server-4.bemta-14.messagelabs.com id 17/29-22292-69399825; Mon, 18 Nov 2013 04:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1384747924!3353049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17353 invoked from network); 18 Nov 2013 04:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBw-0005fc-Ky for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBw-0003yk-HZ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:04 +0000 Date: Mon, 18 Nov 2013 04:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: fix restart of RTC periodic timer with vpt_align=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 cd766e12d4c914f3928537acb64595f5044d43bf Author: Kouya Shimura AuthorDate: Fri Nov 15 11:25:46 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:25:46 2013 +0100 x86/hvm: fix restart of RTC periodic timer with vpt_align=1 The commit 58afa7ef "x86/hvm: Run the RTC periodic timer on a consistent time series" aligns the RTC periodic timer to the VM's boot time. However, it's aligned later again to the system time in create_periodic_time() with vpt_align=1. The next tick might be skipped. Signed-off-by: Kouya Shimura Reviewed-by: Jan Beulich Acked-by: Tim Deegan master commit: 48535f5798e3e237d9920a74c1ce3802958136c0 master date: 2013-11-08 11:07:14 +0100 --- xen/arch/x86/hvm/rtc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d1a6848..cdedefe 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -130,7 +130,10 @@ static void rtc_timer_update(RTCState *s) s->pt_code = period_code; period = 1 << (period_code - 1); /* period in 32 Khz cycles */ period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ - delta = period - ((NOW() - s->start_time) % period); + if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) + delta = 0; + else + delta = period - ((NOW() - s->start_time) % period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, NULL, s); } -- 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 Nov 18 04:12:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC0-0005dV-O0; Mon, 18 Nov 2013 04:12:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBz-0005dE-2o for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:07 +0000 Received: from [193.109.254.147:44544] by server-4.bemta-14.messagelabs.com id 17/29-22292-69399825; Mon, 18 Nov 2013 04:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1384747924!3353049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17353 invoked from network); 18 Nov 2013 04:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGBw-0005fc-Ky for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGBw-0003yk-HZ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:04 +0000 Date: Mon, 18 Nov 2013 04:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: fix restart of RTC periodic timer with vpt_align=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 cd766e12d4c914f3928537acb64595f5044d43bf Author: Kouya Shimura AuthorDate: Fri Nov 15 11:25:46 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:25:46 2013 +0100 x86/hvm: fix restart of RTC periodic timer with vpt_align=1 The commit 58afa7ef "x86/hvm: Run the RTC periodic timer on a consistent time series" aligns the RTC periodic timer to the VM's boot time. However, it's aligned later again to the system time in create_periodic_time() with vpt_align=1. The next tick might be skipped. Signed-off-by: Kouya Shimura Reviewed-by: Jan Beulich Acked-by: Tim Deegan master commit: 48535f5798e3e237d9920a74c1ce3802958136c0 master date: 2013-11-08 11:07:14 +0100 --- xen/arch/x86/hvm/rtc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d1a6848..cdedefe 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -130,7 +130,10 @@ static void rtc_timer_update(RTCState *s) s->pt_code = period_code; period = 1 << (period_code - 1); /* period in 32 Khz cycles */ period = DIV_ROUND(period * 1000000000ULL, 32768); /* in ns */ - delta = period - ((NOW() - s->start_time) % period); + if ( v->domain->arch.hvm_domain.params[HVM_PARAM_VPT_ALIGN] ) + delta = 0; + else + delta = period - ((NOW() - s->start_time) % period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, NULL, s); } -- 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 Nov 18 04:12:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04: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 1ViGCA-0005fJ-Qj; Mon, 18 Nov 2013 04:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC9-0005f7-GX for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:17 +0000 Received: from [193.109.254.147:44804] by server-11.bemta-14.messagelabs.com id 4F/46-08419-0A399825; Mon, 18 Nov 2013 04:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384747935!3348023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6271 invoked from network); 18 Nov 2013 04:12:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC6-0005fi-QV for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGC6-0003zn-NZ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:14 +0000 Date: Mon, 18 Nov 2013 04:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1c1672e9be7886dd50ddd8605855783d7d25e9b Author: Jan Beulich AuthorDate: Fri Nov 15 11:26:30 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:26:30 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c1f2dfe8f6a559bc28935f24e31bb33d17d9713d master date: 2013-11-08 11:08:32 +0100 --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 66a6fdb..68c9abe 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -746,6 +746,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -765,7 +781,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1268,23 +1283,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and boot-map page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1400,10 +1405,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1431,6 +1440,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- 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 Nov 18 04:12:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04: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 1ViGCA-0005fJ-Qj; Mon, 18 Nov 2013 04:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC9-0005f7-GX for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:17 +0000 Received: from [193.109.254.147:44804] by server-11.bemta-14.messagelabs.com id 4F/46-08419-0A399825; Mon, 18 Nov 2013 04:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1384747935!3348023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6271 invoked from network); 18 Nov 2013 04:12:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGC6-0005fi-QV for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGC6-0003zn-NZ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:14 +0000 Date: Mon, 18 Nov 2013 04:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/EFI: make trampoline allocation more flexible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1c1672e9be7886dd50ddd8605855783d7d25e9b Author: Jan Beulich AuthorDate: Fri Nov 15 11:26:30 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:26:30 2013 +0100 x86/EFI: make trampoline allocation more flexible Certain UEFI implementations reserve all memory below 1Mb at boot time, making it impossible to properly allocate the chunk necessary for the trampoline. Fall back to simply grabbing a chunk from EfiBootServices* regions immediately prior to calling ExitBootServices(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: c1f2dfe8f6a559bc28935f24e31bb33d17d9713d master date: 2013-11-08 11:08:32 +0100 --- xen/arch/x86/efi/boot.c | 49 ++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 66a6fdb..68c9abe 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -746,6 +746,22 @@ static void __init relocate_image(unsigned long delta) extern const s32 __trampoline_rel_start[], __trampoline_rel_stop[]; extern const s32 __trampoline_seg_start[], __trampoline_seg_stop[]; +static void __init relocate_trampoline(unsigned long phys) +{ + const s32 *trampoline_ptr; + + trampoline_phys = phys; + /* Apply relocations to trampoline. */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} + void EFIAPI __init __attribute__((__noreturn__)) efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { @@ -765,7 +781,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - const s32 *trampoline_ptr; struct e820entry *e; u64 efer; bool_t base_video = 0; @@ -1268,23 +1283,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) cfg.size = trampoline_end - trampoline_start; status = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, PFN_UP(cfg.size), &cfg.addr); - if ( EFI_ERROR(status) ) + if ( status == EFI_SUCCESS ) + relocate_trampoline(cfg.addr); + else { cfg.addr = 0; - blexit(L"No memory for trampoline\r\n"); + PrintStr(L"Trampoline space cannot be allocated; will try fallback.\r\n"); } - trampoline_phys = cfg.addr; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += - trampoline_phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = - trampoline_phys >> 4; /* Initialise L2 identity-map and boot-map page table entries (16MB). */ for ( i = 0; i < 8; ++i ) @@ -1400,10 +1405,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) type = E820_RESERVED; break; case EfiConventionalMemory: - case EfiLoaderCode: - case EfiLoaderData: case EfiBootServicesCode: case EfiBootServicesData: + if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: if ( desc->Attribute & EFI_MEMORY_WB ) type = E820_RAM; else @@ -1431,6 +1440,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) ++e820nr; } } + if ( !trampoline_phys ) + { + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); + } status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) -- 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 Nov 18 04:12:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCK-0005h7-Tx; Mon, 18 Nov 2013 04:12:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCJ-0005gt-LT for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:27 +0000 Received: from [193.109.254.147:50313] by server-1.bemta-14.messagelabs.com id 9B/0B-10312-BA399825; Mon, 18 Nov 2013 04:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384747945!3308471!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30466 invoked from network); 18 Nov 2013 04:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCG-0005fo-Vj for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCG-000409-Tw for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:24 +0000 Date: Mon, 18 Nov 2013 04:12:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] numa-sched: leave node-affinity alone if not in "auto" mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b54a623efbcf5bff25c55117add1b4427b4e2f1b Author: Dario Faggioli AuthorDate: Fri Nov 15 11:27:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:27:24 2013 +0100 numa-sched: leave node-affinity alone if not in "auto" mode If the domain's NUMA node-affinity is being specified by the user/toolstack (instead of being automatically computed by Xen), we really should stick to that. This means domain_update_node_affinity() is wrong when it filters out some stuff from there even in "!auto" mode. This commit fixes that. Of course, this does not mean node-affinity is always honoured (e.g., a vcpu won't run on a pcpu of a different cpupool) but the necessary logic for taking into account all the possible situations lives in the scheduler code, where it belongs. What could happen without this change is that, under certain circumstances, the node-affinity of a domain may change when the user modifies the vcpu-affinity of the domain's vcpus. This, even if probably not a real bug, is at least something the user does not expect, so let's avoid it. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Keir Fraser master commit: 67348c3ac700b8bc9147638c719c3035c5ef20f5 master date: 2013-11-12 10:54:28 +0100 --- xen/common/domain.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 2ea4686..99c1290 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -345,7 +345,6 @@ void domain_update_node_affinity(struct domain *d) cpumask_var_t cpumask; cpumask_var_t online_affinity; const cpumask_t *online; - nodemask_t nodemask = NODE_MASK_NONE; struct vcpu *v; unsigned int node; @@ -367,28 +366,19 @@ void domain_update_node_affinity(struct domain *d) cpumask_or(cpumask, cpumask, online_affinity); } + /* + * If d->auto_node_affinity is true, the domain's node-affinity mask + * (d->node_affinity) is automaically computed from all the domain's + * vcpus' vcpu-affinity masks (the union of which we have just built + * above in cpumask). OTOH, if d->auto_node_affinity is false, we + * must leave the node-affinity of the domain alone. + */ if ( d->auto_node_affinity ) { - /* Node-affinity is automaically computed from all vcpu-affinities */ + nodes_clear(d->node_affinity); for_each_online_node ( node ) if ( cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_set(node, nodemask); - - d->node_affinity = nodemask; - } - else - { - /* Node-affinity is provided by someone else, just filter out cpus - * that are either offline or not in the affinity of any vcpus. */ - nodemask = d->node_affinity; - for_each_node_mask ( node, d->node_affinity ) - if ( !cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_clear(node, nodemask);//d->node_affinity); - - /* Avoid loosing track of node-affinity because of a bad - * vcpu-affinity has been specified. */ - if ( !nodes_empty(nodemask) ) - d->node_affinity = nodemask; + node_set(node, d->node_affinity); } sched_set_node_affinity(d, &d->node_affinity); -- 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 Nov 18 04:12:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCK-0005h7-Tx; Mon, 18 Nov 2013 04:12:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCJ-0005gt-LT for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:27 +0000 Received: from [193.109.254.147:50313] by server-1.bemta-14.messagelabs.com id 9B/0B-10312-BA399825; Mon, 18 Nov 2013 04:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1384747945!3308471!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30466 invoked from network); 18 Nov 2013 04:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCG-0005fo-Vj for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCG-000409-Tw for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:24 +0000 Date: Mon, 18 Nov 2013 04:12:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] numa-sched: leave node-affinity alone if not in "auto" mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b54a623efbcf5bff25c55117add1b4427b4e2f1b Author: Dario Faggioli AuthorDate: Fri Nov 15 11:27:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:27:24 2013 +0100 numa-sched: leave node-affinity alone if not in "auto" mode If the domain's NUMA node-affinity is being specified by the user/toolstack (instead of being automatically computed by Xen), we really should stick to that. This means domain_update_node_affinity() is wrong when it filters out some stuff from there even in "!auto" mode. This commit fixes that. Of course, this does not mean node-affinity is always honoured (e.g., a vcpu won't run on a pcpu of a different cpupool) but the necessary logic for taking into account all the possible situations lives in the scheduler code, where it belongs. What could happen without this change is that, under certain circumstances, the node-affinity of a domain may change when the user modifies the vcpu-affinity of the domain's vcpus. This, even if probably not a real bug, is at least something the user does not expect, so let's avoid it. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Keir Fraser master commit: 67348c3ac700b8bc9147638c719c3035c5ef20f5 master date: 2013-11-12 10:54:28 +0100 --- xen/common/domain.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 2ea4686..99c1290 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -345,7 +345,6 @@ void domain_update_node_affinity(struct domain *d) cpumask_var_t cpumask; cpumask_var_t online_affinity; const cpumask_t *online; - nodemask_t nodemask = NODE_MASK_NONE; struct vcpu *v; unsigned int node; @@ -367,28 +366,19 @@ void domain_update_node_affinity(struct domain *d) cpumask_or(cpumask, cpumask, online_affinity); } + /* + * If d->auto_node_affinity is true, the domain's node-affinity mask + * (d->node_affinity) is automaically computed from all the domain's + * vcpus' vcpu-affinity masks (the union of which we have just built + * above in cpumask). OTOH, if d->auto_node_affinity is false, we + * must leave the node-affinity of the domain alone. + */ if ( d->auto_node_affinity ) { - /* Node-affinity is automaically computed from all vcpu-affinities */ + nodes_clear(d->node_affinity); for_each_online_node ( node ) if ( cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_set(node, nodemask); - - d->node_affinity = nodemask; - } - else - { - /* Node-affinity is provided by someone else, just filter out cpus - * that are either offline or not in the affinity of any vcpus. */ - nodemask = d->node_affinity; - for_each_node_mask ( node, d->node_affinity ) - if ( !cpumask_intersects(&node_to_cpumask(node), cpumask) ) - node_clear(node, nodemask);//d->node_affinity); - - /* Avoid loosing track of node-affinity because of a bad - * vcpu-affinity has been specified. */ - if ( !nodes_empty(nodemask) ) - d->node_affinity = nodemask; + node_set(node, d->node_affinity); } sched_set_node_affinity(d, &d->node_affinity); -- 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 Nov 18 04:12:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCW-0005jD-2O; Mon, 18 Nov 2013 04:12:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCT-0005iz-Qu for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:38 +0000 Received: from [193.109.254.147:45304] by server-9.bemta-14.messagelabs.com id AA/98-08751-5B399825; Mon, 18 Nov 2013 04:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384747955!3327270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32614 invoked from network); 18 Nov 2013 04:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCR-0005fw-5g for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCR-00040Z-2r for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:35 +0000 Date: Mon, 18 Nov 2013 04:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested SVM: adjust guest handling of structure mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9aa5c832e967ae333caef477521d055c1c49c31e Author: Jan Beulich AuthorDate: Fri Nov 15 11:28:05 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:28:05 2013 +0100 nested SVM: adjust guest handling of structure mappings For one, nestedsvm_vmcb_map() error checking must not consist of using assertions: Global (permanent) mappings can fail, and hence failure needs to be dealt with properly. And non-global (transient) mappings can't fail anyway. And then the I/O port access bitmap handling was broken: It checked only to first of the accessed ports rather than each of them. Signed-off-by: Jan Beulich Reviewed-by: Christoph Egger Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: b1e87805bf37b446dade93a7eb922bb7d1269756 master date: 2013-11-12 11:51:15 +0100 --- xen/arch/x86/hvm/svm/nestedsvm.c | 59 +++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index e32c872..3c6e28c 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -342,7 +342,7 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) unsigned int i; enum hvm_copy_result ret; unsigned long *ns_viomap; - bool_t ioport_80, ioport_ed; + bool_t ioport_80 = 1, ioport_ed = 1; ns_msrpm_ptr = (unsigned long *)svm->ns_cached_msrpm; @@ -360,10 +360,12 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) svm->ns_iomap_pa = ns_vmcb->_iopm_base_pa; ns_viomap = hvm_map_guest_frame_ro(svm->ns_iomap_pa >> PAGE_SHIFT, 0); - ASSERT(ns_viomap != NULL); - ioport_80 = test_bit(0x80, ns_viomap); - ioport_ed = test_bit(0xed, ns_viomap); - hvm_unmap_guest_frame(ns_viomap, 0); + if ( ns_viomap ) + { + ioport_80 = test_bit(0x80, ns_viomap); + ioport_ed = test_bit(0xed, ns_viomap); + hvm_unmap_guest_frame(ns_viomap, 0); + } svm->ns_iomap = nestedhvm_vcpu_iomap_get(ioport_80, ioport_ed); @@ -866,40 +868,45 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, static int nsvm_vmcb_guest_intercepts_ioio(paddr_t iopm_pa, uint64_t exitinfo1) { - unsigned long iopm_gfn = iopm_pa >> PAGE_SHIFT; - unsigned long *io_bitmap = NULL; + unsigned long gfn = iopm_pa >> PAGE_SHIFT; + unsigned long *io_bitmap; ioio_info_t ioinfo; uint16_t port; + unsigned int size; bool_t enabled; - unsigned long gfn = 0; /* gcc ... */ ioinfo.bytes = exitinfo1; port = ioinfo.fields.port; + size = ioinfo.fields.sz32 ? 4 : ioinfo.fields.sz16 ? 2 : 1; - switch (port) { - case 0 ... 32767: /* first 4KB page */ - gfn = iopm_gfn; + switch ( port ) + { + case 0 ... 8 * PAGE_SIZE - 1: /* first 4KB page */ break; - case 32768 ... 65535: /* second 4KB page */ - port -= 32768; - gfn = iopm_gfn + 1; + case 8 * PAGE_SIZE ... 2 * 8 * PAGE_SIZE - 1: /* second 4KB page */ + port -= 8 * PAGE_SIZE; + ++gfn; break; default: BUG(); break; } - io_bitmap = hvm_map_guest_frame_ro(gfn, 0); - if (io_bitmap == NULL) { - gdprintk(XENLOG_ERR, - "IOIO intercept: mapping of permission map failed\n"); - return NESTEDHVM_VMEXIT_ERROR; + for ( io_bitmap = hvm_map_guest_frame_ro(gfn, 0); ; ) + { + enabled = io_bitmap && test_bit(port, io_bitmap); + if ( !enabled || !--size ) + break; + if ( unlikely(++port == 8 * PAGE_SIZE) ) + { + hvm_unmap_guest_frame(io_bitmap, 0); + io_bitmap = hvm_map_guest_frame_ro(++gfn, 0); + port -= 8 * PAGE_SIZE; + } } - - enabled = test_bit(port, io_bitmap); hvm_unmap_guest_frame(io_bitmap, 0); - if (!enabled) + if ( !enabled ) return NESTEDHVM_VMEXIT_HOST; return NESTEDHVM_VMEXIT_INJECT; @@ -966,8 +973,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, switch (exitcode) { case VMEXIT_MSR: ASSERT(regs != NULL); - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_msr(svm->ns_cached_msrpm, regs->ecx, ns_vmcb->exitinfo1 != 0); @@ -975,8 +982,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, return 0; break; case VMEXIT_IOIO: - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_ioio(ns_vmcb->_iopm_base_pa, ns_vmcb->exitinfo1); -- 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 Nov 18 04:12:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCW-0005jD-2O; Mon, 18 Nov 2013 04:12:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCT-0005iz-Qu for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:38 +0000 Received: from [193.109.254.147:45304] by server-9.bemta-14.messagelabs.com id AA/98-08751-5B399825; Mon, 18 Nov 2013 04:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384747955!3327270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32614 invoked from network); 18 Nov 2013 04:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCR-0005fw-5g for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCR-00040Z-2r for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:35 +0000 Date: Mon, 18 Nov 2013 04:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested SVM: adjust guest handling of structure mappings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9aa5c832e967ae333caef477521d055c1c49c31e Author: Jan Beulich AuthorDate: Fri Nov 15 11:28:05 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:28:05 2013 +0100 nested SVM: adjust guest handling of structure mappings For one, nestedsvm_vmcb_map() error checking must not consist of using assertions: Global (permanent) mappings can fail, and hence failure needs to be dealt with properly. And non-global (transient) mappings can't fail anyway. And then the I/O port access bitmap handling was broken: It checked only to first of the accessed ports rather than each of them. Signed-off-by: Jan Beulich Reviewed-by: Christoph Egger Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: b1e87805bf37b446dade93a7eb922bb7d1269756 master date: 2013-11-12 11:51:15 +0100 --- xen/arch/x86/hvm/svm/nestedsvm.c | 59 +++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index e32c872..3c6e28c 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -342,7 +342,7 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) unsigned int i; enum hvm_copy_result ret; unsigned long *ns_viomap; - bool_t ioport_80, ioport_ed; + bool_t ioport_80 = 1, ioport_ed = 1; ns_msrpm_ptr = (unsigned long *)svm->ns_cached_msrpm; @@ -360,10 +360,12 @@ static int nsvm_vmrun_permissionmap(struct vcpu *v, bool_t viopm) svm->ns_iomap_pa = ns_vmcb->_iopm_base_pa; ns_viomap = hvm_map_guest_frame_ro(svm->ns_iomap_pa >> PAGE_SHIFT, 0); - ASSERT(ns_viomap != NULL); - ioport_80 = test_bit(0x80, ns_viomap); - ioport_ed = test_bit(0xed, ns_viomap); - hvm_unmap_guest_frame(ns_viomap, 0); + if ( ns_viomap ) + { + ioport_80 = test_bit(0x80, ns_viomap); + ioport_ed = test_bit(0xed, ns_viomap); + hvm_unmap_guest_frame(ns_viomap, 0); + } svm->ns_iomap = nestedhvm_vcpu_iomap_get(ioport_80, ioport_ed); @@ -866,40 +868,45 @@ nsvm_vmcb_guest_intercepts_msr(unsigned long *msr_bitmap, static int nsvm_vmcb_guest_intercepts_ioio(paddr_t iopm_pa, uint64_t exitinfo1) { - unsigned long iopm_gfn = iopm_pa >> PAGE_SHIFT; - unsigned long *io_bitmap = NULL; + unsigned long gfn = iopm_pa >> PAGE_SHIFT; + unsigned long *io_bitmap; ioio_info_t ioinfo; uint16_t port; + unsigned int size; bool_t enabled; - unsigned long gfn = 0; /* gcc ... */ ioinfo.bytes = exitinfo1; port = ioinfo.fields.port; + size = ioinfo.fields.sz32 ? 4 : ioinfo.fields.sz16 ? 2 : 1; - switch (port) { - case 0 ... 32767: /* first 4KB page */ - gfn = iopm_gfn; + switch ( port ) + { + case 0 ... 8 * PAGE_SIZE - 1: /* first 4KB page */ break; - case 32768 ... 65535: /* second 4KB page */ - port -= 32768; - gfn = iopm_gfn + 1; + case 8 * PAGE_SIZE ... 2 * 8 * PAGE_SIZE - 1: /* second 4KB page */ + port -= 8 * PAGE_SIZE; + ++gfn; break; default: BUG(); break; } - io_bitmap = hvm_map_guest_frame_ro(gfn, 0); - if (io_bitmap == NULL) { - gdprintk(XENLOG_ERR, - "IOIO intercept: mapping of permission map failed\n"); - return NESTEDHVM_VMEXIT_ERROR; + for ( io_bitmap = hvm_map_guest_frame_ro(gfn, 0); ; ) + { + enabled = io_bitmap && test_bit(port, io_bitmap); + if ( !enabled || !--size ) + break; + if ( unlikely(++port == 8 * PAGE_SIZE) ) + { + hvm_unmap_guest_frame(io_bitmap, 0); + io_bitmap = hvm_map_guest_frame_ro(++gfn, 0); + port -= 8 * PAGE_SIZE; + } } - - enabled = test_bit(port, io_bitmap); hvm_unmap_guest_frame(io_bitmap, 0); - if (!enabled) + if ( !enabled ) return NESTEDHVM_VMEXIT_HOST; return NESTEDHVM_VMEXIT_INJECT; @@ -966,8 +973,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, switch (exitcode) { case VMEXIT_MSR: ASSERT(regs != NULL); - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_msr(svm->ns_cached_msrpm, regs->ecx, ns_vmcb->exitinfo1 != 0); @@ -975,8 +982,8 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v, return 0; break; case VMEXIT_IOIO: - nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr); - ASSERT(nv->nv_vvmcx != NULL); + if ( !nestedsvm_vmcb_map(v, nv->nv_vvmcxaddr) ) + break; ns_vmcb = nv->nv_vvmcx; vmexits = nsvm_vmcb_guest_intercepts_ioio(ns_vmcb->_iopm_base_pa, ns_vmcb->exitinfo1); -- 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 Nov 18 04:12:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12: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 1ViGCf-0005l6-55; Mon, 18 Nov 2013 04:12:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCe-0005kv-Bi for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:48 +0000 Received: from [193.109.254.147:63602] by server-9.bemta-14.messagelabs.com id 3C/A8-08751-FB399825; Mon, 18 Nov 2013 04:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384747965!3327284!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 859 invoked from network); 18 Nov 2013 04:12:46 -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; 18 Nov 2013 04:12:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCb-0005g2-Oh for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCb-00040v-G8 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:45 +0000 Date: Mon, 18 Nov 2013 04:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec6f0183517615823641785233eeaf8372f674ac Author: Jan Beulich AuthorDate: Fri Nov 15 11:28:37 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:28:37 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 58929248461ecadce13e92eb5a5d9ef718a7c88e master date: 2013-11-12 11:52:19 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 2ed25c7..76b55b4 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -591,16 +591,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -623,6 +623,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0e5d3b4..6052629 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -669,7 +669,27 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { uint32_t attr = 0; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 21f6777..4d55573 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -144,6 +144,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- 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 Nov 18 04:12:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12: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 1ViGCf-0005l6-55; Mon, 18 Nov 2013 04:12:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCe-0005kv-Bi for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:48 +0000 Received: from [193.109.254.147:63602] by server-9.bemta-14.messagelabs.com id 3C/A8-08751-FB399825; Mon, 18 Nov 2013 04:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1384747965!3327284!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 859 invoked from network); 18 Nov 2013 04:12:46 -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; 18 Nov 2013 04:12:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCb-0005g2-Oh for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCb-00040v-G8 for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:45 +0000 Date: Mon, 18 Nov 2013 04:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: don't crash processing 'd' debug key X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec6f0183517615823641785233eeaf8372f674ac Author: Jan Beulich AuthorDate: Fri Nov 15 11:28:37 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:28:37 2013 +0100 VMX: don't crash processing 'd' debug key There's a window during scheduling where "current" and the active VMCS may disagree: The former gets set much earlier than the latter. Since both vmx_vmcs_enter() and vmx_vmcs_exit() immediately return when the subject vCPU is "current", accessing VMCS fields would, depending on whether there is any currently active VMCS, either read wrong data, or cause a crash. Going forward we might want to consider reducing the window during which vmx_vmcs_enter() might fail (e.g. doing a plain __vmptrld() when v->arch.hvm_vmx.vmcs != this_cpu(current_vmcs) but arch_vmx->active_cpu == -1), but that would add complexities (acquiring and - more importantly - properly dropping v->arch.hvm_vmx.vmcs_lock) that don't look worthwhile adding right now. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 58929248461ecadce13e92eb5a5d9ef718a7c88e master date: 2013-11-12 11:52:19 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++++++++++--- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++++++++++++- xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 2ed25c7..76b55b4 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -591,16 +591,16 @@ struct foreign_vmcs { }; static DEFINE_PER_CPU(struct foreign_vmcs, foreign_vmcs); -void vmx_vmcs_enter(struct vcpu *v) +bool_t vmx_vmcs_try_enter(struct vcpu *v) { struct foreign_vmcs *fv; /* * NB. We must *always* run an HVM VCPU on its own VMCS, except for - * vmx_vmcs_enter/exit critical regions. + * vmx_vmcs_enter/exit and scheduling tail critical regions. */ if ( likely(v == current) ) - return; + return v->arch.hvm_vmx.vmcs == this_cpu(current_vmcs); fv = &this_cpu(foreign_vmcs); @@ -623,6 +623,15 @@ void vmx_vmcs_enter(struct vcpu *v) } fv->count++; + + return 1; +} + +void vmx_vmcs_enter(struct vcpu *v) +{ + bool_t okay = vmx_vmcs_try_enter(v); + + ASSERT(okay); } void vmx_vmcs_exit(struct vcpu *v) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0e5d3b4..6052629 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -669,7 +669,27 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, { uint32_t attr = 0; - vmx_vmcs_enter(v); + /* + * We may get here in the context of dump_execstate(), which may have + * interrupted context switching between setting "current" and + * vmx_do_resume() reaching the end of vmx_load_vmcs(). That would make + * all the VMREADs below fail if we don't bail right away. + */ + if ( unlikely(!vmx_vmcs_try_enter(v)) ) + { + static bool_t warned; + + if ( !warned ) + { + warned = 1; + printk(XENLOG_WARNING "Segment register inaccessible for d%dv%d\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v->domain->domain_id, v->vcpu_id); + } + memset(reg, 0, sizeof(*reg)); + return; + } switch ( seg ) { diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 21f6777..4d55573 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -144,6 +144,7 @@ struct arch_vmx_struct { int vmx_create_vmcs(struct vcpu *v); void vmx_destroy_vmcs(struct vcpu *v); void vmx_vmcs_enter(struct vcpu *v); +bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v); void vmx_vmcs_exit(struct vcpu *v); #define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -- 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 Nov 18 04:12:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCp-0005mg-7o; Mon, 18 Nov 2013 04:12:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCo-0005mY-Jp for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:58 +0000 Received: from [85.158.143.35:2522] by server-2.bemta-4.messagelabs.com id D7/56-11386-9C399825; Mon, 18 Nov 2013 04:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384747976!3784661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29020 invoked from network); 18 Nov 2013 04:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCl-0005gB-Ut for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCl-00041H-TJ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:55 +0000 Date: Mon, 18 Nov 2013 04:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2df9704ad1bb7484efded4fec9e81f13fab4e839 Author: Jan Beulich AuthorDate: Fri Nov 15 11:29:57 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:29:57 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 master date: 2013-11-12 16:28:47 +0100 --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4cf503b..f066353 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1792,7 +1793,7 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) + if ( cache_flush_permitted(v->domain) ) { if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) { diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index eb8e577..3fc729c 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1973,7 +1974,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 6052629..cb1d118 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2160,10 +2161,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 909f449..eaec0137 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -316,7 +316,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -- 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 Nov 18 04:12:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Nov 2013 04:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCp-0005mg-7o; Mon, 18 Nov 2013 04:12:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCo-0005mY-Jp for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:58 +0000 Received: from [85.158.143.35:2522] by server-2.bemta-4.messagelabs.com id D7/56-11386-9C399825; Mon, 18 Nov 2013 04:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384747976!3784661!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29020 invoked from network); 18 Nov 2013 04:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2013 04:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ViGCl-0005gB-Ut for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ViGCl-00041H-TJ for xen-changelog@lists.xensource.com; Mon, 18 Nov 2013 04:12:55 +0000 Date: Mon, 18 Nov 2013 04:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: eliminate has_arch_mmios() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2df9704ad1bb7484efded4fec9e81f13fab4e839 Author: Jan Beulich AuthorDate: Fri Nov 15 11:29:57 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 15 11:29:57 2013 +0100 x86: eliminate has_arch_mmios() ... as being generally insufficient: Either has_arch_pdevs() or cache_flush_permitted() should be used (in particular, it is insufficient to consider MMIO ranges alone - I/O port ranges have the same requirements if available to a guest). Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 79233938ab2a8f273fd5dcdbf8e8381b9eb3a461 master date: 2013-11-12 16:28:47 +0100 --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++---- xen/include/asm-x86/domain.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4cf503b..f066353 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1792,7 +1793,7 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) + if ( cache_flush_permitted(v->domain) ) { if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) { diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index eb8e577..3fc729c 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1973,7 +1974,7 @@ static void wbinvd_ipi(void *info) static void svm_wbinvd_intercept(void) { - if ( has_arch_mmios(current->domain) ) + if ( cache_flush_permitted(current->domain) ) on_each_cpu(wbinvd_ipi, NULL, 1); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 6052629..cb1d118 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -2160,10 +2161,7 @@ static void wbinvd_ipi(void *info) static void vmx_wbinvd_intercept(void) { - if ( !has_arch_mmios(current->domain) ) - return; - - if ( iommu_snoop ) + if ( !cache_flush_permitted(current->domain) || iommu_snoop ) return; if ( cpu_has_wbinvd_exiting ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 909f449..eaec0137 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -316,7 +316,6 @@ struct arch_domain } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) -#define has_arch_mmios(d) (!rangeset_is_empty((d)->iomem_caps)) #define gdt_ldt_pt_idx(v) \ ((v)->vcpu_id >> (PAGETABLE_ORDER - GDT_LDT_VCPU_SHIFT)) -- 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 Nov 19 02:44:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 02:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibIM-00076s-Tn; Tue, 19 Nov 2013 02:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibIL-00076n-A1 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:05 +0000 Received: from [85.158.143.35:38687] by server-1.bemta-4.messagelabs.com id D3/D5-02132-470DA825; Tue, 19 Nov 2013 02:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384829042!4047648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5794 invoked from network); 19 Nov 2013 02:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 02:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibII-0003F6-KC for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VibII-0000Cx-9l for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:02 +0000 Date: Tue, 19 Nov 2013 02:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d: fix TLB flushing in dma_pte_clear_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 290924756020b72170100a56843fbd36bc98709c Author: Jan Beulich AuthorDate: Mon Nov 18 14:00:34 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 14:00:34 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d master date: 2013-11-18 13:55:55 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 8c24c04..709778b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -663,7 +663,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); -- 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 Nov 19 02:44:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 02:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibIM-00076s-Tn; Tue, 19 Nov 2013 02:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibIL-00076n-A1 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:05 +0000 Received: from [85.158.143.35:38687] by server-1.bemta-4.messagelabs.com id D3/D5-02132-470DA825; Tue, 19 Nov 2013 02:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1384829042!4047648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5794 invoked from network); 19 Nov 2013 02:44:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 02:44:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VibII-0003F6-KC for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VibII-0000Cx-9l for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 02:44:02 +0000 Date: Tue, 19 Nov 2013 02:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] VT-d: fix TLB flushing in dma_pte_clear_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 290924756020b72170100a56843fbd36bc98709c Author: Jan Beulich AuthorDate: Mon Nov 18 14:00:34 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 14:00:34 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d master date: 2013-11-18 13:55:55 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 8c24c04..709778b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -663,7 +663,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); -- 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 Nov 19 16:44:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPI-0000ll-EU; Tue, 19 Nov 2013 16:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPG-0000l9-U1 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:07 +0000 Received: from [85.158.137.68:30967] by server-16.bemta-3.messagelabs.com id 29/D6-18787-6559B825; Tue, 19 Nov 2013 16:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384879444!1579500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8239 invoked from network); 19 Nov 2013 16:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPE-00050X-6x for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPD-0006dc-OK for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:03 +0000 Date: Tue, 19 Nov 2013 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested VMX: don't ignore mapping 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 e02b14e531a95399fc9d8647ec3cc6f310a7d455 Author: Jan Beulich AuthorDate: Mon Nov 18 09:39:01 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 09:39:01 2013 +0100 nested VMX: don't ignore mapping errors Rather than ignoring failures to map the virtual VMCS as well as MSR or I/O port bitmaps, convert those into failures of the respective instructions (avoiding to dereference NULL pointers). Ultimately such failures should be handled transparently (by using transient mappings when they actually need to be accessed, just like nested SVM does). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2647036..248e975 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -747,7 +747,7 @@ static void __clear_current_vvmcs(struct vcpu *v) __vmpclear(virt_to_maddr(nvcpu->nv_n2vmcx)); } -static void __map_msr_bitmap(struct vcpu *v) +static bool_t __must_check _map_msr_bitmap(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -756,9 +756,11 @@ static void __map_msr_bitmap(struct vcpu *v) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->msrbitmap != NULL; } -static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) +static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -769,12 +771,14 @@ static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->iobitmap[index] != NULL; } -static inline void map_io_bitmap_all(struct vcpu *v) +static inline bool_t __must_check map_io_bitmap_all(struct vcpu *v) { - __map_io_bitmap (v, IO_BITMAP_A); - __map_io_bitmap (v, IO_BITMAP_B); + return _map_io_bitmap(v, IO_BITMAP_A) && + _map_io_bitmap(v, IO_BITMAP_B); } static void nvmx_purge_vvmcs(struct vcpu *v) @@ -1610,9 +1614,15 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - nvcpu->nv_vvmcxaddr = gpa; - map_io_bitmap_all (v); - __map_msr_bitmap(v); + if ( nvcpu->nv_vvmcx ) + nvcpu->nv_vvmcxaddr = gpa; + if ( !nvcpu->nv_vvmcx || + !map_io_bitmap_all(v) || + !_map_msr_bitmap(v) ) + { + vmreturn(regs, VMFAIL_VALID); + goto out; + } } if ( cpu_has_vmx_vmcs_shadowing ) @@ -1724,6 +1734,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; + bool_t okay = 1; if ( decode_vmx_inst(regs, &decode, &operand, 0) != X86EMUL_OKAY ) @@ -1732,16 +1743,21 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) vmcs_encoding = reg_read(regs, decode.reg2); __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); - if ( vmcs_encoding == IO_BITMAP_A || vmcs_encoding == IO_BITMAP_A_HIGH ) - __map_io_bitmap (v, IO_BITMAP_A); - else if ( vmcs_encoding == IO_BITMAP_B || - vmcs_encoding == IO_BITMAP_B_HIGH ) - __map_io_bitmap (v, IO_BITMAP_B); + switch ( vmcs_encoding ) + { + case IO_BITMAP_A: case IO_BITMAP_A_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_A); + break; + case IO_BITMAP_B: case IO_BITMAP_B_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_B); + break; + case MSR_BITMAP: case MSR_BITMAP_HIGH: + okay = _map_msr_bitmap(v); + break; + } - if ( vmcs_encoding == MSR_BITMAP || vmcs_encoding == MSR_BITMAP_HIGH ) - __map_msr_bitmap(v); + vmreturn(regs, okay ? VMSUCCEED : VMFAIL_VALID); - vmreturn(regs, VMSUCCEED); return X86EMUL_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 Nov 19 16:44:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPI-0000ll-EU; Tue, 19 Nov 2013 16:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPG-0000l9-U1 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:07 +0000 Received: from [85.158.137.68:30967] by server-16.bemta-3.messagelabs.com id 29/D6-18787-6559B825; Tue, 19 Nov 2013 16:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1384879444!1579500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8239 invoked from network); 19 Nov 2013 16:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPE-00050X-6x for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPD-0006dc-OK for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:03 +0000 Date: Tue, 19 Nov 2013 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] nested VMX: don't ignore mapping 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 e02b14e531a95399fc9d8647ec3cc6f310a7d455 Author: Jan Beulich AuthorDate: Mon Nov 18 09:39:01 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 09:39:01 2013 +0100 nested VMX: don't ignore mapping errors Rather than ignoring failures to map the virtual VMCS as well as MSR or I/O port bitmaps, convert those into failures of the respective instructions (avoiding to dereference NULL pointers). Ultimately such failures should be handled transparently (by using transient mappings when they actually need to be accessed, just like nested SVM does). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2647036..248e975 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -747,7 +747,7 @@ static void __clear_current_vvmcs(struct vcpu *v) __vmpclear(virt_to_maddr(nvcpu->nv_n2vmcx)); } -static void __map_msr_bitmap(struct vcpu *v) +static bool_t __must_check _map_msr_bitmap(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -756,9 +756,11 @@ static void __map_msr_bitmap(struct vcpu *v) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->msrbitmap != NULL; } -static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) +static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -769,12 +771,14 @@ static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->iobitmap[index] != NULL; } -static inline void map_io_bitmap_all(struct vcpu *v) +static inline bool_t __must_check map_io_bitmap_all(struct vcpu *v) { - __map_io_bitmap (v, IO_BITMAP_A); - __map_io_bitmap (v, IO_BITMAP_B); + return _map_io_bitmap(v, IO_BITMAP_A) && + _map_io_bitmap(v, IO_BITMAP_B); } static void nvmx_purge_vvmcs(struct vcpu *v) @@ -1610,9 +1614,15 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - nvcpu->nv_vvmcxaddr = gpa; - map_io_bitmap_all (v); - __map_msr_bitmap(v); + if ( nvcpu->nv_vvmcx ) + nvcpu->nv_vvmcxaddr = gpa; + if ( !nvcpu->nv_vvmcx || + !map_io_bitmap_all(v) || + !_map_msr_bitmap(v) ) + { + vmreturn(regs, VMFAIL_VALID); + goto out; + } } if ( cpu_has_vmx_vmcs_shadowing ) @@ -1724,6 +1734,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; + bool_t okay = 1; if ( decode_vmx_inst(regs, &decode, &operand, 0) != X86EMUL_OKAY ) @@ -1732,16 +1743,21 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) vmcs_encoding = reg_read(regs, decode.reg2); __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); - if ( vmcs_encoding == IO_BITMAP_A || vmcs_encoding == IO_BITMAP_A_HIGH ) - __map_io_bitmap (v, IO_BITMAP_A); - else if ( vmcs_encoding == IO_BITMAP_B || - vmcs_encoding == IO_BITMAP_B_HIGH ) - __map_io_bitmap (v, IO_BITMAP_B); + switch ( vmcs_encoding ) + { + case IO_BITMAP_A: case IO_BITMAP_A_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_A); + break; + case IO_BITMAP_B: case IO_BITMAP_B_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_B); + break; + case MSR_BITMAP: case MSR_BITMAP_HIGH: + okay = _map_msr_bitmap(v); + break; + } - if ( vmcs_encoding == MSR_BITMAP || vmcs_encoding == MSR_BITMAP_HIGH ) - __map_msr_bitmap(v); + vmreturn(regs, okay ? VMSUCCEED : VMFAIL_VALID); - vmreturn(regs, VMSUCCEED); return X86EMUL_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 Nov 19 16:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPc-0000q4-IC; Tue, 19 Nov 2013 16:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPb-0000pl-Pl for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:28 +0000 Received: from [85.158.137.68:36576] by server-8.bemta-3.messagelabs.com id BA/19-06638-B659B825; Tue, 19 Nov 2013 16:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1384879465!2505515!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13104 invoked from network); 19 Nov 2013 16:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPY-00050k-VM for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPY-0006eN-Sk for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:24 +0000 Date: Tue, 19 Nov 2013 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: consider modules when cutting off 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 a5db2c7aab7a638d84f22ac8fe5089d81175438b Author: Jan Beulich AuthorDate: Mon Nov 18 13:57:20 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:57:20 2013 +0100 x86: consider modules when cutting off memory The code in question runs after module ranges got already removed from the E820 table, so when determining the new maximum page/PDX we need to explicitly take them into account. Furthermore we need to round up the ending addresses here, in order to fully cover eventual partial trailing pages. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/setup.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5bf4ee0..e33c34b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1013,9 +1013,17 @@ void __init __start_xen(unsigned long mbi_p) ASSERT(j); } map_e = boot_e820.map[j].addr + boot_e820.map[j].size; - if ( (map_e >> PAGE_SHIFT) < max_page ) + for ( j = 0; j < mbi->mods_count; ++j ) { - max_page = map_e >> PAGE_SHIFT; + uint64_t end = pfn_to_paddr(mod[j].mod_start) + + mod[j].mod_end; + + if ( map_e < end ) + map_e = end; + } + if ( PFN_UP(map_e) < max_page ) + { + max_page = PFN_UP(map_e); max_pdx = pfn_to_pdx(max_page - 1) + 1; } printk(XENLOG_WARNING "Ignoring inaccessible memory range" -- generated by git-patchbot for /home/xen/git/xen.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 Nov 19 16:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPc-0000q4-IC; Tue, 19 Nov 2013 16:44:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPb-0000pl-Pl for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:28 +0000 Received: from [85.158.137.68:36576] by server-8.bemta-3.messagelabs.com id BA/19-06638-B659B825; Tue, 19 Nov 2013 16:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1384879465!2505515!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13104 invoked from network); 19 Nov 2013 16:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPY-00050k-VM for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPY-0006eN-Sk for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:24 +0000 Date: Tue, 19 Nov 2013 16:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: consider modules when cutting off 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 a5db2c7aab7a638d84f22ac8fe5089d81175438b Author: Jan Beulich AuthorDate: Mon Nov 18 13:57:20 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:57:20 2013 +0100 x86: consider modules when cutting off memory The code in question runs after module ranges got already removed from the E820 table, so when determining the new maximum page/PDX we need to explicitly take them into account. Furthermore we need to round up the ending addresses here, in order to fully cover eventual partial trailing pages. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/setup.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5bf4ee0..e33c34b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1013,9 +1013,17 @@ void __init __start_xen(unsigned long mbi_p) ASSERT(j); } map_e = boot_e820.map[j].addr + boot_e820.map[j].size; - if ( (map_e >> PAGE_SHIFT) < max_page ) + for ( j = 0; j < mbi->mods_count; ++j ) { - max_page = map_e >> PAGE_SHIFT; + uint64_t end = pfn_to_paddr(mod[j].mod_start) + + mod[j].mod_end; + + if ( map_e < end ) + map_e = end; + } + if ( PFN_UP(map_e) < max_page ) + { + max_page = PFN_UP(map_e); max_pdx = pfn_to_pdx(max_page - 1) + 1; } printk(XENLOG_WARNING "Ignoring inaccessible memory range" -- generated by git-patchbot for /home/xen/git/xen.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 Nov 19 16:44:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPn-0000sl-Kw; Tue, 19 Nov 2013 16: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 1VioPm-0000sE-2R for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:38 +0000 Received: from [85.158.143.35:43492] by server-3.bemta-4.messagelabs.com id 98/8E-32360-5759B825; Tue, 19 Nov 2013 16:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384879475!4260765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18837 invoked from network); 19 Nov 2013 16:44:36 -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; 19 Nov 2013 16:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPj-00050t-8N for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPj-0006g0-38 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:35 +0000 Date: Tue, 19 Nov 2013 16:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: create a local xenstore libxl and device-model dir for 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: multipart/mixed; boundary="===============0364619812497330430==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0364619812497330430== Content-Type: text/plain commit d1cb516db2155e4967a8c805425d3ae560713e28 Author: Roger Pau Monne AuthorDate: Wed Sep 18 12:42:47 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:42 2013 +0000 libxl: create a local xenstore libxl and device-model dir for guests If libxl is executed inside a guest domain it needs write access to the local libxl xenstore dir (/local//libxl) to store internal data. This also applies to Qemu which needs a /local//device-model xenstore directory. This patch creates the mentioned directories for each guest launched from libxl. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- docs/man/xl.cfg.pod.5 | 5 +++++ docs/misc/xenstore-paths.markdown | 10 ++++++++++ tools/libxl/libxl.h | 9 +++++++++ tools/libxl/libxl_create.c | 17 +++++++++++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 2 ++ 6 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index e6fc83f..3b227b7 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -307,6 +307,11 @@ which are incompatible with migration. Currently this is limited to enabling the invariant TSC feature flag in cpuid results when TSC is not emulated. +=item B + +Specify that this domain is a driver domain. This enables certain +features needed in order to run a driver domain. + =back =head2 Devices diff --git a/docs/misc/xenstore-paths.markdown b/docs/misc/xenstore-paths.markdown index 1c634b5..a0fc003 100644 --- a/docs/misc/xenstore-paths.markdown +++ b/docs/misc/xenstore-paths.markdown @@ -318,6 +318,16 @@ protocol definition. A domain writable path. Available for arbitrary domain use. +### Paths private to the toolstack + +#### ~/device-model/$DOMID/state [w] + +Contains the status of the device models running on the domain. + +#### ~/libxl/$DOMID/qdisk-backend-pid [w] + +Contains the PIDs of the device models running on the domain. + ## Virtual Machine Paths The /vm/$UUID namespace is used by toolstacks to store various diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c7dceda..18dd420 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -375,6 +375,15 @@ */ #define LIBXL_HAVE_CREATEINFO_PVH 1 +/* + * LIBXL_HAVE_DRIVER_DOMAIN_CREATION 1 + * + * If this is defined, libxl_domain_create_info contains a driver_domain + * field that can be used to tell libxl that the domain that is going + * to be created is a driver domain, so the necessary actions are taken. + */ +#define LIBXL_HAVE_DRIVER_DOMAIN_CREATION 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 5e9cdcc..fe7ba0d 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -39,6 +39,7 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, } libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); + libxl_defbool_setdefault(&c_info->driver_domain, false); return 0; } @@ -546,6 +547,22 @@ retry_transaction: libxl__xs_mkdir(gc, t, libxl__sprintf(gc, "%s/data", dom_path), rwperm, ARRAY_SIZE(rwperm)); + + if (libxl_defbool_val(info->driver_domain)) { + /* + * Create a local "libxl" directory for each guest, since we might want + * to use libxl from inside the guest + */ + libxl__xs_mkdir(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, + ARRAY_SIZE(rwperm)); + /* + * Create a local "device-model" directory for each guest, since we + * might want to use Qemu from inside the guest + */ + libxl__xs_mkdir(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, + ARRAY_SIZE(rwperm)); + } + if (info->type == LIBXL_DOMAIN_TYPE_HVM) libxl__xs_mkdir(gc, t, libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de5bac3..cba8eff 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -275,6 +275,7 @@ libxl_domain_create_info = Struct("domain_create_info",[ ("poolid", uint32), ("run_hotplug_scripts",libxl_defbool), ("pvh", libxl_defbool), + ("driver_domain",libxl_defbool), ], dir=DIR_IN) libxl_domain_restore_params = Struct("domain_restore_params", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8690ec7..1928424 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -849,6 +849,8 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long(config, "max_event_channels", &l, 0)) b_info->event_channels = l; + xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 0); + switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0364619812497330430== 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 --===============0364619812497330430==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:44:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPn-0000sl-Kw; Tue, 19 Nov 2013 16: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 1VioPm-0000sE-2R for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:38 +0000 Received: from [85.158.143.35:43492] by server-3.bemta-4.messagelabs.com id 98/8E-32360-5759B825; Tue, 19 Nov 2013 16:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384879475!4260765!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18837 invoked from network); 19 Nov 2013 16:44:36 -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; 19 Nov 2013 16:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPj-00050t-8N for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPj-0006g0-38 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:35 +0000 Date: Tue, 19 Nov 2013 16:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: create a local xenstore libxl and device-model dir for 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: multipart/mixed; boundary="===============0364619812497330430==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0364619812497330430== Content-Type: text/plain commit d1cb516db2155e4967a8c805425d3ae560713e28 Author: Roger Pau Monne AuthorDate: Wed Sep 18 12:42:47 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:42 2013 +0000 libxl: create a local xenstore libxl and device-model dir for guests If libxl is executed inside a guest domain it needs write access to the local libxl xenstore dir (/local//libxl) to store internal data. This also applies to Qemu which needs a /local//device-model xenstore directory. This patch creates the mentioned directories for each guest launched from libxl. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- docs/man/xl.cfg.pod.5 | 5 +++++ docs/misc/xenstore-paths.markdown | 10 ++++++++++ tools/libxl/libxl.h | 9 +++++++++ tools/libxl/libxl_create.c | 17 +++++++++++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 2 ++ 6 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index e6fc83f..3b227b7 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -307,6 +307,11 @@ which are incompatible with migration. Currently this is limited to enabling the invariant TSC feature flag in cpuid results when TSC is not emulated. +=item B + +Specify that this domain is a driver domain. This enables certain +features needed in order to run a driver domain. + =back =head2 Devices diff --git a/docs/misc/xenstore-paths.markdown b/docs/misc/xenstore-paths.markdown index 1c634b5..a0fc003 100644 --- a/docs/misc/xenstore-paths.markdown +++ b/docs/misc/xenstore-paths.markdown @@ -318,6 +318,16 @@ protocol definition. A domain writable path. Available for arbitrary domain use. +### Paths private to the toolstack + +#### ~/device-model/$DOMID/state [w] + +Contains the status of the device models running on the domain. + +#### ~/libxl/$DOMID/qdisk-backend-pid [w] + +Contains the PIDs of the device models running on the domain. + ## Virtual Machine Paths The /vm/$UUID namespace is used by toolstacks to store various diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c7dceda..18dd420 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -375,6 +375,15 @@ */ #define LIBXL_HAVE_CREATEINFO_PVH 1 +/* + * LIBXL_HAVE_DRIVER_DOMAIN_CREATION 1 + * + * If this is defined, libxl_domain_create_info contains a driver_domain + * field that can be used to tell libxl that the domain that is going + * to be created is a driver domain, so the necessary actions are taken. + */ +#define LIBXL_HAVE_DRIVER_DOMAIN_CREATION 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 5e9cdcc..fe7ba0d 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -39,6 +39,7 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, } libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); + libxl_defbool_setdefault(&c_info->driver_domain, false); return 0; } @@ -546,6 +547,22 @@ retry_transaction: libxl__xs_mkdir(gc, t, libxl__sprintf(gc, "%s/data", dom_path), rwperm, ARRAY_SIZE(rwperm)); + + if (libxl_defbool_val(info->driver_domain)) { + /* + * Create a local "libxl" directory for each guest, since we might want + * to use libxl from inside the guest + */ + libxl__xs_mkdir(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, + ARRAY_SIZE(rwperm)); + /* + * Create a local "device-model" directory for each guest, since we + * might want to use Qemu from inside the guest + */ + libxl__xs_mkdir(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, + ARRAY_SIZE(rwperm)); + } + if (info->type == LIBXL_DOMAIN_TYPE_HVM) libxl__xs_mkdir(gc, t, libxl__sprintf(gc, "%s/hvmloader/generation-id-address", dom_path), diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de5bac3..cba8eff 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -275,6 +275,7 @@ libxl_domain_create_info = Struct("domain_create_info",[ ("poolid", uint32), ("run_hotplug_scripts",libxl_defbool), ("pvh", libxl_defbool), + ("driver_domain",libxl_defbool), ], dir=DIR_IN) libxl_domain_restore_params = Struct("domain_restore_params", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8690ec7..1928424 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -849,6 +849,8 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long(config, "max_event_channels", &l, 0)) b_info->event_channels = l; + xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 0); + switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0364619812497330430== 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 --===============0364619812497330430==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:44:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPw-0000v6-PO; Tue, 19 Nov 2013 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPv-0000uh-Tw for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:48 +0000 Received: from [85.158.139.211:35657] by server-9.bemta-5.messagelabs.com id 0E/A6-15098-F759B825; Tue, 19 Nov 2013 16:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384879485!2934679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3233 invoked from network); 19 Nov 2013 16:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPt-000512-Et for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPt-0006gM-C5 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:45 +0000 Date: Tue, 19 Nov 2013 16:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't remove device frontend path from driver 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: multipart/mixed; boundary="===============9116928076176113405==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============9116928076176113405== Content-Type: text/plain commit 51e20c55808cfe3e51b45f6ff2a45775170fa5e4 Author: Roger Pau Monne AuthorDate: Wed Sep 18 13:15:14 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:49 2013 +0000 libxl: don't remove device frontend path from driver domains A domain different than LIBXL_TOOLSTACK_DOMID should not try to remove the frontend paths of a device. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index cce9e32..d5f23cf 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -551,6 +551,10 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) const char *tapdisk_params; xs_transaction_t t = 0; int rc; + uint32_t domid; + + rc = libxl__get_domid(gc, &domid); + if (rc) goto out; for (;;) { rc = libxl__xs_transaction_start(gc, &t); @@ -560,8 +564,20 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) rc = libxl__xs_read_checked(gc, t, tapdisk_path, &tapdisk_params); if (rc) goto out; - libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); + if (domid == LIBXL_TOOLSTACK_DOMID) { + /* + * The toolstack domain is in charge for removing both the + * frontend and the backend path + */ + libxl__xs_path_cleanup(gc, t, fe_path); + libxl__xs_path_cleanup(gc, t, be_path); + } else if (dev->backend_domid == domid) { + /* + * The driver domain is in charge for removing what it can + * from the backend path + */ + libxl__xs_path_cleanup(gc, t, be_path); + } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============9116928076176113405== 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 --===============9116928076176113405==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:44:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPw-0000v6-PO; Tue, 19 Nov 2013 16:44:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPv-0000uh-Tw for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:48 +0000 Received: from [85.158.139.211:35657] by server-9.bemta-5.messagelabs.com id 0E/A6-15098-F759B825; Tue, 19 Nov 2013 16:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1384879485!2934679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3233 invoked from network); 19 Nov 2013 16:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPt-000512-Et for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPt-0006gM-C5 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:45 +0000 Date: Tue, 19 Nov 2013 16:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't remove device frontend path from driver 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: multipart/mixed; boundary="===============9116928076176113405==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============9116928076176113405== Content-Type: text/plain commit 51e20c55808cfe3e51b45f6ff2a45775170fa5e4 Author: Roger Pau Monne AuthorDate: Wed Sep 18 13:15:14 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:49 2013 +0000 libxl: don't remove device frontend path from driver domains A domain different than LIBXL_TOOLSTACK_DOMID should not try to remove the frontend paths of a device. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index cce9e32..d5f23cf 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -551,6 +551,10 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) const char *tapdisk_params; xs_transaction_t t = 0; int rc; + uint32_t domid; + + rc = libxl__get_domid(gc, &domid); + if (rc) goto out; for (;;) { rc = libxl__xs_transaction_start(gc, &t); @@ -560,8 +564,20 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) rc = libxl__xs_read_checked(gc, t, tapdisk_path, &tapdisk_params); if (rc) goto out; - libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); + if (domid == LIBXL_TOOLSTACK_DOMID) { + /* + * The toolstack domain is in charge for removing both the + * frontend and the backend path + */ + libxl__xs_path_cleanup(gc, t, fe_path); + libxl__xs_path_cleanup(gc, t, be_path); + } else if (dev->backend_domid == domid) { + /* + * The driver domain is in charge for removing what it can + * from the backend path + */ + libxl__xs_path_cleanup(gc, t, be_path); + } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============9116928076176113405== 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 --===============9116928076176113405==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ7-0000xb-W4; Tue, 19 Nov 2013 16:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ6-0000xF-EI for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:58 +0000 Received: from [85.158.137.68:49094] by server-15.bemta-3.messagelabs.com id 91/45-10403-9859B825; Tue, 19 Nov 2013 16:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384879495!2477255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26990 invoked from network); 19 Nov 2013 16:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ3-00051B-KP for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQ3-0006hI-Is for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:55 +0000 Date: Tue, 19 Nov 2013 16:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: synchronize device removal when using driver 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: multipart/mixed; boundary="===============5467342386810503886==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5467342386810503886== Content-Type: text/plain commit f36df037ba8813207275b7094966436fcbb30060 Author: Roger Pau Monne AuthorDate: Fri Sep 27 11:37:04 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:56 2013 +0000 libxl: synchronize device removal when using driver domains Synchronize the clean up of the backend from the toolstack domain when the driver domain has actually finished closing the backend for the device. This is accomplished by waiting for the driver domain to remove the directory containing the backend keys, then the toolstack domain will finish the cleanup by removing the empty folders on the backend path. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 80 ++++++++++++++++++++++++++++++++++++++++- tools/libxl/libxl_internal.h | 2 + 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index d5f23cf..b7168d4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -432,6 +432,11 @@ void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) aodev->num_exec = 0; /* Initialize timer for QEMU Bodge and hotplug execution */ libxl__ev_time_init(&aodev->timeout); + /* + * Initialize xs_watch, because it's not used on all possible + * execution paths, but it's unconditionally destroyed when finished. + */ + libxl__ev_xswatch_init(&aodev->xs_watch); aodev->active = 1; /* We init this here because we might call device_hotplug_done * without actually calling any hotplug script */ @@ -709,6 +714,14 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); +static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_destroy_be_watch_cb(libxl__egc *egc, + libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path); + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev); @@ -768,6 +781,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, LOG(ERROR, "unable to get info for domain %d", domid); goto out; } + if (QEMU_BACKEND(aodev->dev) && (info.paused || info.dying || info.shutdown)) { /* @@ -919,8 +933,28 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) */ rc = libxl__get_domid(gc, &domid); if (rc) goto out; - if (aodev->dev->backend_domid != domid) - goto out; + if (aodev->dev->backend_domid != domid) { + if (aodev->action != LIBXL__DEVICE_ACTION_REMOVE) + goto out; + + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_destroy_be_timeout_cb, + LIBXL_DESTROY_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "setup of xs watch timeout failed"); + goto out; + } + + rc = libxl__ev_xswatch_register(gc, &aodev->xs_watch, + device_destroy_be_watch_cb, + be_path); + if (rc) { + LOG(ERROR, "setup of xs watch for %s failed", be_path); + libxl__ev_time_deregister(gc, &aodev->timeout); + goto out; + } + return; + } /* Check if we have to execute hotplug scripts for this device * and return the necessary args/env vars for execution */ @@ -1038,6 +1072,47 @@ error: device_hotplug_done(egc, aodev); } +static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + + LOG(ERROR, "timed out while waiting for %s to be removed", + libxl__device_backend_path(gc, aodev->dev)); + + aodev->rc = ERROR_TIMEDOUT; + + device_hotplug_done(egc, aodev); + return; +} + +static void device_destroy_be_watch_cb(libxl__egc *egc, + libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path) +{ + libxl__ao_device *aodev = CONTAINER_OF(watch, *aodev, xs_watch); + STATE_AO_GC(aodev->ao); + const char *dir; + int rc; + + rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &dir); + if (rc) { + LOG(ERROR, "unable to read backend path: %s", watch_path); + aodev->rc = rc; + goto out; + } + if (dir) { + /* backend path still exists, wait a little longer... */ + return; + } + +out: + /* We are done, backend path no longer exists */ + device_hotplug_done(egc, aodev); +} + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -1060,6 +1135,7 @@ static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) { /* Clean events and check reentrancy */ libxl__ev_time_deregister(gc, &aodev->timeout); + libxl__ev_xswatch_deregister(gc, &aodev->xs_watch); assert(!libxl__ev_child_inuse(&aodev->child)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 23ff265..e3b9fb4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1928,6 +1928,8 @@ struct libxl__ao_device { libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ libxl__ev_time timeout; + /* xenstore watch for backend path of driver domains */ + libxl__ev_xswatch xs_watch; /* device hotplug execution */ const char *what; int num_exec; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5467342386810503886== 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 --===============5467342386810503886==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ7-0000xb-W4; Tue, 19 Nov 2013 16:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ6-0000xF-EI for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:58 +0000 Received: from [85.158.137.68:49094] by server-15.bemta-3.messagelabs.com id 91/45-10403-9859B825; Tue, 19 Nov 2013 16:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1384879495!2477255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26990 invoked from network); 19 Nov 2013 16:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQ3-00051B-KP for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQ3-0006hI-Is for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:55 +0000 Date: Tue, 19 Nov 2013 16:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: synchronize device removal when using driver 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: multipart/mixed; boundary="===============5467342386810503886==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5467342386810503886== Content-Type: text/plain commit f36df037ba8813207275b7094966436fcbb30060 Author: Roger Pau Monne AuthorDate: Fri Sep 27 11:37:04 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:08:56 2013 +0000 libxl: synchronize device removal when using driver domains Synchronize the clean up of the backend from the toolstack domain when the driver domain has actually finished closing the backend for the device. This is accomplished by waiting for the driver domain to remove the directory containing the backend keys, then the toolstack domain will finish the cleanup by removing the empty folders on the backend path. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 80 ++++++++++++++++++++++++++++++++++++++++- tools/libxl/libxl_internal.h | 2 + 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index d5f23cf..b7168d4 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -432,6 +432,11 @@ void libxl__prepare_ao_device(libxl__ao *ao, libxl__ao_device *aodev) aodev->num_exec = 0; /* Initialize timer for QEMU Bodge and hotplug execution */ libxl__ev_time_init(&aodev->timeout); + /* + * Initialize xs_watch, because it's not used on all possible + * execution paths, but it's unconditionally destroyed when finished. + */ + libxl__ev_xswatch_init(&aodev->xs_watch); aodev->active = 1; /* We init this here because we might call device_hotplug_done * without actually calling any hotplug script */ @@ -709,6 +714,14 @@ static void device_hotplug_child_death_cb(libxl__egc *egc, libxl__ev_child *child, pid_t pid, int status); +static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void device_destroy_be_watch_cb(libxl__egc *egc, + libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path); + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev); static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev); @@ -768,6 +781,7 @@ void libxl__initiate_device_remove(libxl__egc *egc, LOG(ERROR, "unable to get info for domain %d", domid); goto out; } + if (QEMU_BACKEND(aodev->dev) && (info.paused || info.dying || info.shutdown)) { /* @@ -919,8 +933,28 @@ static void device_hotplug(libxl__egc *egc, libxl__ao_device *aodev) */ rc = libxl__get_domid(gc, &domid); if (rc) goto out; - if (aodev->dev->backend_domid != domid) - goto out; + if (aodev->dev->backend_domid != domid) { + if (aodev->action != LIBXL__DEVICE_ACTION_REMOVE) + goto out; + + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_destroy_be_timeout_cb, + LIBXL_DESTROY_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "setup of xs watch timeout failed"); + goto out; + } + + rc = libxl__ev_xswatch_register(gc, &aodev->xs_watch, + device_destroy_be_watch_cb, + be_path); + if (rc) { + LOG(ERROR, "setup of xs watch for %s failed", be_path); + libxl__ev_time_deregister(gc, &aodev->timeout); + goto out; + } + return; + } /* Check if we have to execute hotplug scripts for this device * and return the necessary args/env vars for execution */ @@ -1038,6 +1072,47 @@ error: device_hotplug_done(egc, aodev); } +static void device_destroy_be_timeout_cb(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs) +{ + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + STATE_AO_GC(aodev->ao); + + LOG(ERROR, "timed out while waiting for %s to be removed", + libxl__device_backend_path(gc, aodev->dev)); + + aodev->rc = ERROR_TIMEDOUT; + + device_hotplug_done(egc, aodev); + return; +} + +static void device_destroy_be_watch_cb(libxl__egc *egc, + libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path) +{ + libxl__ao_device *aodev = CONTAINER_OF(watch, *aodev, xs_watch); + STATE_AO_GC(aodev->ao); + const char *dir; + int rc; + + rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &dir); + if (rc) { + LOG(ERROR, "unable to read backend path: %s", watch_path); + aodev->rc = rc; + goto out; + } + if (dir) { + /* backend path still exists, wait a little longer... */ + return; + } + +out: + /* We are done, backend path no longer exists */ + device_hotplug_done(egc, aodev); +} + static void device_hotplug_done(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); @@ -1060,6 +1135,7 @@ static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) { /* Clean events and check reentrancy */ libxl__ev_time_deregister(gc, &aodev->timeout); + libxl__ev_xswatch_deregister(gc, &aodev->xs_watch); assert(!libxl__ev_child_inuse(&aodev->child)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 23ff265..e3b9fb4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1928,6 +1928,8 @@ struct libxl__ao_device { libxl__ev_devstate backend_ds; /* Bodge for Qemu devices, also used for timeout of hotplug execution */ libxl__ev_time timeout; + /* xenstore watch for backend path of driver domains */ + libxl__ev_xswatch xs_watch; /* device hotplug execution */ const char *what; int num_exec; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5467342386810503886== 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 --===============5467342386810503886==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQN-00011J-9a; Tue, 19 Nov 2013 16:45:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQL-00010i-Jh for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:13 +0000 Received: from [193.109.254.147:35161] by server-12.bemta-14.messagelabs.com id 43/F3-25062-8959B825; Tue, 19 Nov 2013 16:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384879511!3741702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7404 invoked from network); 19 Nov 2013 16:45:12 -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; 19 Nov 2013 16:45:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQD-00052A-SK for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQD-0006hs-Oc for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:05 +0000 Date: Tue, 19 Nov 2013 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove the Qemu bodge for driver domain 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: multipart/mixed; boundary="===============5995288194989512345==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5995288194989512345== Content-Type: text/plain commit f39b1af257e32108fa356ee8c20313a221e31983 Author: Roger Pau Monne AuthorDate: Wed Sep 18 17:35:00 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:01 2013 +0000 libxl: remove the Qemu bodge for driver domain devices When Qemu is launched from a driver domain to act as a PV disk backend we can make sure that Qemu is running before detaching devices, so there's no need for the bodge there. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 69 ++++++++++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index b7168d4..d995c83 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -772,31 +772,38 @@ void libxl__initiate_device_remove(libxl__egc *egc, char *online_path = GCSPRINTF("%s/online", be_path); const char *state; libxl_dominfo info; - uint32_t domid = aodev->dev->domid; + uint32_t my_domid, domid = aodev->dev->domid; int rc = 0; - libxl_dominfo_init(&info); - rc = libxl_domain_info(CTX, &info, domid); + rc = libxl__get_domid(gc, &my_domid); if (rc) { - LOG(ERROR, "unable to get info for domain %d", domid); + LOG(ERROR, "unable to get my domid"); goto out; } - if (QEMU_BACKEND(aodev->dev) && - (info.paused || info.dying || info.shutdown)) { - /* - * TODO: 4.2 Bodge due to QEMU, see comment on top of - * libxl__initiate_device_remove in libxl_internal.h - */ - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, - device_qemu_timeout, - LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (my_domid == LIBXL_TOOLSTACK_DOMID) { + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); if (rc) { - LOG(ERROR, "unable to register timeout for Qemu device %s", - be_path); + LOG(ERROR, "unable to get info for domain %d", domid); goto out; } - return; + if (QEMU_BACKEND(aodev->dev) && + (info.paused || info.dying || info.shutdown)) { + /* + * TODO: 4.2 Bodge due to QEMU, see comment on top of + * libxl__initiate_device_remove in libxl_internal.h + */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_qemu_timeout, + LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for Qemu device %s", + be_path); + goto out; + } + return; + } } for (;;) { @@ -865,17 +872,43 @@ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = GCSPRINTF("%s/state", be_path); + const char *xs_state; + xs_transaction_t t = 0; int rc = 0; libxl__ev_time_deregister(gc, &aodev->timeout); - rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); - if (rc) goto out; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) { + LOG(ERROR, "unable to start transaction"); + goto out; + } + + /* + * Check that the state path exists and is actually different than + * 6 before unconditionally setting it. If Qemu runs on a driver + * domain it is possible that the driver domain has already cleaned + * the backend path if the device has reached state 6. + */ + rc = libxl__xs_read_checked(gc, XBT_NULL, state_path, &xs_state); + if (rc) goto out; + + if (xs_state && atoi(xs_state) != XenbusStateClosed) { + rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); + if (rc) goto out; + } + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } device_hotplug(egc, aodev); return; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; device_hotplug_done(egc, aodev); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5995288194989512345== 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 --===============5995288194989512345==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:15 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQN-00011J-9a; Tue, 19 Nov 2013 16:45:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQL-00010i-Jh for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:13 +0000 Received: from [193.109.254.147:35161] by server-12.bemta-14.messagelabs.com id 43/F3-25062-8959B825; Tue, 19 Nov 2013 16:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384879511!3741702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7404 invoked from network); 19 Nov 2013 16:45:12 -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; 19 Nov 2013 16:45:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQD-00052A-SK for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQD-0006hs-Oc for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:05 +0000 Date: Tue, 19 Nov 2013 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove the Qemu bodge for driver domain 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: multipart/mixed; boundary="===============5995288194989512345==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5995288194989512345== Content-Type: text/plain commit f39b1af257e32108fa356ee8c20313a221e31983 Author: Roger Pau Monne AuthorDate: Wed Sep 18 17:35:00 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:01 2013 +0000 libxl: remove the Qemu bodge for driver domain devices When Qemu is launched from a driver domain to act as a PV disk backend we can make sure that Qemu is running before detaching devices, so there's no need for the bodge there. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_device.c | 69 ++++++++++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index b7168d4..d995c83 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -772,31 +772,38 @@ void libxl__initiate_device_remove(libxl__egc *egc, char *online_path = GCSPRINTF("%s/online", be_path); const char *state; libxl_dominfo info; - uint32_t domid = aodev->dev->domid; + uint32_t my_domid, domid = aodev->dev->domid; int rc = 0; - libxl_dominfo_init(&info); - rc = libxl_domain_info(CTX, &info, domid); + rc = libxl__get_domid(gc, &my_domid); if (rc) { - LOG(ERROR, "unable to get info for domain %d", domid); + LOG(ERROR, "unable to get my domid"); goto out; } - if (QEMU_BACKEND(aodev->dev) && - (info.paused || info.dying || info.shutdown)) { - /* - * TODO: 4.2 Bodge due to QEMU, see comment on top of - * libxl__initiate_device_remove in libxl_internal.h - */ - rc = libxl__ev_time_register_rel(gc, &aodev->timeout, - device_qemu_timeout, - LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (my_domid == LIBXL_TOOLSTACK_DOMID) { + libxl_dominfo_init(&info); + rc = libxl_domain_info(CTX, &info, domid); if (rc) { - LOG(ERROR, "unable to register timeout for Qemu device %s", - be_path); + LOG(ERROR, "unable to get info for domain %d", domid); goto out; } - return; + if (QEMU_BACKEND(aodev->dev) && + (info.paused || info.dying || info.shutdown)) { + /* + * TODO: 4.2 Bodge due to QEMU, see comment on top of + * libxl__initiate_device_remove in libxl_internal.h + */ + rc = libxl__ev_time_register_rel(gc, &aodev->timeout, + device_qemu_timeout, + LIBXL_QEMU_BODGE_TIMEOUT * 1000); + if (rc) { + LOG(ERROR, "unable to register timeout for Qemu device %s", + be_path); + goto out; + } + return; + } } for (;;) { @@ -865,17 +872,43 @@ static void device_qemu_timeout(libxl__egc *egc, libxl__ev_time *ev, STATE_AO_GC(aodev->ao); char *be_path = libxl__device_backend_path(gc, aodev->dev); char *state_path = GCSPRINTF("%s/state", be_path); + const char *xs_state; + xs_transaction_t t = 0; int rc = 0; libxl__ev_time_deregister(gc, &aodev->timeout); - rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); - if (rc) goto out; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) { + LOG(ERROR, "unable to start transaction"); + goto out; + } + + /* + * Check that the state path exists and is actually different than + * 6 before unconditionally setting it. If Qemu runs on a driver + * domain it is possible that the driver domain has already cleaned + * the backend path if the device has reached state 6. + */ + rc = libxl__xs_read_checked(gc, XBT_NULL, state_path, &xs_state); + if (rc) goto out; + + if (xs_state && atoi(xs_state) != XenbusStateClosed) { + rc = libxl__xs_write_checked(gc, XBT_NULL, state_path, "6"); + if (rc) goto out; + } + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } device_hotplug(egc, aodev); return; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; device_hotplug_done(egc, aodev); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5995288194989512345== 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 --===============5995288194989512345==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQW-000130-1T; Tue, 19 Nov 2013 16:45:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQT-00012K-45 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:22 +0000 Received: from [85.158.143.35:48882] by server-2.bemta-4.messagelabs.com id FB/21-11386-F959B825; Tue, 19 Nov 2013 16:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384879516!4260960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23875 invoked from network); 19 Nov 2013 16:45:17 -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; 19 Nov 2013 16:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQO-00052F-AC for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQO-0006iM-1m for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:16 +0000 Date: Tue, 19 Nov 2013 16:45:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't launch Qemu on Dom0 for Qdisk devices on driver 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: multipart/mixed; boundary="===============6052672509280336431==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6052672509280336431== Content-Type: text/plain commit 4b33540e8ce55acf19ec8c3f6706efaecdfd57ea Author: Roger Pau Monne AuthorDate: Thu Sep 19 11:17:45 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:07 2013 +0000 libxl: don't launch Qemu on Dom0 for Qdisk devices on driver domains In libxl__need_xenpv_qemu check that the backend domain of the Qdisk device is Dom0 before launching a Qemu instance in the toolstack domain. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 85a08af..b4798b8 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1354,6 +1354,7 @@ int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_disks, libxl_device_disk *disks) { int i, ret = 0; + uint32_t domid; /* * qemu is required in order to support 2 or more consoles. So switch all @@ -1379,8 +1380,11 @@ int libxl__need_xenpv_qemu(libxl__gc *gc, } if (nr_disks > 0) { + ret = libxl__get_domid(gc, &domid); + if (ret) goto out; for (i = 0; i < nr_disks; i++) { - if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) { + if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK && + disks[i].backend_domid == domid) { ret = 1; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6052672509280336431== 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 --===============6052672509280336431==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQW-000130-1T; Tue, 19 Nov 2013 16:45:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQT-00012K-45 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:22 +0000 Received: from [85.158.143.35:48882] by server-2.bemta-4.messagelabs.com id FB/21-11386-F959B825; Tue, 19 Nov 2013 16:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1384879516!4260960!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23875 invoked from network); 19 Nov 2013 16:45:17 -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; 19 Nov 2013 16:45:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQO-00052F-AC for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQO-0006iM-1m for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:16 +0000 Date: Tue, 19 Nov 2013 16:45:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't launch Qemu on Dom0 for Qdisk devices on driver 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: multipart/mixed; boundary="===============6052672509280336431==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6052672509280336431== Content-Type: text/plain commit 4b33540e8ce55acf19ec8c3f6706efaecdfd57ea Author: Roger Pau Monne AuthorDate: Thu Sep 19 11:17:45 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:07 2013 +0000 libxl: don't launch Qemu on Dom0 for Qdisk devices on driver domains In libxl__need_xenpv_qemu check that the backend domain of the Qdisk device is Dom0 before launching a Qemu instance in the toolstack domain. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 85a08af..b4798b8 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1354,6 +1354,7 @@ int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_disks, libxl_device_disk *disks) { int i, ret = 0; + uint32_t domid; /* * qemu is required in order to support 2 or more consoles. So switch all @@ -1379,8 +1380,11 @@ int libxl__need_xenpv_qemu(libxl__gc *gc, } if (nr_disks > 0) { + ret = libxl__get_domid(gc, &domid); + if (ret) goto out; for (i = 0; i < nr_disks; i++) { - if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) { + if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK && + disks[i].backend_domid == domid) { ret = 1; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6052672509280336431== 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 --===============6052672509280336431==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQe-000150-38; Tue, 19 Nov 2013 16:45:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQc-00014V-2H for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:30 +0000 Received: from [193.109.254.147:14688] by server-1.bemta-14.messagelabs.com id D2/B6-10312-9A59B825; Tue, 19 Nov 2013 16:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384879526!3741759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9009 invoked from network); 19 Nov 2013 16:45:27 -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; 19 Nov 2013 16:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQY-00052L-NB for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQY-0006io-EQ for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:26 +0000 Date: Tue, 19 Nov 2013 16:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add Qdisk backend launch helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7545830115315202590==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7545830115315202590== Content-Type: text/plain commit 5cf2bea385d1bdd409f06789220910876c0ab17d Author: Roger Pau Monne AuthorDate: Thu Sep 19 15:33:59 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:14 2013 +0000 libxl: add Qdisk backend launch helper Current Qemu launch functions in libxl require the usage of data structures only avaialbe on domain creation. All this information is not need in order to launch a Qemu instance to serve Qdisk backends, so introduce a new simplified helper that can be used to launch Qemu/Qdisk, that will be used to launch Qdisk in driver domains. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Cc: Anthony PERARD Cc: Stefano Stabellini Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 148 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl_internal.h | 6 ++ 2 files changed, 138 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b4798b8..292e351 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -42,6 +42,23 @@ static const char *qemu_xen_path(libxl__gc *gc) #endif } +static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) +{ + char *logfile; + int logfile_w; + + libxl_create_logfile(CTX, name, &logfile); + logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); + free(logfile); + + if (logfile_w < 0) { + LOGE(ERROR, "unable to open Qemu logfile"); + return ERROR_FAIL; + } + + return logfile_w; +} + const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *info) { @@ -1149,7 +1166,7 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); - char *path, *logfile; + char *path; int logfile_w, null; int rc; char **args, **arg; @@ -1204,11 +1221,12 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); - libxl_create_logfile(ctx, - libxl__sprintf(gc, "qemu-dm-%s", c_info->name), - &logfile); - logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); - free(logfile); + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", + c_info->name)); + if (logfile_w < 0) { + rc = logfile_w; + goto out; + } null = open("/dev/null", O_RDONLY); const char *dom_path = libxl__xs_get_dompath(gc, domid); @@ -1268,7 +1286,6 @@ out: static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata) { - libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); STATE_AO_GC(spawn->ao); if (!xsdata) @@ -1320,18 +1337,91 @@ static void device_model_spawn_outcome(libxl__egc *egc, dmss->callback(egc, dmss, rc); } -int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) +void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss) { - char *pid; - int ret; + STATE_AO_GC(dmss->spawn.ao); + flexarray_t *dm_args; + char **args; + const char *dm; + int logfile_w, null, rc; + uint32_t domid = dmss->guest_domid; + + /* Always use qemu-xen as device model */ + dm = qemu_xen_path(gc); + + dm_args = flexarray_make(gc, 15, 1); + flexarray_vappend(dm_args, dm, "-xen-domid", + GCSPRINTF("%d", domid), NULL); + flexarray_append(dm_args, "-xen-attach"); + flexarray_vappend(dm_args, "-name", + GCSPRINTF("domain-%u", domid), NULL); + flexarray_append(dm_args, "-nographic"); + flexarray_vappend(dm_args, "-M", "xenpv", NULL); + flexarray_vappend(dm_args, "-monitor", "/dev/null", NULL); + flexarray_vappend(dm_args, "-serial", "/dev/null", NULL); + flexarray_vappend(dm_args, "-parallel", "/dev/null", NULL); + flexarray_append(dm_args, NULL); + args = (char **) flexarray_contents(dm_args); - pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); - if (!pid || !atoi(pid)) { - LOG(ERROR, "could not find device-model's pid for dom %u", domid); - ret = ERROR_FAIL; + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qdisk-%u", domid)); + if (logfile_w < 0) { + rc = logfile_w; + goto error; + } + null = open("/dev/null", O_RDONLY); + + dmss->guest_config = NULL; + /* + * Clearly specify Qemu not using a saved state, so + * device_model_spawn_outcome doesn't try to unlink it. + */ + dmss->build_state = libxl__zalloc(gc, sizeof(*dmss->build_state)); + dmss->build_state->saved_state = 0; + + dmss->spawn.what = GCSPRINTF("domain %u Qdisk backend", domid); + dmss->spawn.xspath = GCSPRINTF("device-model/%u/state", domid); + dmss->spawn.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + /* + * We cannot save Qemu pid anywhere in the xenstore guest dir, + * because we will call this from unprivileged driver domains, + * so save it in the current domain libxl private dir. + */ + dmss->spawn.pidpath = GCSPRINTF("libxl/%u/qdisk-backend-pid", domid); + dmss->spawn.midproc_cb = libxl__spawn_record_pid; + dmss->spawn.confirm_cb = device_model_confirm; + dmss->spawn.failure_cb = device_model_startup_failed; + dmss->spawn.detached_cb = device_model_detached; + rc = libxl__spawn_spawn(egc, &dmss->spawn); + if (rc < 0) + goto error; + if (!rc) { /* inner child */ + setsid(); + libxl__exec(gc, null, logfile_w, logfile_w, dm, args, NULL); + } + + return; + +error: + assert(rc); + dmss->callback(egc, dmss, rc); + return; +} + +/* Generic function to signal a Qemu instance to exit */ +static int kill_device_model(libxl__gc *gc, const char *xs_path_pid) +{ + const char *xs_pid; + int ret, pid; + + ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); + if (ret || !xs_pid) { + LOG(ERROR, "unable to find device model pid in %s", xs_path_pid); + ret = ret ? : ERROR_FAIL; goto out; } - ret = kill(atoi(pid), SIGHUP); + pid = atoi(xs_pid); + + ret = kill(pid, SIGHUP); if (ret < 0 && errno == ESRCH) { LOG(ERROR, "Device Model already exited"); ret = 0; @@ -1339,7 +1429,7 @@ int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) LOG(DEBUG, "Device Model signaled"); ret = 0; } else { - LOGE(ERROR, "failed to kill Device Model [%d]", atoi(pid)); + LOGE(ERROR, "failed to kill Device Model [%d]", pid); ret = ERROR_FAIL; goto out; } @@ -1348,6 +1438,32 @@ out: return ret; } +/* Helper to destroy a Qdisk backend */ +int libxl__destroy_qdisk_backend(libxl__gc *gc, uint32_t domid) +{ + char *pid_path; + int rc; + + pid_path = GCSPRINTF("libxl/%u/qdisk-backend-pid", domid); + + rc = kill_device_model(gc, pid_path); + if (rc) + goto out; + + libxl__xs_rm_checked(gc, XBT_NULL, pid_path); + libxl__xs_rm_checked(gc, XBT_NULL, + GCSPRINTF("device-model/%u", domid)); + +out: + return rc; +} + +int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) +{ + return kill_device_model(gc, + GCSPRINTF("/local/domain/%d/image/device-model-pid", domid)); +} + int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e3b9fb4..cff3518 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2548,6 +2548,12 @@ _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); _hidden char *libxl__stub_dm_name(libxl__gc *gc, const char * guest_name); +/* Qdisk backend launch helpers */ + +_hidden void libxl__spawn_qdisk_backend(libxl__egc *egc, + libxl__dm_spawn_state *dmss); +_hidden int libxl__destroy_qdisk_backend(libxl__gc *gc, uint32_t domid); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7545830115315202590== 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 --===============7545830115315202590==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQe-000150-38; Tue, 19 Nov 2013 16:45:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQc-00014V-2H for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:30 +0000 Received: from [193.109.254.147:14688] by server-1.bemta-14.messagelabs.com id D2/B6-10312-9A59B825; Tue, 19 Nov 2013 16:45:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1384879526!3741759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9009 invoked from network); 19 Nov 2013 16:45:27 -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; 19 Nov 2013 16:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQY-00052L-NB for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQY-0006io-EQ for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:26 +0000 Date: Tue, 19 Nov 2013 16:45:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add Qdisk backend launch helper X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7545830115315202590==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7545830115315202590== Content-Type: text/plain commit 5cf2bea385d1bdd409f06789220910876c0ab17d Author: Roger Pau Monne AuthorDate: Thu Sep 19 15:33:59 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:14 2013 +0000 libxl: add Qdisk backend launch helper Current Qemu launch functions in libxl require the usage of data structures only avaialbe on domain creation. All this information is not need in order to launch a Qemu instance to serve Qdisk backends, so introduce a new simplified helper that can be used to launch Qemu/Qdisk, that will be used to launch Qdisk in driver domains. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Cc: Anthony PERARD Cc: Stefano Stabellini Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 148 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl_internal.h | 6 ++ 2 files changed, 138 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b4798b8..292e351 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -42,6 +42,23 @@ static const char *qemu_xen_path(libxl__gc *gc) #endif } +static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) +{ + char *logfile; + int logfile_w; + + libxl_create_logfile(CTX, name, &logfile); + logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); + free(logfile); + + if (logfile_w < 0) { + LOGE(ERROR, "unable to open Qemu logfile"); + return ERROR_FAIL; + } + + return logfile_w; +} + const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *info) { @@ -1149,7 +1166,7 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); - char *path, *logfile; + char *path; int logfile_w, null; int rc; char **args, **arg; @@ -1204,11 +1221,12 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); - libxl_create_logfile(ctx, - libxl__sprintf(gc, "qemu-dm-%s", c_info->name), - &logfile); - logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); - free(logfile); + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", + c_info->name)); + if (logfile_w < 0) { + rc = logfile_w; + goto out; + } null = open("/dev/null", O_RDONLY); const char *dom_path = libxl__xs_get_dompath(gc, domid); @@ -1268,7 +1286,6 @@ out: static void device_model_confirm(libxl__egc *egc, libxl__spawn_state *spawn, const char *xsdata) { - libxl__dm_spawn_state *dmss = CONTAINER_OF(spawn, *dmss, spawn); STATE_AO_GC(spawn->ao); if (!xsdata) @@ -1320,18 +1337,91 @@ static void device_model_spawn_outcome(libxl__egc *egc, dmss->callback(egc, dmss, rc); } -int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) +void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss) { - char *pid; - int ret; + STATE_AO_GC(dmss->spawn.ao); + flexarray_t *dm_args; + char **args; + const char *dm; + int logfile_w, null, rc; + uint32_t domid = dmss->guest_domid; + + /* Always use qemu-xen as device model */ + dm = qemu_xen_path(gc); + + dm_args = flexarray_make(gc, 15, 1); + flexarray_vappend(dm_args, dm, "-xen-domid", + GCSPRINTF("%d", domid), NULL); + flexarray_append(dm_args, "-xen-attach"); + flexarray_vappend(dm_args, "-name", + GCSPRINTF("domain-%u", domid), NULL); + flexarray_append(dm_args, "-nographic"); + flexarray_vappend(dm_args, "-M", "xenpv", NULL); + flexarray_vappend(dm_args, "-monitor", "/dev/null", NULL); + flexarray_vappend(dm_args, "-serial", "/dev/null", NULL); + flexarray_vappend(dm_args, "-parallel", "/dev/null", NULL); + flexarray_append(dm_args, NULL); + args = (char **) flexarray_contents(dm_args); - pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid)); - if (!pid || !atoi(pid)) { - LOG(ERROR, "could not find device-model's pid for dom %u", domid); - ret = ERROR_FAIL; + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qdisk-%u", domid)); + if (logfile_w < 0) { + rc = logfile_w; + goto error; + } + null = open("/dev/null", O_RDONLY); + + dmss->guest_config = NULL; + /* + * Clearly specify Qemu not using a saved state, so + * device_model_spawn_outcome doesn't try to unlink it. + */ + dmss->build_state = libxl__zalloc(gc, sizeof(*dmss->build_state)); + dmss->build_state->saved_state = 0; + + dmss->spawn.what = GCSPRINTF("domain %u Qdisk backend", domid); + dmss->spawn.xspath = GCSPRINTF("device-model/%u/state", domid); + dmss->spawn.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + /* + * We cannot save Qemu pid anywhere in the xenstore guest dir, + * because we will call this from unprivileged driver domains, + * so save it in the current domain libxl private dir. + */ + dmss->spawn.pidpath = GCSPRINTF("libxl/%u/qdisk-backend-pid", domid); + dmss->spawn.midproc_cb = libxl__spawn_record_pid; + dmss->spawn.confirm_cb = device_model_confirm; + dmss->spawn.failure_cb = device_model_startup_failed; + dmss->spawn.detached_cb = device_model_detached; + rc = libxl__spawn_spawn(egc, &dmss->spawn); + if (rc < 0) + goto error; + if (!rc) { /* inner child */ + setsid(); + libxl__exec(gc, null, logfile_w, logfile_w, dm, args, NULL); + } + + return; + +error: + assert(rc); + dmss->callback(egc, dmss, rc); + return; +} + +/* Generic function to signal a Qemu instance to exit */ +static int kill_device_model(libxl__gc *gc, const char *xs_path_pid) +{ + const char *xs_pid; + int ret, pid; + + ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); + if (ret || !xs_pid) { + LOG(ERROR, "unable to find device model pid in %s", xs_path_pid); + ret = ret ? : ERROR_FAIL; goto out; } - ret = kill(atoi(pid), SIGHUP); + pid = atoi(xs_pid); + + ret = kill(pid, SIGHUP); if (ret < 0 && errno == ESRCH) { LOG(ERROR, "Device Model already exited"); ret = 0; @@ -1339,7 +1429,7 @@ int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) LOG(DEBUG, "Device Model signaled"); ret = 0; } else { - LOGE(ERROR, "failed to kill Device Model [%d]", atoi(pid)); + LOGE(ERROR, "failed to kill Device Model [%d]", pid); ret = ERROR_FAIL; goto out; } @@ -1348,6 +1438,32 @@ out: return ret; } +/* Helper to destroy a Qdisk backend */ +int libxl__destroy_qdisk_backend(libxl__gc *gc, uint32_t domid) +{ + char *pid_path; + int rc; + + pid_path = GCSPRINTF("libxl/%u/qdisk-backend-pid", domid); + + rc = kill_device_model(gc, pid_path); + if (rc) + goto out; + + libxl__xs_rm_checked(gc, XBT_NULL, pid_path); + libxl__xs_rm_checked(gc, XBT_NULL, + GCSPRINTF("device-model/%u", domid)); + +out: + return rc; +} + +int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) +{ + return kill_device_model(gc, + GCSPRINTF("/local/domain/%d/image/device-model-pid", domid)); +} + int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e3b9fb4..cff3518 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2548,6 +2548,12 @@ _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); _hidden char *libxl__stub_dm_name(libxl__gc *gc, const char * guest_name); +/* Qdisk backend launch helpers */ + +_hidden void libxl__spawn_qdisk_backend(libxl__egc *egc, + libxl__dm_spawn_state *dmss); +_hidden int libxl__destroy_qdisk_backend(libxl__gc *gc, uint32_t domid); + /*----- Domain creation -----*/ typedef struct libxl__domain_create_state libxl__domain_create_state; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7545830115315202590== 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 --===============7545830115315202590==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQn-000182-MF; Tue, 19 Nov 2013 16:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQl-00017I-LW for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:39 +0000 Received: from [85.158.143.35:52397] by server-3.bemta-4.messagelabs.com id CE/10-32360-3B59B825; Tue, 19 Nov 2013 16:45:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1384879537!4304501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11588 invoked from network); 19 Nov 2013 16:45:38 -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; 19 Nov 2013 16:45:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQi-00052W-Vp for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQi-0006jL-RA for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:36 +0000 Date: Tue, 19 Nov 2013 16:45:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: put daemonize code in it's own 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: multipart/mixed; boundary="===============7197941017648087080==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7197941017648087080== Content-Type: text/plain commit 64559b173749d00a9447c6391b37c19e5e4cb4f5 Author: Roger Pau Monne AuthorDate: Fri Sep 20 17:14:09 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:14 2013 +0000 xl: put daemonize code in it's own function Move the daemonizer code from create_domain into it's own function that can be called from other places different than create_domain. This will be used to daemonize the driver domain backend handler. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 97 ++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 41 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 1928424..2d147d4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -402,6 +402,56 @@ out: if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } } +static int do_daemonize(char *name) +{ + char *fullname; + pid_t child1, got_child; + int nullfd, ret = 0; + int status = 0; + + child1 = xl_fork(child_waitdaemon); + if (child1) { + for (;;) { + got_child = xl_waitpid(child_waitdaemon, &status, 0); + if (got_child == child1) break; + assert(got_child == -1); + perror("failed to wait for daemonizing child"); + ret = ERROR_FAIL; + goto out; + } + if (status) { + libxl_report_child_exitstatus(ctx, XTL_ERROR, + "daemonizing child", child1, status); + ret = ERROR_FAIL; + goto out; + } + ret = 1; + goto out; + } + + postfork(); + + ret = libxl_create_logfile(ctx, name, &fullname); + if (ret) { + LOG("failed to open logfile %s: %s",fullname,strerror(errno)); + exit(-1); + } + + CHK_ERRNO(( logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, + 0644) )<0); + free(fullname); + + CHK_ERRNO(( nullfd = open("/dev/null", O_RDONLY) )<0); + dup2(nullfd, 0); + dup2(logfile, 1); + dup2(logfile, 2); + + CHK_ERRNO(daemon(0, 1) < 0); + +out: + return ret; +} + static int parse_action_on_shutdown(const char *buf, libxl_action_on_shutdown *a) { int i; @@ -1902,7 +1952,6 @@ static uint32_t create_domain(struct domain_create *dom_info) void *config_data = 0; int config_len = 0; int restore_fd = -1; - int status = 0; const libxl_asyncprogress_how *autoconnect_console_how; struct save_file_header hdr; @@ -2141,52 +2190,18 @@ start: autoconnect_vncviewer(domid, vncautopass); if (need_daemon) { - char *fullname, *name; - pid_t child1, got_child; - int nullfd; - - child1 = xl_fork(child_waitdaemon); - if (child1) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child != child1) { - assert(got_child == -1); - perror("failed to wait for daemonizing child"); - ret = ERROR_FAIL; - goto out; - } - if (status) { - libxl_report_child_exitstatus(ctx, XTL_ERROR, - "daemonizing child", child1, status); - ret = ERROR_FAIL; - goto out; - } - ret = domid; - goto out; - } - - postfork(); + char *name; if (asprintf(&name, "xl-%s", d_config.c_info.name) < 0) { LOG("Failed to allocate memory in asprintf"); exit(1); } - rc = libxl_create_logfile(ctx, name, &fullname); - if (rc) { - LOG("failed to open logfile %s: %s",fullname,strerror(errno)); - exit(-1); - } - - CHK_ERRNO(( logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, - 0644) )<0); - free(fullname); + ret = do_daemonize(name); free(name); - - CHK_ERRNO(( nullfd = open("/dev/null", O_RDONLY) )<0); - dup2(nullfd, 0); - dup2(logfile, 1); - dup2(logfile, 2); - - CHK_ERRNO(daemon(0, 1) < 0); + if (ret) { + ret = (ret == 1) ? domid : ret; + goto out; + } need_daemon = 0; } LOG("Waiting for domain %s (domid %d) to die [pid %ld]", -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7197941017648087080== 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 --===============7197941017648087080==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:45:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQn-000182-MF; Tue, 19 Nov 2013 16:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQl-00017I-LW for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:39 +0000 Received: from [85.158.143.35:52397] by server-3.bemta-4.messagelabs.com id CE/10-32360-3B59B825; Tue, 19 Nov 2013 16:45:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1384879537!4304501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11588 invoked from network); 19 Nov 2013 16:45:38 -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; 19 Nov 2013 16:45:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQi-00052W-Vp for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQi-0006jL-RA for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:36 +0000 Date: Tue, 19 Nov 2013 16:45:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: put daemonize code in it's own 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: multipart/mixed; boundary="===============7197941017648087080==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7197941017648087080== Content-Type: text/plain commit 64559b173749d00a9447c6391b37c19e5e4cb4f5 Author: Roger Pau Monne AuthorDate: Fri Sep 20 17:14:09 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:14 2013 +0000 xl: put daemonize code in it's own function Move the daemonizer code from create_domain into it's own function that can be called from other places different than create_domain. This will be used to daemonize the driver domain backend handler. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 97 ++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 41 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 1928424..2d147d4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -402,6 +402,56 @@ out: if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } } +static int do_daemonize(char *name) +{ + char *fullname; + pid_t child1, got_child; + int nullfd, ret = 0; + int status = 0; + + child1 = xl_fork(child_waitdaemon); + if (child1) { + for (;;) { + got_child = xl_waitpid(child_waitdaemon, &status, 0); + if (got_child == child1) break; + assert(got_child == -1); + perror("failed to wait for daemonizing child"); + ret = ERROR_FAIL; + goto out; + } + if (status) { + libxl_report_child_exitstatus(ctx, XTL_ERROR, + "daemonizing child", child1, status); + ret = ERROR_FAIL; + goto out; + } + ret = 1; + goto out; + } + + postfork(); + + ret = libxl_create_logfile(ctx, name, &fullname); + if (ret) { + LOG("failed to open logfile %s: %s",fullname,strerror(errno)); + exit(-1); + } + + CHK_ERRNO(( logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, + 0644) )<0); + free(fullname); + + CHK_ERRNO(( nullfd = open("/dev/null", O_RDONLY) )<0); + dup2(nullfd, 0); + dup2(logfile, 1); + dup2(logfile, 2); + + CHK_ERRNO(daemon(0, 1) < 0); + +out: + return ret; +} + static int parse_action_on_shutdown(const char *buf, libxl_action_on_shutdown *a) { int i; @@ -1902,7 +1952,6 @@ static uint32_t create_domain(struct domain_create *dom_info) void *config_data = 0; int config_len = 0; int restore_fd = -1; - int status = 0; const libxl_asyncprogress_how *autoconnect_console_how; struct save_file_header hdr; @@ -2141,52 +2190,18 @@ start: autoconnect_vncviewer(domid, vncautopass); if (need_daemon) { - char *fullname, *name; - pid_t child1, got_child; - int nullfd; - - child1 = xl_fork(child_waitdaemon); - if (child1) { - got_child = xl_waitpid(child_waitdaemon, &status, 0); - if (got_child != child1) { - assert(got_child == -1); - perror("failed to wait for daemonizing child"); - ret = ERROR_FAIL; - goto out; - } - if (status) { - libxl_report_child_exitstatus(ctx, XTL_ERROR, - "daemonizing child", child1, status); - ret = ERROR_FAIL; - goto out; - } - ret = domid; - goto out; - } - - postfork(); + char *name; if (asprintf(&name, "xl-%s", d_config.c_info.name) < 0) { LOG("Failed to allocate memory in asprintf"); exit(1); } - rc = libxl_create_logfile(ctx, name, &fullname); - if (rc) { - LOG("failed to open logfile %s: %s",fullname,strerror(errno)); - exit(-1); - } - - CHK_ERRNO(( logfile = open(fullname, O_WRONLY|O_CREAT|O_APPEND, - 0644) )<0); - free(fullname); + ret = do_daemonize(name); free(name); - - CHK_ERRNO(( nullfd = open("/dev/null", O_RDONLY) )<0); - dup2(nullfd, 0); - dup2(logfile, 1); - dup2(logfile, 2); - - CHK_ERRNO(daemon(0, 1) < 0); + if (ret) { + ret = (ret == 1) ? domid : ret; + goto out; + } need_daemon = 0; } LOG("Waiting for domain %s (domid %d) to die [pid %ld]", -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7197941017648087080== 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 --===============7197941017648087080==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQy-0001Aw-UX; Tue, 19 Nov 2013 16:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQw-0001AQ-IZ for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:50 +0000 Received: from [85.158.143.35:53192] by server-3.bemta-4.messagelabs.com id 03/50-32360-DB59B825; Tue, 19 Nov 2013 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1384879547!4237786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18452 invoked from network); 19 Nov 2013 16:45:48 -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; 19 Nov 2013 16:45:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQt-00052d-4x for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQt-0006jt-32 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:47 +0000 Date: Tue, 19 Nov 2013 16:45:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: revert 326a7b74 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1895357467649510705==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1895357467649510705== Content-Type: text/plain commit 6d8dbac551d37fe3b4a6f70317fcaeba086d8589 Author: Roger Pau Monne AuthorDate: Fri Sep 20 17:55:32 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:18 2013 +0000 libxl: revert 326a7b74 When running libxl from a driver domain there's no xenstore pid file (because xenstore is not running on the driver domain). Also, at that point in libxl initialization there's no way to know wether libxl is running on a domain different than Dom0, so just revert the change in order to allow libxl to work on driver domains. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 7 ------- tools/libxl/libxl_internal.h | 1 - 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0de1112..b89b7f4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -25,7 +25,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx = NULL; - struct stat stat_buf; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -82,12 +81,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__poller_init(ctx, &ctx->poller_app); if (rc) goto out; - if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" - "failed to stat %s", XENSTORE_PID_FILE); - rc = ERROR_FAIL; goto out; - } - ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index cff3518..670234b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -378,7 +378,6 @@ typedef struct { #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) #define AUTO_PHP_SLOT 0x100 -#define XENSTORE_PID_FILE "/var/run/xenstored.pid" #define PROC_PCI_NUM_RESOURCES 7 #define PCI_BAR_IO 0x01 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1895357467649510705== 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 --===============1895357467649510705==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16: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 1VioQy-0001Aw-UX; Tue, 19 Nov 2013 16:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQw-0001AQ-IZ for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:50 +0000 Received: from [85.158.143.35:53192] by server-3.bemta-4.messagelabs.com id 03/50-32360-DB59B825; Tue, 19 Nov 2013 16:45:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1384879547!4237786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18452 invoked from network); 19 Nov 2013 16:45:48 -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; 19 Nov 2013 16:45:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioQt-00052d-4x for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioQt-0006jt-32 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:47 +0000 Date: Tue, 19 Nov 2013 16:45:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: revert 326a7b74 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1895357467649510705==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1895357467649510705== Content-Type: text/plain commit 6d8dbac551d37fe3b4a6f70317fcaeba086d8589 Author: Roger Pau Monne AuthorDate: Fri Sep 20 17:55:32 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:18 2013 +0000 libxl: revert 326a7b74 When running libxl from a driver domain there's no xenstore pid file (because xenstore is not running on the driver domain). Also, at that point in libxl initialization there's no way to know wether libxl is running on a domain different than Dom0, so just revert the change in order to allow libxl to work on driver domains. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 7 ------- tools/libxl/libxl_internal.h | 1 - 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0de1112..b89b7f4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -25,7 +25,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx = NULL; - struct stat stat_buf; int rc; if (version != LIBXL_VERSION) { rc = ERROR_VERSION; goto out; } @@ -82,12 +81,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__poller_init(ctx, &ctx->poller_app); if (rc) goto out; - if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" - "failed to stat %s", XENSTORE_PID_FILE); - rc = ERROR_FAIL; goto out; - } - ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index cff3518..670234b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -378,7 +378,6 @@ typedef struct { #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) #define AUTO_PHP_SLOT 0x100 -#define XENSTORE_PID_FILE "/var/run/xenstored.pid" #define PROC_PCI_NUM_RESOURCES 7 #define PCI_BAR_IO 0x01 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1895357467649510705== 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 --===============1895357467649510705==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:46:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:46: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 1VioR8-0001E1-DX; Tue, 19 Nov 2013 16:46:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioR6-0001DP-Pr for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:46:01 +0000 Received: from [85.158.137.68:2285] by server-8.bemta-3.messagelabs.com id A2/BB-06638-8C59B825; Tue, 19 Nov 2013 16:46:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1384879557!2449839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7260 invoked from network); 19 Nov 2013 16:45:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:45:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioR3-00052u-D9 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioR3-0006ky-9M for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:57 +0000 Date: Tue, 19 Nov 2013 16:45:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add device backend listener in order to launch backends X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7294151615022782515==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7294151615022782515== Content-Type: text/plain commit a0eaa86e753766a06d740bd125c0cb8b3358babf Author: Roger Pau Monne AuthorDate: Fri Sep 13 10:53:58 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:23 2013 +0000 libxl: add device backend listener in order to launch backends Add the necessary logic in libxl to allow it to act as a listener for launching backends in a driver domain, replacing udev (like we already do on Dom0). This new functionality is acomplished by watching the domain backend path (/local/domain//backend) and reacting to device creation/destruction. The way to launch this listener daemon is from xl, using the newly introduced "devd" command. The command will daemonize by default, using "xldevd.log" as it's logfile. Optionally the user can force the execution of the listener in the foreground by passing the "-F" option to the devd command. Current backends handled by this daemon include Qdisk, vbd and vif device types. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 339 +++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 12 ++ tools/libxl/xl.h | 1 + tools/libxl/xl_cmdimpl.c | 24 +++ tools/libxl/xl_cmdtable.c | 6 + 5 files changed, 382 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b89b7f4..4292c78 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3528,6 +3528,345 @@ DEFINE_DEVICE_ADD(vtpm) /******************************************************************************/ +/* + * Data structures used to track devices handled by driver domains + */ + +/* + * Structure that describes a device handled by a driver domain + */ +typedef struct libxl__ddomain_device { + libxl__device *dev; + LIBXL_SLIST_ENTRY(struct libxl__ddomain_device) next; +} libxl__ddomain_device; + +/* + * Structure that describes a domain and it's associated devices + */ +typedef struct libxl__ddomain_guest { + uint32_t domid; + int num_vifs, num_vbds, num_qdisks; + LIBXL_SLIST_HEAD(, struct libxl__ddomain_device) devices; + LIBXL_SLIST_ENTRY(struct libxl__ddomain_guest) next; +} libxl__ddomain_guest; + +/* + * Main structure used by a driver domain to keep track of devices + * currently in use + */ +typedef struct { + libxl__ao *ao; + libxl__ev_xswatch watch; + LIBXL_SLIST_HEAD(, struct libxl__ddomain_guest) guests; +} libxl__ddomain; + +static libxl__ddomain_guest *search_for_guest(libxl__ddomain *ddomain, + uint32_t domid) +{ + libxl__ddomain_guest *dguest; + + LIBXL_SLIST_FOREACH(dguest, &ddomain->guests, next) { + if (dguest->domid == domid) + return dguest; + } + return NULL; +} + +static libxl__ddomain_device *search_for_device(libxl__ddomain_guest *dguest, + libxl__device *dev) +{ + libxl__ddomain_device *ddev; + + LIBXL_SLIST_FOREACH(ddev, &dguest->devices, next) { +#define LIBXL_DEVICE_CMP(dev1, dev2, entry) (dev1->entry == dev2->entry) + if (LIBXL_DEVICE_CMP(ddev->dev, dev, backend_devid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, backend_domid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, devid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, domid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, backend_kind) && + LIBXL_DEVICE_CMP(ddev->dev, dev, kind)) + return ddev; +#undef LIBXL_DEVICE_CMP + } + + return NULL; +} + +static void device_complete(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) + free(aodev->dev); + + LOG(DEBUG, "device %s %s %s", + libxl__device_backend_path(gc, aodev->dev), + libxl__device_action_to_string(aodev->action), + aodev->rc ? "failed" : "succeed"); + + libxl__nested_ao_free(aodev->ao); +} + +static void qdisk_spawn_outcome(libxl__egc *egc, libxl__dm_spawn_state *dmss, + int rc) +{ + STATE_AO_GC(dmss->spawn.ao); + + LOG(DEBUG, "qdisk backend spawn for domain %u %s", dmss->guest_domid, + rc ? "failed" : "succeed"); + + libxl__nested_ao_free(dmss->spawn.ao); +} + +/* + * The following comment applies to both add_device and remove_device. + * + * If the return value is greater than 0, it means there's no ao dispatched, + * so the free of the nested ao should be done by the parent when it has + * finished. + */ +static int add_device(libxl__egc *egc, libxl__ao *ao, + libxl__ddomain_guest *dguest, + libxl__ddomain_device *ddev) +{ + AO_GC; + libxl__device *dev = ddev->dev; + libxl__ao_device *aodev; + libxl__dm_spawn_state *dmss; + int rc = 0; + + switch(dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (dev->backend_kind == LIBXL__DEVICE_KIND_VBD) dguest->num_vbds++; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) dguest->num_vifs++; + + GCNEW(aodev); + libxl__prepare_ao_device(ao, aodev); + aodev->dev = dev; + aodev->action = LIBXL__DEVICE_ACTION_ADD; + aodev->callback = device_complete; + libxl__wait_device_connection(egc, aodev); + + break; + case LIBXL__DEVICE_KIND_QDISK: + if (dguest->num_qdisks == 0) { + GCNEW(dmss); + dmss->guest_domid = dev->domid; + dmss->spawn.ao = ao; + dmss->callback = qdisk_spawn_outcome; + + libxl__spawn_qdisk_backend(egc, dmss); + } + dguest->num_qdisks++; + + break; + default: + rc = 1; + break; + } + + return rc; +} + +static int remove_device(libxl__egc *egc, libxl__ao *ao, + libxl__ddomain_guest *dguest, + libxl__ddomain_device *ddev) +{ + AO_GC; + libxl__device *dev = ddev->dev; + libxl__ao_device *aodev; + int rc = 0; + + switch(ddev->dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (dev->backend_kind == LIBXL__DEVICE_KIND_VBD) dguest->num_vbds--; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) dguest->num_vifs--; + + GCNEW(aodev); + libxl__prepare_ao_device(ao, aodev); + aodev->dev = dev; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; + aodev->callback = device_complete; + libxl__initiate_device_remove(egc, aodev); + break; + case LIBXL__DEVICE_KIND_QDISK: + if (--dguest->num_qdisks == 0) { + rc = libxl__destroy_qdisk_backend(gc, dev->domid); + if (rc) + goto out; + } + libxl__device_destroy(gc, dev); + free(dev); + /* Fall through to return > 0, no ao has been dispatched */ + default: + rc = 1; + break; + } + +out: + return rc; +} + +static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path) +{ + libxl__ddomain *ddomain = CONTAINER_OF(watch, *ddomain, watch); + libxl__ao *nested_ao = libxl__nested_ao_create(ddomain->ao); + STATE_AO_GC(nested_ao); + char *p, *path; + const char *sstate; + int state, rc, num_devs; + libxl__device *dev = NULL; + libxl__ddomain_device *ddev = NULL; + libxl__ddomain_guest *dguest = NULL; + bool free_ao = false; + + /* Check if event_path ends with "state" and truncate it */ + if (strlen(event_path) < strlen("state")) + goto skip; + + path = libxl__strdup(gc, event_path); + p = path + strlen(path) - strlen("state") - 1; + if (*p != '/') + goto skip; + *p = '\0'; + p++; + if (strcmp(p, "state") != 0) + goto skip; + + /* Check if the state is 1 (XenbusStateInitialising) or greater */ + rc = libxl__xs_read_checked(gc, XBT_NULL, event_path, &sstate); + if (rc || !sstate) + goto skip; + state = atoi(sstate); + + dev = libxl__zalloc(NOGC, sizeof(*dev)); + rc = libxl__parse_backend_path(gc, path, dev); + if (rc) + goto skip; + + dguest = search_for_guest(ddomain, dev->domid); + if (dguest == NULL && state == XenbusStateClosed) { + /* + * Spurious state change, device has already been disconnected + * or never attached. + */ + goto skip; + } + if (dguest == NULL) { + /* Create a new guest struct and initialize it */ + dguest = libxl__zalloc(NOGC, sizeof(*dguest)); + dguest->domid = dev->domid; + LIBXL_SLIST_INIT(&dguest->devices); + LIBXL_SLIST_INSERT_HEAD(&ddomain->guests, dguest, next); + LOG(DEBUG, "added domain %u to the list of active guests", + dguest->domid); + } + ddev = search_for_device(dguest, dev); + if (ddev == NULL && state == XenbusStateClosed) { + /* + * Spurious state change, device has already been disconnected + * or never attached. + */ + goto skip; + } else if (ddev == NULL) { + /* + * New device addition, allocate a struct to hold it and add it + * to the list of active devices for a given guest. + */ + ddev = libxl__zalloc(NOGC, sizeof(*ddev)); + ddev->dev = dev; + LIBXL_SLIST_INSERT_HEAD(&dguest->devices, ddev, next); + LOG(DEBUG, "added device %s to the list of active devices", path); + rc = add_device(egc, nested_ao, dguest, ddev); + if (rc > 0) + free_ao = true; + } else if (state == XenbusStateClosed) { + /* + * Removal of an active device, remove it from the list and + * free it's data structures if they are no longer needed. + * + * The free of the associated libxl__device is left to the + * helper remove_device function. + */ + LIBXL_SLIST_REMOVE(&dguest->devices, ddev, libxl__ddomain_device, + next); + LOG(DEBUG, "removed device %s from the list of active devices", path); + rc = remove_device(egc, nested_ao, dguest, ddev); + if (rc > 0) + free_ao = true; + + free(ddev); + /* If this was the last device in the domain, remove it from the list */ + num_devs = dguest->num_vifs + dguest->num_vbds + dguest->num_qdisks; + if (num_devs == 0) { + LIBXL_SLIST_REMOVE(&ddomain->guests, dguest, libxl__ddomain_guest, + next); + LOG(DEBUG, "removed domain %u from the list of active guests", + dguest->domid); + /* Clear any leftovers in libxl/ */ + libxl__xs_rm_checked(gc, XBT_NULL, + GCSPRINTF("libxl/%u", dguest->domid)); + free(dguest); + } + } + + if (free_ao) + libxl__nested_ao_free(nested_ao); + + return; + +skip: + libxl__nested_ao_free(nested_ao); + free(dev); + free(ddev); + free(dguest); + return; +} + +/* Handler of events for device driver domains */ +int libxl_device_events_handler(libxl_ctx *ctx, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, 0, ao_how); + int rc; + uint32_t domid; + libxl__ddomain ddomain; + char *be_path; + + ddomain.ao = ao; + LIBXL_SLIST_INIT(&ddomain.guests); + + rc = libxl__get_domid(gc, &domid); + if (rc) { + LOG(ERROR, "unable to get domain id"); + goto out; + } + + rc = libxl__xs_write_checked(gc, XBT_NULL, DISABLE_UDEV_PATH, "1"); + if (rc) { + LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH); + goto out; + } + + /* + * We use absolute paths because we want xswatch to also return + * absolute paths that can be parsed by libxl__parse_backend_path. + */ + be_path = GCSPRINTF("/local/domain/%u/backend", domid); + rc = libxl__ev_xswatch_register(gc, &ddomain.watch, backend_watch_callback, + be_path); + +out: + GC_FREE; + return rc ? : AO_INPROGRESS; +} + +/******************************************************************************/ + int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) { GC_INIT(ctx); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 18dd420..a9663e4 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -911,6 +911,18 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); /* + * Turns the current process into a backend device service daemon + * for a driver domain. + * + * From a libxl API point of view, this starts a long-running + * operation. That operation consists of "being a driver domain" + * and never completes. + */ +int libxl_device_events_handler(libxl_ctx *ctx, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +/* * Functions related to making devices assignable -- that is, bound to * the pciback driver, ready to be given to a guest via * libxl_pci_device_add. diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index e005c39..c876a33 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -105,6 +105,7 @@ int main_getenforce(int argc, char **argv); int main_setenforce(int argc, char **argv); int main_loadpolicy(int argc, char **argv); int main_remus(int argc, char **argv); +int main_devd(int argc, char **argv); void help(const char *command); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2d147d4..341863e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7210,6 +7210,30 @@ int main_remus(int argc, char **argv) return -ERROR_FAIL; } +int main_devd(int argc, char **argv) +{ + int ret = 0, opt = 0, daemonize = 1; + + SWITCH_FOREACH_OPT(opt, "F", NULL, "devd", 0) { + case 'F': + daemonize = 0; + break; + } + + if (daemonize) { + ret = do_daemonize("xldevd"); + if (ret) { + ret = (ret == 1) ? 0 : ret; + goto out; + } + } + + libxl_device_events_handler(ctx, 0); + +out: + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 326a660..7709206 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -488,6 +488,12 @@ struct cmd_spec cmd_table[] = { " of the domain." }, + { "devd", + &main_devd, 0, 1, + "Daemon that listens for devices and launches backends", + "[options]", + "-F Run in the foreground", + }, }; int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7294151615022782515== 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 --===============7294151615022782515==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:46:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:46: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 1VioR8-0001E1-DX; Tue, 19 Nov 2013 16:46:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioR6-0001DP-Pr for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:46:01 +0000 Received: from [85.158.137.68:2285] by server-8.bemta-3.messagelabs.com id A2/BB-06638-8C59B825; Tue, 19 Nov 2013 16:46:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1384879557!2449839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7260 invoked from network); 19 Nov 2013 16:45:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2013 16:45:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioR3-00052u-D9 for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioR3-0006ky-9M for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:45:57 +0000 Date: Tue, 19 Nov 2013 16:45:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add device backend listener in order to launch backends X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7294151615022782515==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7294151615022782515== Content-Type: text/plain commit a0eaa86e753766a06d740bd125c0cb8b3358babf Author: Roger Pau Monne AuthorDate: Fri Sep 13 10:53:58 2013 +0200 Commit: Ian Jackson CommitDate: Mon Nov 18 17:09:23 2013 +0000 libxl: add device backend listener in order to launch backends Add the necessary logic in libxl to allow it to act as a listener for launching backends in a driver domain, replacing udev (like we already do on Dom0). This new functionality is acomplished by watching the domain backend path (/local/domain//backend) and reacting to device creation/destruction. The way to launch this listener daemon is from xl, using the newly introduced "devd" command. The command will daemonize by default, using "xldevd.log" as it's logfile. Optionally the user can force the execution of the listener in the foreground by passing the "-F" option to the devd command. Current backends handled by this daemon include Qdisk, vbd and vif device types. Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 339 +++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 12 ++ tools/libxl/xl.h | 1 + tools/libxl/xl_cmdimpl.c | 24 +++ tools/libxl/xl_cmdtable.c | 6 + 5 files changed, 382 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b89b7f4..4292c78 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3528,6 +3528,345 @@ DEFINE_DEVICE_ADD(vtpm) /******************************************************************************/ +/* + * Data structures used to track devices handled by driver domains + */ + +/* + * Structure that describes a device handled by a driver domain + */ +typedef struct libxl__ddomain_device { + libxl__device *dev; + LIBXL_SLIST_ENTRY(struct libxl__ddomain_device) next; +} libxl__ddomain_device; + +/* + * Structure that describes a domain and it's associated devices + */ +typedef struct libxl__ddomain_guest { + uint32_t domid; + int num_vifs, num_vbds, num_qdisks; + LIBXL_SLIST_HEAD(, struct libxl__ddomain_device) devices; + LIBXL_SLIST_ENTRY(struct libxl__ddomain_guest) next; +} libxl__ddomain_guest; + +/* + * Main structure used by a driver domain to keep track of devices + * currently in use + */ +typedef struct { + libxl__ao *ao; + libxl__ev_xswatch watch; + LIBXL_SLIST_HEAD(, struct libxl__ddomain_guest) guests; +} libxl__ddomain; + +static libxl__ddomain_guest *search_for_guest(libxl__ddomain *ddomain, + uint32_t domid) +{ + libxl__ddomain_guest *dguest; + + LIBXL_SLIST_FOREACH(dguest, &ddomain->guests, next) { + if (dguest->domid == domid) + return dguest; + } + return NULL; +} + +static libxl__ddomain_device *search_for_device(libxl__ddomain_guest *dguest, + libxl__device *dev) +{ + libxl__ddomain_device *ddev; + + LIBXL_SLIST_FOREACH(ddev, &dguest->devices, next) { +#define LIBXL_DEVICE_CMP(dev1, dev2, entry) (dev1->entry == dev2->entry) + if (LIBXL_DEVICE_CMP(ddev->dev, dev, backend_devid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, backend_domid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, devid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, domid) && + LIBXL_DEVICE_CMP(ddev->dev, dev, backend_kind) && + LIBXL_DEVICE_CMP(ddev->dev, dev, kind)) + return ddev; +#undef LIBXL_DEVICE_CMP + } + + return NULL; +} + +static void device_complete(libxl__egc *egc, libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) + free(aodev->dev); + + LOG(DEBUG, "device %s %s %s", + libxl__device_backend_path(gc, aodev->dev), + libxl__device_action_to_string(aodev->action), + aodev->rc ? "failed" : "succeed"); + + libxl__nested_ao_free(aodev->ao); +} + +static void qdisk_spawn_outcome(libxl__egc *egc, libxl__dm_spawn_state *dmss, + int rc) +{ + STATE_AO_GC(dmss->spawn.ao); + + LOG(DEBUG, "qdisk backend spawn for domain %u %s", dmss->guest_domid, + rc ? "failed" : "succeed"); + + libxl__nested_ao_free(dmss->spawn.ao); +} + +/* + * The following comment applies to both add_device and remove_device. + * + * If the return value is greater than 0, it means there's no ao dispatched, + * so the free of the nested ao should be done by the parent when it has + * finished. + */ +static int add_device(libxl__egc *egc, libxl__ao *ao, + libxl__ddomain_guest *dguest, + libxl__ddomain_device *ddev) +{ + AO_GC; + libxl__device *dev = ddev->dev; + libxl__ao_device *aodev; + libxl__dm_spawn_state *dmss; + int rc = 0; + + switch(dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (dev->backend_kind == LIBXL__DEVICE_KIND_VBD) dguest->num_vbds++; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) dguest->num_vifs++; + + GCNEW(aodev); + libxl__prepare_ao_device(ao, aodev); + aodev->dev = dev; + aodev->action = LIBXL__DEVICE_ACTION_ADD; + aodev->callback = device_complete; + libxl__wait_device_connection(egc, aodev); + + break; + case LIBXL__DEVICE_KIND_QDISK: + if (dguest->num_qdisks == 0) { + GCNEW(dmss); + dmss->guest_domid = dev->domid; + dmss->spawn.ao = ao; + dmss->callback = qdisk_spawn_outcome; + + libxl__spawn_qdisk_backend(egc, dmss); + } + dguest->num_qdisks++; + + break; + default: + rc = 1; + break; + } + + return rc; +} + +static int remove_device(libxl__egc *egc, libxl__ao *ao, + libxl__ddomain_guest *dguest, + libxl__ddomain_device *ddev) +{ + AO_GC; + libxl__device *dev = ddev->dev; + libxl__ao_device *aodev; + int rc = 0; + + switch(ddev->dev->backend_kind) { + case LIBXL__DEVICE_KIND_VBD: + case LIBXL__DEVICE_KIND_VIF: + if (dev->backend_kind == LIBXL__DEVICE_KIND_VBD) dguest->num_vbds--; + if (dev->backend_kind == LIBXL__DEVICE_KIND_VIF) dguest->num_vifs--; + + GCNEW(aodev); + libxl__prepare_ao_device(ao, aodev); + aodev->dev = dev; + aodev->action = LIBXL__DEVICE_ACTION_REMOVE; + aodev->callback = device_complete; + libxl__initiate_device_remove(egc, aodev); + break; + case LIBXL__DEVICE_KIND_QDISK: + if (--dguest->num_qdisks == 0) { + rc = libxl__destroy_qdisk_backend(gc, dev->domid); + if (rc) + goto out; + } + libxl__device_destroy(gc, dev); + free(dev); + /* Fall through to return > 0, no ao has been dispatched */ + default: + rc = 1; + break; + } + +out: + return rc; +} + +static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, + const char *watch_path, + const char *event_path) +{ + libxl__ddomain *ddomain = CONTAINER_OF(watch, *ddomain, watch); + libxl__ao *nested_ao = libxl__nested_ao_create(ddomain->ao); + STATE_AO_GC(nested_ao); + char *p, *path; + const char *sstate; + int state, rc, num_devs; + libxl__device *dev = NULL; + libxl__ddomain_device *ddev = NULL; + libxl__ddomain_guest *dguest = NULL; + bool free_ao = false; + + /* Check if event_path ends with "state" and truncate it */ + if (strlen(event_path) < strlen("state")) + goto skip; + + path = libxl__strdup(gc, event_path); + p = path + strlen(path) - strlen("state") - 1; + if (*p != '/') + goto skip; + *p = '\0'; + p++; + if (strcmp(p, "state") != 0) + goto skip; + + /* Check if the state is 1 (XenbusStateInitialising) or greater */ + rc = libxl__xs_read_checked(gc, XBT_NULL, event_path, &sstate); + if (rc || !sstate) + goto skip; + state = atoi(sstate); + + dev = libxl__zalloc(NOGC, sizeof(*dev)); + rc = libxl__parse_backend_path(gc, path, dev); + if (rc) + goto skip; + + dguest = search_for_guest(ddomain, dev->domid); + if (dguest == NULL && state == XenbusStateClosed) { + /* + * Spurious state change, device has already been disconnected + * or never attached. + */ + goto skip; + } + if (dguest == NULL) { + /* Create a new guest struct and initialize it */ + dguest = libxl__zalloc(NOGC, sizeof(*dguest)); + dguest->domid = dev->domid; + LIBXL_SLIST_INIT(&dguest->devices); + LIBXL_SLIST_INSERT_HEAD(&ddomain->guests, dguest, next); + LOG(DEBUG, "added domain %u to the list of active guests", + dguest->domid); + } + ddev = search_for_device(dguest, dev); + if (ddev == NULL && state == XenbusStateClosed) { + /* + * Spurious state change, device has already been disconnected + * or never attached. + */ + goto skip; + } else if (ddev == NULL) { + /* + * New device addition, allocate a struct to hold it and add it + * to the list of active devices for a given guest. + */ + ddev = libxl__zalloc(NOGC, sizeof(*ddev)); + ddev->dev = dev; + LIBXL_SLIST_INSERT_HEAD(&dguest->devices, ddev, next); + LOG(DEBUG, "added device %s to the list of active devices", path); + rc = add_device(egc, nested_ao, dguest, ddev); + if (rc > 0) + free_ao = true; + } else if (state == XenbusStateClosed) { + /* + * Removal of an active device, remove it from the list and + * free it's data structures if they are no longer needed. + * + * The free of the associated libxl__device is left to the + * helper remove_device function. + */ + LIBXL_SLIST_REMOVE(&dguest->devices, ddev, libxl__ddomain_device, + next); + LOG(DEBUG, "removed device %s from the list of active devices", path); + rc = remove_device(egc, nested_ao, dguest, ddev); + if (rc > 0) + free_ao = true; + + free(ddev); + /* If this was the last device in the domain, remove it from the list */ + num_devs = dguest->num_vifs + dguest->num_vbds + dguest->num_qdisks; + if (num_devs == 0) { + LIBXL_SLIST_REMOVE(&ddomain->guests, dguest, libxl__ddomain_guest, + next); + LOG(DEBUG, "removed domain %u from the list of active guests", + dguest->domid); + /* Clear any leftovers in libxl/ */ + libxl__xs_rm_checked(gc, XBT_NULL, + GCSPRINTF("libxl/%u", dguest->domid)); + free(dguest); + } + } + + if (free_ao) + libxl__nested_ao_free(nested_ao); + + return; + +skip: + libxl__nested_ao_free(nested_ao); + free(dev); + free(ddev); + free(dguest); + return; +} + +/* Handler of events for device driver domains */ +int libxl_device_events_handler(libxl_ctx *ctx, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, 0, ao_how); + int rc; + uint32_t domid; + libxl__ddomain ddomain; + char *be_path; + + ddomain.ao = ao; + LIBXL_SLIST_INIT(&ddomain.guests); + + rc = libxl__get_domid(gc, &domid); + if (rc) { + LOG(ERROR, "unable to get domain id"); + goto out; + } + + rc = libxl__xs_write_checked(gc, XBT_NULL, DISABLE_UDEV_PATH, "1"); + if (rc) { + LOGE(ERROR, "unable to write %s = 1", DISABLE_UDEV_PATH); + goto out; + } + + /* + * We use absolute paths because we want xswatch to also return + * absolute paths that can be parsed by libxl__parse_backend_path. + */ + be_path = GCSPRINTF("/local/domain/%u/backend", domid); + rc = libxl__ev_xswatch_register(gc, &ddomain.watch, backend_watch_callback, + be_path); + +out: + GC_FREE; + return rc ? : AO_INPROGRESS; +} + +/******************************************************************************/ + int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) { GC_INIT(ctx); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 18dd420..a9663e4 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -911,6 +911,18 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); /* + * Turns the current process into a backend device service daemon + * for a driver domain. + * + * From a libxl API point of view, this starts a long-running + * operation. That operation consists of "being a driver domain" + * and never completes. + */ +int libxl_device_events_handler(libxl_ctx *ctx, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +/* * Functions related to making devices assignable -- that is, bound to * the pciback driver, ready to be given to a guest via * libxl_pci_device_add. diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index e005c39..c876a33 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -105,6 +105,7 @@ int main_getenforce(int argc, char **argv); int main_setenforce(int argc, char **argv); int main_loadpolicy(int argc, char **argv); int main_remus(int argc, char **argv); +int main_devd(int argc, char **argv); void help(const char *command); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2d147d4..341863e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7210,6 +7210,30 @@ int main_remus(int argc, char **argv) return -ERROR_FAIL; } +int main_devd(int argc, char **argv) +{ + int ret = 0, opt = 0, daemonize = 1; + + SWITCH_FOREACH_OPT(opt, "F", NULL, "devd", 0) { + case 'F': + daemonize = 0; + break; + } + + if (daemonize) { + ret = do_daemonize("xldevd"); + if (ret) { + ret = (ret == 1) ? 0 : ret; + goto out; + } + } + + libxl_device_events_handler(ctx, 0); + +out: + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 326a660..7709206 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -488,6 +488,12 @@ struct cmd_spec cmd_table[] = { " of the domain." }, + { "devd", + &main_devd, 0, 1, + "Daemon that listens for devices and launches backends", + "[options]", + "-F Run in the foreground", + }, }; int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7294151615022782515== 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 --===============7294151615022782515==-- From xen-changelog-bounces@lists.xen.org Tue Nov 19 16:47:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:47: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 1VioSz-0001T3-D0; Tue, 19 Nov 2013 16:47:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioSy-0001Sn-1Q for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:47:56 +0000 Received: from [193.109.254.147:45151] by server-3.bemta-14.messagelabs.com id A9/CA-03488-B369B825; Tue, 19 Nov 2013 16:47:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384879454!3752190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21812 invoked from network); 19 Nov 2013 16:44:15 -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; 19 Nov 2013 16:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPO-00050h-Ok for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPO-0006e1-Aq for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:14 +0000 Date: Tue, 19 Nov 2013 16:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: fix TLB flushing in dma_pte_clear_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 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d Author: Jan Beulich AuthorDate: Mon Nov 18 13:55:55 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:55:55 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 97d5b5e..76d0bfd 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(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 Tue Nov 19 16:47:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Nov 2013 16:47: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 1VioSz-0001T3-D0; Tue, 19 Nov 2013 16:47:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioSy-0001Sn-1Q for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:47:56 +0000 Received: from [193.109.254.147:45151] by server-3.bemta-14.messagelabs.com id A9/CA-03488-B369B825; Tue, 19 Nov 2013 16:47:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1384879454!3752190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21812 invoked from network); 19 Nov 2013 16:44:15 -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; 19 Nov 2013 16:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VioPO-00050h-Ok for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VioPO-0006e1-Aq for xen-changelog@lists.xensource.com; Tue, 19 Nov 2013 16:44:14 +0000 Date: Tue, 19 Nov 2013 16:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: fix TLB flushing in dma_pte_clear_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 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d Author: Jan Beulich AuthorDate: Mon Nov 18 13:55:55 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:55:55 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 97d5b5e..76d0bfd 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(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 Wed Nov 20 04:44:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Nov 2013 04:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vize3-0001eW-6p; Wed, 20 Nov 2013 04:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vize1-0001eR-Me for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:05 +0000 Received: from [85.158.139.211:6980] by server-13.bemta-5.messagelabs.com id 03/11-11357-51E3C825; Wed, 20 Nov 2013 04:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384922643!2974041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19572 invoked from network); 20 Nov 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Nov 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 1Vizdy-0003I0-St for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vizdy-0001g9-Dg for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:02 +0000 Date: Wed, 20 Nov 2013 04:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VT-d: fix TLB flushing in dma_pte_clear_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 7482b89e67e4681d515224b6fc8c00f017979d6f Author: Jan Beulich AuthorDate: Mon Nov 18 13:59:32 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:59:32 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d master date: 2013-11-18 13:55:55 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d09b1c8..8b6282f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 20 04:44:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Nov 2013 04:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vize3-0001eW-6p; Wed, 20 Nov 2013 04:44:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vize1-0001eR-Me for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:05 +0000 Received: from [85.158.139.211:6980] by server-13.bemta-5.messagelabs.com id 03/11-11357-51E3C825; Wed, 20 Nov 2013 04:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1384922643!2974041!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19572 invoked from network); 20 Nov 2013 04:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Nov 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 1Vizdy-0003I0-St for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vizdy-0001g9-Dg for xen-changelog@lists.xensource.com; Wed, 20 Nov 2013 04:44:02 +0000 Date: Wed, 20 Nov 2013 04:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VT-d: fix TLB flushing in dma_pte_clear_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 7482b89e67e4681d515224b6fc8c00f017979d6f Author: Jan Beulich AuthorDate: Mon Nov 18 13:59:32 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 18 13:59:32 2013 +0100 VT-d: fix TLB flushing in dma_pte_clear_one() The third parameter of __intel_iommu_iotlb_flush() is to indicate whether the to be flushed entry was a present one. A few lines before, we bailed if !dma_pte_present(*pte), so there's no need to check the flag here again - we can simply always pass TRUE here. This is XSA-78. Suggested-by: Cheng Yueqiang Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Keir Fraser master commit: 85c72f9fe764ed96f5c149efcdd69ab7c18bfe3d master date: 2013-11-18 13:55:55 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index d09b1c8..8b6282f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr) iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); if ( !this_cpu(iommu_dont_flush_iotlb) ) - __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1); + __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1); unmap_vtd_domain_page(page); -- 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 Nov 22 21:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLf-00081u-A6; Fri, 22 Nov 2013 21:33:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLd-00081p-Fc for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:10 +0000 Received: from [85.158.139.211:52443] by server-12.bemta-5.messagelabs.com id F0/12-30017-49DCF825; Fri, 22 Nov 2013 21:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385155984!3732671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26950 invoked from network); 22 Nov 2013 21:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLY-0004C8-BZ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLY-00045o-5E for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:04 +0000 Date: Fri, 22 Nov 2013 21:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Add linux version of get_maintainer.pl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5550901619197298648==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5550901619197298648== Content-Type: text/plain commit 9205d0b4e713dd8852f28c5c3a016813d415357b Author: Don Slutz AuthorDate: Tue Nov 5 09:11:49 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:22 2013 +0000 Add linux version of get_maintainer.pl This is get_maintainer.pl from linux commit bbbe96ed899e8ebde1a12d28f10461eb8bef1074 Tag at time of commit: v3.9-2313-gbbbe96e Was released as: v3.10-0-g8bb495e Signed-off-by: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 2170 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 2170 insertions(+), 0 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl new file mode 100755 index 0000000..5e4fb14 --- /dev/null +++ b/scripts/get_maintainer.pl @@ -0,0 +1,2170 @@ +#!/usr/bin/perl -w +# (c) 2007, Joe Perches +# created from checkpatch.pl +# +# Print selected MAINTAINERS information for +# the files modified in a patch or for a file +# +# usage: perl scripts/get_maintainer.pl [OPTIONS] +# perl scripts/get_maintainer.pl [OPTIONS] -f +# +# Licensed under the terms of the GNU GPL License version 2 + +use strict; + +my $P = $0; +my $V = '0.26'; + +use Getopt::Long qw(:config no_auto_abbrev); + +my $lk_path = "./"; +my $email = 1; +my $email_usename = 1; +my $email_maintainer = 1; +my $email_list = 1; +my $email_subscriber_list = 0; +my $email_git_penguin_chiefs = 0; +my $email_git = 0; +my $email_git_all_signature_types = 0; +my $email_git_blame = 0; +my $email_git_blame_signatures = 1; +my $email_git_fallback = 1; +my $email_git_min_signatures = 1; +my $email_git_max_maintainers = 5; +my $email_git_min_percent = 5; +my $email_git_since = "1-year-ago"; +my $email_hg_since = "-365"; +my $interactive = 0; +my $email_remove_duplicates = 1; +my $email_use_mailmap = 1; +my $output_multiline = 1; +my $output_separator = ", "; +my $output_roles = 0; +my $output_rolestats = 1; +my $scm = 0; +my $web = 0; +my $subsystem = 0; +my $status = 0; +my $keywords = 1; +my $sections = 0; +my $file_emails = 0; +my $from_filename = 0; +my $pattern_depth = 0; +my $version = 0; +my $help = 0; + +my $vcs_used = 0; + +my $exit = 0; + +my %commit_author_hash; +my %commit_signer_hash; + +my @penguin_chief = (); +push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org"); +#Andrew wants in on most everything - 2009/01/14 +#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org"); + +my @penguin_chief_names = (); +foreach my $chief (@penguin_chief) { + if ($chief =~ m/^(.*):(.*)/) { + my $chief_name = $1; + my $chief_addr = $2; + push(@penguin_chief_names, $chief_name); + } +} +my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)"; + +# Signature types of people who are either +# a) responsible for the code in question, or +# b) familiar enough with it to give relevant feedback +my @signature_tags = (); +push(@signature_tags, "Signed-off-by:"); +push(@signature_tags, "Reviewed-by:"); +push(@signature_tags, "Acked-by:"); + +my $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; + +# rfc822 email address - preloaded methods go here. +my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; +my $rfc822_char = '[\\000-\\377]'; + +# VCS command support: class-like functions and strings + +my %VCS_cmds; + +my %VCS_cmds_git = ( + "execute_cmd" => \&git_execute_cmd, + "available" => '(which("git") ne "") && (-d ".git")', + "find_signers_cmd" => + "git log --no-color --follow --since=\$email_git_since " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -- \$file", + "find_commit_signers_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -1 \$commit", + "find_commit_author_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n"' . + " -1 \$commit", + "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", + "blame_file_cmd" => "git blame -l \$file", + "commit_pattern" => "^GitCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([0-9a-f]+) ", + "author_pattern" => "^GitAuthor: (.*)", + "subject_pattern" => "^GitSubject: (.*)", +); + +my %VCS_cmds_hg = ( + "execute_cmd" => \&hg_execute_cmd, + "available" => '(which("hg") ne "") && (-d ".hg")', + "find_signers_cmd" => + "hg log --date=\$email_hg_since " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc}\\n'" . + " -- \$file", + "find_commit_signers_cmd" => + "hg log " . + "--template='HgSubject: {desc}\\n'" . + " -r \$commit", + "find_commit_author_cmd" => + "hg log " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc|firstline}\\n'" . + " -r \$commit", + "blame_range_cmd" => "", # not supported + "blame_file_cmd" => "hg blame -n \$file", + "commit_pattern" => "^HgCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([ 0-9a-f]+):", + "author_pattern" => "^HgAuthor: (.*)", + "subject_pattern" => "^HgSubject: (.*)", +); + +my $conf = which_conf(".get_maintainer.conf"); +if (-f $conf) { + my @conf_args; + open(my $conffile, '<', "$conf") + or warn "$P: Can't find a readable .get_maintainer.conf file $!\n"; + + while (<$conffile>) { + my $line = $_; + + $line =~ s/\s*\n?$//g; + $line =~ s/^\s*//g; + $line =~ s/\s+/ /g; + + next if ($line =~ m/^\s*#/); + next if ($line =~ m/^\s*$/); + + my @words = split(" ", $line); + foreach my $word (@words) { + last if ($word =~ m/^#/); + push (@conf_args, $word); + } + } + close($conffile); + unshift(@ARGV, @conf_args) if @conf_args; +} + +if (!GetOptions( + 'email!' => \$email, + 'git!' => \$email_git, + 'git-all-signature-types!' => \$email_git_all_signature_types, + 'git-blame!' => \$email_git_blame, + 'git-blame-signatures!' => \$email_git_blame_signatures, + 'git-fallback!' => \$email_git_fallback, + 'git-chief-penguins!' => \$email_git_penguin_chiefs, + 'git-min-signatures=i' => \$email_git_min_signatures, + 'git-max-maintainers=i' => \$email_git_max_maintainers, + 'git-min-percent=i' => \$email_git_min_percent, + 'git-since=s' => \$email_git_since, + 'hg-since=s' => \$email_hg_since, + 'i|interactive!' => \$interactive, + 'remove-duplicates!' => \$email_remove_duplicates, + 'mailmap!' => \$email_use_mailmap, + 'm!' => \$email_maintainer, + 'n!' => \$email_usename, + 'l!' => \$email_list, + 's!' => \$email_subscriber_list, + 'multiline!' => \$output_multiline, + 'roles!' => \$output_roles, + 'rolestats!' => \$output_rolestats, + 'separator=s' => \$output_separator, + 'subsystem!' => \$subsystem, + 'status!' => \$status, + 'scm!' => \$scm, + 'web!' => \$web, + 'pattern-depth=i' => \$pattern_depth, + 'k|keywords!' => \$keywords, + 'sections!' => \$sections, + 'fe|file-emails!' => \$file_emails, + 'f|file' => \$from_filename, + 'v|version' => \$version, + 'h|help|usage' => \$help, + )) { + die "$P: invalid argument - use --help if necessary\n"; +} + +if ($help != 0) { + usage(); + exit 0; +} + +if ($version != 0) { + print("${P} ${V}\n"); + exit 0; +} + +if (-t STDIN && !@ARGV) { + # We're talking to a terminal, but have no command line arguments. + die "$P: missing patchfile or -f file - use --help if necessary\n"; +} + +$output_multiline = 0 if ($output_separator ne ", "); +$output_rolestats = 1 if ($interactive); +$output_roles = 1 if ($output_rolestats); + +if ($sections) { + $email = 0; + $email_list = 0; + $scm = 0; + $status = 0; + $subsystem = 0; + $web = 0; + $keywords = 0; + $interactive = 0; +} else { + my $selections = $email + $scm + $status + $subsystem + $web; + if ($selections == 0) { + die "$P: Missing required option: email, scm, status, subsystem or web\n"; + } +} + +if ($email && + ($email_maintainer + $email_list + $email_subscriber_list + + $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) { + die "$P: Please select at least 1 email option\n"; +} + +if (!top_of_kernel_tree($lk_path)) { + die "$P: The current directory does not appear to be " + . "a linux kernel source tree.\n"; +} + +## Read MAINTAINERS for type/value pairs + +my @typevalue = (); +my %keyword_hash; + +open (my $maint, '<', "${lk_path}MAINTAINERS") + or die "$P: Can't open MAINTAINERS: $!\n"; +while (<$maint>) { + my $line = $_; + + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + + ##Filename pattern matching + if ($type eq "F" || $type eq "X") { + $value =~ s@\.@\\\.@g; ##Convert . to \. + $value =~ s/\*/\.\*/g; ##Convert * to .* + $value =~ s/\?/\./g; ##Convert ? to . + ##if pattern is a directory and it lacks a trailing slash, add one + if ((-d $value)) { + $value =~ s@([^/])$@$1/@; + } + } elsif ($type eq "K") { + $keyword_hash{@typevalue} = $value; + } + push(@typevalue, "$type:$value"); + } elsif (!/^(\s)*$/) { + $line =~ s/\n$//g; + push(@typevalue, $line); + } +} +close($maint); + + +# +# Read mail address map +# + +my $mailmap; + +read_mailmap(); + +sub read_mailmap { + $mailmap = { + names => {}, + addresses => {} + }; + + return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + + open(my $mailmap_file, '<', "${lk_path}.mailmap") + or warn "$P: Can't open .mailmap: $!\n"; + + while (<$mailmap_file>) { + s/#.*$//; #strip comments + s/^\s+|\s+$//g; #trim + + next if (/^\s*$/); #skip empty lines + #entries have one of the following formats: + # name1 + # + # name1 + # name1 name2 + # (see man git-shortlog) + + if (/^([^<]+)<([^>]+)>$/) { + my $real_name = $1; + my $address = $2; + + $real_name =~ s/\s+$//; + ($real_name, $address) = parse_email("$real_name <$address>"); + $mailmap->{names}->{$address} = $real_name; + + } elsif (/^<([^>]+)>\s*<([^>]+)>$/) { + my $real_address = $1; + my $wrong_address = $2; + + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_address = $3; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + $mailmap->{names}->{$wrong_address} = $real_name; + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_name = $3; + my $wrong_address = $4; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + + $wrong_name =~ s/\s+$//; + ($wrong_name, $wrong_address) = + parse_email("$wrong_name <$wrong_address>"); + + my $wrong_email = format_email($wrong_name, $wrong_address, 1); + $mailmap->{names}->{$wrong_email} = $real_name; + $mailmap->{addresses}->{$wrong_email} = $real_address; + } + } + close($mailmap_file); +} + +## use the filenames on the command line or find the filenames in the patchfiles + +my @files = (); +my @range = (); +my @keyword_tvi = (); +my @file_emails = (); + +if (!@ARGV) { + push(@ARGV, "&STDIN"); +} + +foreach my $file (@ARGV) { + if ($file ne "&STDIN") { + ##if $file is a directory and it lacks a trailing slash, add one + if ((-d $file)) { + $file =~ s@([^/])$@$1/@; + } elsif (!(-f $file)) { + die "$P: file '${file}' not found\n"; + } + } + if ($from_filename) { + push(@files, $file); + if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) { + open(my $f, '<', $file) + or die "$P: Can't open $file: $!\n"; + my $text = do { local($/) ; <$f> }; + close($f); + if ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($text =~ m/$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + if ($file_emails) { + my @poss_addr = $text =~ m$[A-Za-zÀ-ÿ\"\' \,\.\+-]*\s*[\,]*\s*[\(\<\{]{0,1}[A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+\.[A-Za-z0-9]+[\)\>\}]{0,1}$g; + push(@file_emails, clean_file_emails(@poss_addr)); + } + } + } else { + my $file_cnt = @files; + my $lastfile; + + open(my $patch, "< $file") + or die "$P: Can't open $file: $!\n"; + + # We can check arbitrary information before the patch + # like the commit message, mail headers, etc... + # This allows us to match arbitrary keywords against any part + # of a git format-patch generated file (subject tags, etc...) + + my $patch_prefix = ""; #Parsing the intro + + while (<$patch>) { + my $patch_line = $_; + if (m/^\+\+\+\s+(\S+)/ or m/^---\s+(\S+)/) { + my $filename = $1; + $filename =~ s@^[^/]*/@@; + $filename =~ s@\n@@; + $lastfile = $filename; + push(@files, $filename); + $patch_prefix = "^[+-].*"; #Now parsing the actual patch + } elsif (m/^\@\@ -(\d+),(\d+)/) { + if ($email_git_blame) { + push(@range, "$lastfile:$1:$2"); + } + } elsif ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($patch_line =~ m/${patch_prefix}$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + } + close($patch); + + if ($file_cnt == @files) { + warn "$P: file '${file}' doesn't appear to be a patch. " + . "Add -f to options?\n"; + } + @files = sort_and_uniq(@files); + } +} + +@file_emails = uniq(@file_emails); + +my %email_hash_name; +my %email_hash_address; +my @email_to = (); +my %hash_list_to; +my @list_to = (); +my @scm = (); +my @web = (); +my @subsystem = (); +my @status = (); +my %deduplicate_name_hash = (); +my %deduplicate_address_hash = (); + +my @maintainers = get_maintainers(); + +if (@maintainers) { + @maintainers = merge_email(@maintainers); + output(@maintainers); +} + +if ($scm) { + @scm = uniq(@scm); + output(@scm); +} + +if ($status) { + @status = uniq(@status); + output(@status); +} + +if ($subsystem) { + @subsystem = uniq(@subsystem); + output(@subsystem); +} + +if ($web) { + @web = uniq(@web); + output(@web); +} + +exit($exit); + +sub range_is_maintained { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'S') { + if ($value =~ /(maintain|support)/i) { + return 1; + } + } + } + } + return 0; +} + +sub range_has_maintainer { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'M') { + return 1; + } + } + } + return 0; +} + +sub get_maintainers { + %email_hash_name = (); + %email_hash_address = (); + %commit_author_hash = (); + %commit_signer_hash = (); + @email_to = (); + %hash_list_to = (); + @list_to = (); + @scm = (); + @web = (); + @subsystem = (); + @status = (); + %deduplicate_name_hash = (); + %deduplicate_address_hash = (); + if ($email_git_all_signature_types) { + $signature_pattern = "(.+?)[Bb][Yy]:"; + } else { + $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; + } + + # Find responsible parties + + my %exact_pattern_match_hash = (); + + foreach my $file (@files) { + + my %hash; + my $tvi = find_first_section(); + while ($tvi < @typevalue) { + my $start = find_starting_index($tvi); + my $end = find_ending_index($tvi); + my $exclude = 0; + my $i; + + #Do not match excluded file patterns + + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'X') { + if (file_match_pattern($file, $value)) { + $exclude = 1; + last; + } + } + } + } + + if (!$exclude) { + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'F') { + if (file_match_pattern($file, $value)) { + my $value_pd = ($value =~ tr@/@@); + my $file_pd = ($file =~ tr@/@@); + $value_pd++ if (substr($value,-1,1) ne "/"); + $value_pd = -1 if ($value =~ /^\.\*/); + if ($value_pd >= $file_pd && + range_is_maintained($start, $end) && + range_has_maintainer($start, $end)) { + $exact_pattern_match_hash{$file} = 1; + } + if ($pattern_depth == 0 || + (($file_pd - $value_pd) < $pattern_depth)) { + $hash{$tvi} = $value_pd; + } + } + } elsif ($type eq 'N') { + if ($file =~ m/$value/x) { + $hash{$tvi} = 0; + } + } + } + } + } + $tvi = $end + 1; + } + + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + add_categories($line); + if ($sections) { + my $i; + my $start = find_starting_index($line); + my $end = find_ending_index($line); + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ /^[FX]:/) { ##Restore file patterns + $line =~ s/([^\\])\.([^\*])/$1\?$2/g; + $line =~ s/([^\\])\.$/$1\?/g; ##Convert . back to ? + $line =~ s/\\\./\./g; ##Convert \. to . + $line =~ s/\.\*/\*/g; ##Convert .* to * + } + $line =~ s/^([A-Z]):/$1:\t/g; + print("$line\n"); + } + print("\n"); + } + } + } + + if ($keywords) { + @keyword_tvi = sort_and_uniq(@keyword_tvi); + foreach my $line (@keyword_tvi) { + add_categories($line); + } + } + + foreach my $email (@email_to, @list_to) { + $email->[0] = deduplicate_email($email->[0]); + } + + foreach my $file (@files) { + if ($email && + ($email_git || ($email_git_fallback && + !$exact_pattern_match_hash{$file}))) { + vcs_file_signoffs($file); + } + if ($email && $email_git_blame) { + vcs_file_blame($file); + } + } + + if ($email) { + foreach my $chief (@penguin_chief) { + if ($chief =~ m/^(.*):(.*)/) { + my $email_address; + + $email_address = format_email($1, $2, $email_usename); + if ($email_git_penguin_chiefs) { + push(@email_to, [$email_address, 'chief penguin']); + } else { + @email_to = grep($_->[0] !~ /${email_address}/, @email_to); + } + } + } + + foreach my $email (@file_emails) { + my ($name, $address) = parse_email($email); + + my $tmp_email = format_email($name, $address, $email_usename); + push_email_address($tmp_email, ''); + add_role($tmp_email, 'in file'); + } + } + + my @to = (); + if ($email || $email_list) { + if ($email) { + @to = (@to, @email_to); + } + if ($email_list) { + @to = (@to, @list_to); + } + } + + if ($interactive) { + @to = interactive_get_maintainers(\@to); + } + + return @to; +} + +sub file_match_pattern { + my ($file, $pattern) = @_; + if (substr($pattern, -1) eq "/") { + if ($file =~ m@^$pattern@) { + return 1; + } + } else { + if ($file =~ m@^$pattern@) { + my $s1 = ($file =~ tr@/@@); + my $s2 = ($pattern =~ tr@/@@); + if ($s1 == $s2) { + return 1; + } + } + } + return 0; +} + +sub usage { + print < print email address(es) if any + --git => include recent git \*-by: signers + --git-all-signature-types => include signers regardless of signature type + or use only ${signature_pattern} signers (default: $email_git_all_signature_types) + --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback) + --git-chief-penguins => include ${penguin_chiefs} + --git-min-signatures => number of signatures required (default: $email_git_min_signatures) + --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers) + --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent) + --git-blame => use git blame to find modified commits for patch or file + --git-since => git history to use (default: $email_git_since) + --hg-since => hg history to use (default: $email_hg_since) + --interactive => display a menu (mostly useful if used with the --git option) + --m => include maintainer(s) if any + --n => include name 'Full Name ' + --l => include list(s) if any + --s => include subscriber only list(s) if any + --remove-duplicates => minimize duplicate email names/addresses + --roles => show roles (status:subsystem, git-signer, list, etc...) + --rolestats => show roles and statistics (commits/total_commits, %) + --file-emails => add email addresses found in -f file (default: 0 (off)) + --scm => print SCM tree(s) if any + --status => print status if any + --subsystem => print subsystem name if any + --web => print website(s) if any + +Output type options: + --separator [, ] => separator for multiple entries on 1 line + using --separator also sets --nomultiline if --separator is not [, ] + --multiline => print 1 entry per line + +Other options: + --pattern-depth => Number of pattern directory traversals (default: 0 (all)) + --keywords => scan patch for keywords (default: $keywords) + --sections => print all of the subsystem sections with pattern matches + --mailmap => use .mailmap file (default: $email_use_mailmap) + --version => show version + --help => show this help information + +Default options: + [--email --nogit --git-fallback --m --n --l --multiline -pattern-depth=0 + --remove-duplicates --rolestats] + +Notes: + Using "-f directory" may give unexpected results: + Used with "--git", git signators for _all_ files in and below + directory are examined as git recurses directories. + Any specified X: (exclude) pattern matches are _not_ ignored. + Used with "--nogit", directory is used as a pattern match, + no individual file within the directory or subdirectory + is matched. + Used with "--git-blame", does not iterate all files in directory + Using "--git-blame" is slow and may add old committers and authors + that are no longer active maintainers to the output. + Using "--roles" or "--rolestats" with git send-email --cc-cmd or any + other automated tools that expect only ["name"] + may not work because of additional output after . + Using "--rolestats" and "--git-blame" shows the #/total=% commits, + not the percentage of the entire file authored. # of commits is + not a good measure of amount of code authored. 1 major commit may + contain a thousand lines, 5 trivial commits may modify a single line. + If git is not installed, but mercurial (hg) is installed and an .hg + repository exists, the following options apply to mercurial: + --git, + --git-min-signatures, --git-max-maintainers, --git-min-percent, and + --git-blame + Use --hg-since not --git-since to control date selection + File ".get_maintainer.conf", if it exists in the linux kernel source root + directory, can change whatever get_maintainer defaults are desired. + Entries in this file can be any command line argument. + This file is prepended to any additional command line arguments. + Multiple lines and # comments are allowed. +EOT +} + +sub top_of_kernel_tree { + my ($lk_path) = @_; + + if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { + $lk_path .= "/"; + } + if ( (-f "${lk_path}COPYING") + && (-f "${lk_path}CREDITS") + && (-f "${lk_path}Kbuild") + && (-f "${lk_path}MAINTAINERS") + && (-f "${lk_path}Makefile") + && (-f "${lk_path}README") + && (-d "${lk_path}Documentation") + && (-d "${lk_path}arch") + && (-d "${lk_path}include") + && (-d "${lk_path}drivers") + && (-d "${lk_path}fs") + && (-d "${lk_path}init") + && (-d "${lk_path}ipc") + && (-d "${lk_path}kernel") + && (-d "${lk_path}lib") + && (-d "${lk_path}scripts")) { + return 1; + } + return 0; +} + +sub parse_email { + my ($formatted_email) = @_; + + my $name = ""; + my $address = ""; + + if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) { + $name = $1; + $address = $2; + } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) { + $address = $1; + } elsif ($formatted_email =~ /^(.+\@\S*).*$/) { + $address = $1; + } + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?"; + } + } else { + $formatted_email = $address; + } + + return $formatted_email; +} + +sub find_first_section { + my $index = 0; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub find_starting_index { + my ($index) = @_; + + while ($index > 0) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index--; + } + + return $index; +} + +sub find_ending_index { + my ($index) = @_; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub get_maintainer_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $role = "unknown"; + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(\C):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "S") { + $role = $pvalue; + } + } + } + + $role = lc($role); + if ($role eq "supported") { + $role = "supporter"; + } elsif ($role eq "maintained") { + $role = "maintainer"; + } elsif ($role eq "odd fixes") { + $role = "odd fixer"; + } elsif ($role eq "orphan") { + $role = "orphan minder"; + } elsif ($role eq "obsolete") { + $role = "obsolete minder"; + } elsif ($role eq "buried alive in reporters") { + $role = "chief penguin"; + } + + return $role . ":" . $subsystem; +} + +sub get_list_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + + if ($subsystem eq "THE REST") { + $subsystem = ""; + } + + return $subsystem; +} + +sub add_categories { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + push(@subsystem, $typevalue[$start]); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(\C):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "L") { + my $list_address = $pvalue; + my $list_additional = ""; + my $list_role = get_list_role($i); + + if ($list_role ne "") { + $list_role = ":" . $list_role; + } + if ($list_address =~ m/([^\s]+)\s+(.*)$/) { + $list_address = $1; + $list_additional = $2; + } + if ($list_additional =~ m/subscribers-only/) { + if ($email_subscriber_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + push(@list_to, [$list_address, + "subscriber list${list_role}"]); + } + } + } else { + if ($email_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + if ($list_additional =~ m/moderated/) { + push(@list_to, [$list_address, + "moderated list${list_role}"]); + } else { + push(@list_to, [$list_address, + "open list${list_role}"]); + } + } + } + } + } elsif ($ptype eq "M") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(\C):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_maintainer) { + my $role = get_maintainer_role($i); + push_email_addresses($pvalue, $role); + } + } elsif ($ptype eq "T") { + push(@scm, $pvalue); + } elsif ($ptype eq "W") { + push(@web, $pvalue); + } elsif ($ptype eq "S") { + push(@status, $pvalue); + } + } + } +} + +sub email_inuse { + my ($name, $address) = @_; + + return 1 if (($name eq "") && ($address eq "")); + return 1 if (($name ne "") && exists($email_hash_name{lc($name)})); + return 1 if (($address ne "") && exists($email_hash_address{lc($address)})); + + return 0; +} + +sub push_email_address { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + + if ($address eq "") { + return 0; + } + + if (!$email_remove_duplicates) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + } elsif (!email_inuse($name, $address)) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + $email_hash_name{lc($name)}++ if ($name ne ""); + $email_hash_address{lc($address)}++; + } + + return 1; +} + +sub push_email_addresses { + my ($address, $role) = @_; + + my @address_list = (); + + if (rfc822_valid($address)) { + push_email_address($address, $role); + } elsif (@address_list = rfc822_validlist($address)) { + my $array_count = shift(@address_list); + while (my $entry = shift(@address_list)) { + push_email_address($entry, $role); + } + } else { + if (!push_email_address($address, $role)) { + warn("Invalid MAINTAINERS address: '" . $address . "'\n"); + } + } +} + +sub add_role { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, $email_usename); + + foreach my $entry (@email_to) { + if ($email_remove_duplicates) { + my ($entry_name, $entry_address) = parse_email($entry->[0]); + if (($name eq $entry_name || $address eq $entry_address) + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } else { + if ($email eq $entry->[0] + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } + } +} + +sub which { + my ($bin) = @_; + + foreach my $path (split(/:/, $ENV{PATH})) { + if (-e "$path/$bin") { + return "$path/$bin"; + } + } + + return ""; +} + +sub which_conf { + my ($conf) = @_; + + foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) { + if (-e "$path/$conf") { + return "$path/$conf"; + } + } + + return ""; +} + +sub mailmap_email { + my ($line) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, 1); + my $real_name = $name; + my $real_address = $address; + + if (exists $mailmap->{names}->{$email} || + exists $mailmap->{addresses}->{$email}) { + if (exists $mailmap->{names}->{$email}) { + $real_name = $mailmap->{names}->{$email}; + } + if (exists $mailmap->{addresses}->{$email}) { + $real_address = $mailmap->{addresses}->{$email}; + } + } else { + if (exists $mailmap->{names}->{$address}) { + $real_name = $mailmap->{names}->{$address}; + } + if (exists $mailmap->{addresses}->{$address}) { + $real_address = $mailmap->{addresses}->{$address}; + } + } + return format_email($real_name, $real_address, 1); +} + +sub mailmap { + my (@addresses) = @_; + + my @mapped_emails = (); + foreach my $line (@addresses) { + push(@mapped_emails, mailmap_email($line)); + } + merge_by_realname(@mapped_emails) if ($email_use_mailmap); + return @mapped_emails; +} + +sub merge_by_realname { + my %address_map; + my (@emails) = @_; + + foreach my $email (@emails) { + my ($name, $address) = parse_email($email); + if (exists $address_map{$name}) { + $address = $address_map{$name}; + $email = format_email($name, $address, 1); + } else { + $address_map{$name} = $address; + } + } +} + +sub git_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + $output =~ s/^\s*//gm; + @lines = split("\n", $output); + + return @lines; +} + +sub hg_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + @lines = split("\n", $output); + + return @lines; +} + +sub extract_formatted_signatures { + my (@signature_lines) = @_; + + my @type = @signature_lines; + + s/\s*(.*):.*/$1/ for (@type); + + # cut -f2- -d":" + s/\s*.*:\s*(.+)\s*/$1/ for (@signature_lines); + +## Reformat email addresses (with names) to avoid badly written signatures + + foreach my $signer (@signature_lines) { + $signer = deduplicate_email($signer); + } + + return (\@type, \@signature_lines); +} + +sub vcs_find_signers { + my ($cmd) = @_; + my $commits; + my @lines = (); + my @signatures = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + my $pattern = $VCS_cmds{"commit_pattern"}; + + $commits = grep(/$pattern/, @lines); # of commits + + @signatures = grep(/^[ \t]*${signature_pattern}.*\@.*$/, @lines); + + return (0, @signatures) if !@signatures; + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + if (!$email_git_penguin_chiefs) { + @signatures = grep(!/${penguin_chiefs}/i, @signatures); + } + + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + + return ($commits, @$signers_ref); +} + +sub vcs_find_author { + my ($cmd) = @_; + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + if (!$email_git_penguin_chiefs) { + @lines = grep(!/${penguin_chiefs}/i, @lines); + } + + return @lines if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + my ($name, $address) = parse_email($author); + $author = format_email($name, $address, 1); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + return @authors; +} + +sub vcs_save_commits { + my ($cmd) = @_; + my @lines = (); + my @commits = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) { + push(@commits, $1); + } + } + + return @commits; +} + +sub vcs_blame { + my ($file) = @_; + my $cmd; + my @commits = (); + + return @commits if (!(-f $file)); + + if (@range && $VCS_cmds{"blame_range_cmd"} eq "") { + my @all_commits = (); + + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @all_commits = vcs_save_commits($cmd); + + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) { + push(@commits, $all_commits[$i]); + } + } + } elsif (@range) { + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + $cmd = $VCS_cmds{"blame_range_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + push(@commits, vcs_save_commits($cmd)); + } + } else { + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @commits = vcs_save_commits($cmd); + } + + foreach my $commit (@commits) { + $commit =~ s/^\^//g; + } + + return @commits; +} + +my $printed_novcs = 0; +sub vcs_exists { + %VCS_cmds = %VCS_cmds_git; + return 1 if eval $VCS_cmds{"available"}; + %VCS_cmds = %VCS_cmds_hg; + return 2 if eval $VCS_cmds{"available"}; + %VCS_cmds = (); + if (!$printed_novcs) { + warn("$P: No supported VCS found. Add --nogit to options?\n"); + warn("Using a git repository produces better results.\n"); + warn("Try Linus Torvalds' latest git repository using:\n"); + warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n"); + $printed_novcs = 1; + } + return 0; +} + +sub vcs_is_git { + vcs_exists(); + return $vcs_used == 1; +} + +sub vcs_is_hg { + return $vcs_used == 2; +} + +sub interactive_get_maintainers { + my ($list_ref) = @_; + my @list = @$list_ref; + + vcs_exists(); + + my %selected; + my %authored; + my %signed; + my $count = 0; + my $maintained = 0; + foreach my $entry (@list) { + $maintained = 1 if ($entry->[1] =~ /^(maintainer|supporter)/i); + $selected{$count} = 1; + $authored{$count} = 0; + $signed{$count} = 0; + $count++; + } + + #menu loop + my $done = 0; + my $print_options = 0; + my $redraw = 1; + while (!$done) { + $count = 0; + if ($redraw) { + printf STDERR "\n%1s %2s %-65s", + "*", "#", "email/list and role:stats"; + if ($email_git || + ($email_git_fallback && !$maintained) || + $email_git_blame) { + print STDERR "auth sign"; + } + print STDERR "\n"; + foreach my $entry (@list) { + my $email = $entry->[0]; + my $role = $entry->[1]; + my $sel = ""; + $sel = "*" if ($selected{$count}); + my $commit_author = $commit_author_hash{$email}; + my $commit_signer = $commit_signer_hash{$email}; + my $authored = 0; + my $signed = 0; + $authored++ for (@{$commit_author}); + $signed++ for (@{$commit_signer}); + printf STDERR "%1s %2d %-65s", $sel, $count + 1, $email; + printf STDERR "%4d %4d", $authored, $signed + if ($authored > 0 || $signed > 0); + printf STDERR "\n %s\n", $role; + if ($authored{$count}) { + my $commit_author = $commit_author_hash{$email}; + foreach my $ref (@{$commit_author}) { + print STDERR " Author: @{$ref}[1]\n"; + } + } + if ($signed{$count}) { + my $commit_signer = $commit_signer_hash{$email}; + foreach my $ref (@{$commit_signer}) { + print STDERR " @{$ref}[2]: @{$ref}[1]\n"; + } + } + + $count++; + } + } + my $date_ref = \$email_git_since; + $date_ref = \$email_hg_since if (vcs_is_hg()); + if ($print_options) { + $print_options = 0; + if (vcs_exists()) { + print STDERR <; + chomp($input); + + $redraw = 1; + my $rerun = 0; + my @wish = split(/[, ]+/, $input); + foreach my $nr (@wish) { + $nr = lc($nr); + my $sel = substr($nr, 0, 1); + my $str = substr($nr, 1); + my $val = 0; + $val = $1 if $str =~ /^(\d+)$/; + + if ($sel eq "y") { + $interactive = 0; + $done = 1; + $output_rolestats = 0; + $output_roles = 0; + last; + } elsif ($nr =~ /^\d+$/ && $nr > 0 && $nr <= $count) { + $selected{$nr - 1} = !$selected{$nr - 1}; + } elsif ($sel eq "*" || $sel eq '^') { + my $toggle = 0; + $toggle = 1 if ($sel eq '*'); + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = $toggle; + } + } elsif ($sel eq "0") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i}; + } + } elsif ($sel eq "t") { + if (lc($str) eq "m") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(maintainer|supporter)/i); + } + } elsif (lc($str) eq "g") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(author|commit|signer)/i); + } + } elsif (lc($str) eq "l") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(open list)/i); + } + } elsif (lc($str) eq "s") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(subscriber list)/i); + } + } + } elsif ($sel eq "a") { + if ($val > 0 && $val <= $count) { + $authored{$val - 1} = !$authored{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $authored{$i} = $toggle; + } + } + } elsif ($sel eq "s") { + if ($val > 0 && $val <= $count) { + $signed{$val - 1} = !$signed{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $signed{$i} = $toggle; + } + } + } elsif ($sel eq "o") { + $print_options = 1; + $redraw = 1; + } elsif ($sel eq "g") { + if ($str eq "f") { + bool_invert(\$email_git_fallback); + } else { + bool_invert(\$email_git); + } + $rerun = 1; + } elsif ($sel eq "b") { + if ($str eq "s") { + bool_invert(\$email_git_blame_signatures); + } else { + bool_invert(\$email_git_blame); + } + $rerun = 1; + } elsif ($sel eq "c") { + if ($val > 0) { + $email_git_min_signatures = $val; + $rerun = 1; + } + } elsif ($sel eq "x") { + if ($val > 0) { + $email_git_max_maintainers = $val; + $rerun = 1; + } + } elsif ($sel eq "%") { + if ($str ne "" && $val >= 0) { + $email_git_min_percent = $val; + $rerun = 1; + } + } elsif ($sel eq "d") { + if (vcs_is_git()) { + $email_git_since = $str; + } elsif (vcs_is_hg()) { + $email_hg_since = $str; + } + $rerun = 1; + } elsif ($sel eq "t") { + bool_invert(\$email_git_all_signature_types); + $rerun = 1; + } elsif ($sel eq "f") { + bool_invert(\$file_emails); + $rerun = 1; + } elsif ($sel eq "r") { + bool_invert(\$email_remove_duplicates); + $rerun = 1; + } elsif ($sel eq "m") { + bool_invert(\$email_use_mailmap); + read_mailmap(); + $rerun = 1; + } elsif ($sel eq "k") { + bool_invert(\$keywords); + $rerun = 1; + } elsif ($sel eq "p") { + if ($str ne "" && $val >= 0) { + $pattern_depth = $val; + $rerun = 1; + } + } elsif ($sel eq "h" || $sel eq "?") { + print STDERR <[0]; + $address = $deduplicate_name_hash{lc($name)}->[1]; + $matched = 1; + } elsif ($deduplicate_address_hash{lc($address)}) { + $name = $deduplicate_address_hash{lc($address)}->[0]; + $address = $deduplicate_address_hash{lc($address)}->[1]; + $matched = 1; + } + if (!$matched) { + $deduplicate_name_hash{lc($name)} = [ $name, $address ]; + $deduplicate_address_hash{lc($address)} = [ $name, $address ]; + } + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + return $email; +} + +sub save_commits_by_author { + my (@lines) = @_; + + my @authors = (); + my @commits = (); + my @subjects = (); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + push(@commits, $1) if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + push(@subjects, $1) if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + } + + for (my $i = 0; $i < @authors; $i++) { + my $exists = 0; + foreach my $ref(@{$commit_author_hash{$authors[$i]}}) { + if (@{$ref}[0] eq $commits[$i] && + @{$ref}[1] eq $subjects[$i]) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_author_hash{$authors[$i]}}, + [ ($commits[$i], $subjects[$i]) ]); + } + } +} + +sub save_commits_by_signer { + my (@lines) = @_; + + my $commit = ""; + my $subject = ""; + + foreach my $line (@lines) { + $commit = $1 if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + $subject = $1 if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + if ($line =~ /^[ \t]*${signature_pattern}.*\@.*$/) { + my @signatures = ($line); + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + my @types = @$types_ref; + my @signers = @$signers_ref; + + my $type = $types[0]; + my $signer = $signers[0]; + + $signer = deduplicate_email($signer); + + my $exists = 0; + foreach my $ref(@{$commit_signer_hash{$signer}}) { + if (@{$ref}[0] eq $commit && + @{$ref}[1] eq $subject && + @{$ref}[2] eq $type) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_signer_hash{$signer}}, + [ ($commit, $subject, $type) ]); + } + } + } +} + +sub vcs_assign { + my ($role, $divisor, @lines) = @_; + + my %hash; + my $count = 0; + + return if (@lines <= 0); + + if ($divisor <= 0) { + warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n"); + $divisor = 1; + } + + @lines = mailmap(@lines); + + return if (@lines <= 0); + + @lines = sort(@lines); + + # uniq -c + $hash{$_}++ for @lines; + + # sort -rn + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + my $sign_offs = $hash{$line}; + my $percent = $sign_offs * 100 / $divisor; + + $percent = 100 if ($percent > 100); + $count++; + last if ($sign_offs < $email_git_min_signatures || + $count > $email_git_max_maintainers || + $percent < $email_git_min_percent); + push_email_address($line, ''); + if ($output_rolestats) { + my $fmt_percent = sprintf("%.0f", $percent); + add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%"); + } else { + add_role($line, $role); + } + } +} + +sub vcs_file_signoffs { + my ($file) = @_; + + my @signers = (); + my $commits; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + my $cmd = $VCS_cmds{"find_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd + + ($commits, @signers) = vcs_find_signers($cmd); + + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + + vcs_assign("commit_signer", $commits, @signers); +} + +sub vcs_file_blame { + my ($file) = @_; + + my @signers = (); + my @all_commits = (); + my @commits = (); + my $total_commits; + my $total_lines; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + @all_commits = vcs_blame($file); + @commits = uniq(@all_commits); + $total_commits = @commits; + $total_lines = @all_commits; + + if ($email_git_blame_signatures) { + if (vcs_is_hg()) { + my $commit_count; + my @commit_signers = (); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } else { + foreach my $commit (@commits) { + my $commit_count; + my @commit_signers = (); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } + } + } + + if ($from_filename) { + if ($output_rolestats) { + my @blame_signers; + if (vcs_is_hg()) {{ # Double brace for last exit + my $commit_count; + my @commit_signers = (); + @commits = uniq(@commits); + @commits = sort(@commits); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + if (!$email_git_penguin_chiefs) { + @lines = grep(!/${penguin_chiefs}/i, @lines); + } + + last if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + push(@signers, @authors); + }} + else { + foreach my $commit (@commits) { + my $i; + my $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + my @author = vcs_find_author($cmd); + next if !@author; + + my $formatted_author = deduplicate_email($author[0]); + + my $count = grep(/$commit/, @all_commits); + for ($i = 0; $i < $count ; $i++) { + push(@blame_signers, $formatted_author); + } + } + } + if (@blame_signers) { + vcs_assign("authored lines", $total_lines, @blame_signers); + } + } + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("commits", $total_commits, @signers); + } else { + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("modified commits", $total_commits, @signers); + } +} + +sub uniq { + my (@parms) = @_; + + my %saw; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub sort_and_uniq { + my (@parms) = @_; + + my %saw; + @parms = sort @parms; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub clean_file_emails { + my (@file_emails) = @_; + my @fmt_emails = (); + + foreach my $email (@file_emails) { + $email =~ s/[\(\<\{]{0,1}([A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+)[\)\>\}]{0,1}/\<$1\>/g; + my ($name, $address) = parse_email($email); + if ($name eq '"[,\.]"') { + $name = ""; + } + + my @nw = split(/[^A-Za-zÀ-ÿ\'\,\.\+-]/, $name); + if (@nw > 2) { + my $first = $nw[@nw - 3]; + my $middle = $nw[@nw - 2]; + my $last = $nw[@nw - 1]; + + if (((length($first) == 1 && $first =~ m/[A-Za-z]/) || + (length($first) == 2 && substr($first, -1) eq ".")) || + (length($middle) == 1 || + (length($middle) == 2 && substr($middle, -1) eq "."))) { + $name = "$first $middle $last"; + } else { + $name = "$middle $last"; + } + } + + if (substr($name, -1) =~ /[,\.]/) { + $name = substr($name, 0, length($name) - 1); + } elsif (substr($name, -2) =~ /[,\.]"/) { + $name = substr($name, 0, length($name) - 2) . '"'; + } + + if (substr($name, 0, 1) =~ /[,\.]/) { + $name = substr($name, 1, length($name) - 1); + } elsif (substr($name, 0, 2) =~ /"[,\.]/) { + $name = '"' . substr($name, 2, length($name) - 2); + } + + my $fmt_email = format_email($name, $address, $email_usename); + push(@fmt_emails, $fmt_email); + } + return @fmt_emails; +} + +sub merge_email { + my @lines; + my %saw; + + for (@_) { + my ($address, $role) = @$_; + if (!$saw{$address}) { + if ($output_roles) { + push(@lines, "$address ($role)"); + } else { + push(@lines, $address); + } + $saw{$address} = 1; + } + } + + return @lines; +} + +sub output { + my (@parms) = @_; + + if ($output_multiline) { + foreach my $line (@parms) { + print("${line}\n"); + } + } else { + print(join($output_separator, @parms)); + print("\n"); + } +} + +my $rfc822re; + +sub make_rfc822re { +# Basic lexical tokens are specials, domain_literal, quoted_string, atom, and +# comment. We must allow for rfc822_lwsp (or comments) after each of these. +# This regexp will only work on addresses which have had comments stripped +# and replaced with rfc822_lwsp. + + my $specials = '()<>@,;:\\\\".\\[\\]'; + my $controls = '\\000-\\037\\177'; + + my $dtext = "[^\\[\\]\\r\\\\]"; + my $domain_literal = "\\[(?:$dtext|\\\\.)*\\]$rfc822_lwsp*"; + + my $quoted_string = "\"(?:[^\\\"\\r\\\\]|\\\\.|$rfc822_lwsp)*\"$rfc822_lwsp*"; + +# Use zero-width assertion to spot the limit of an atom. A simple +# $rfc822_lwsp* causes the regexp engine to hang occasionally. + my $atom = "[^$specials $controls]+(?:$rfc822_lwsp+|\\Z|(?=[\\[\"$specials]))"; + my $word = "(?:$atom|$quoted_string)"; + my $localpart = "$word(?:\\.$rfc822_lwsp*$word)*"; + + my $sub_domain = "(?:$atom|$domain_literal)"; + my $domain = "$sub_domain(?:\\.$rfc822_lwsp*$sub_domain)*"; + + my $addr_spec = "$localpart\@$rfc822_lwsp*$domain"; + + my $phrase = "$word*"; + my $route = "(?:\@$domain(?:,\@$rfc822_lwsp*$domain)*:$rfc822_lwsp*)"; + my $route_addr = "\\<$rfc822_lwsp*$route?$addr_spec\\>$rfc822_lwsp*"; + my $mailbox = "(?:$addr_spec|$phrase$route_addr)"; + + my $group = "$phrase:$rfc822_lwsp*(?:$mailbox(?:,\\s*$mailbox)*)?;\\s*"; + my $address = "(?:$mailbox|$group)"; + + return "$rfc822_lwsp*$address"; +} + +sub rfc822_strip_comments { + my $s = shift; +# Recursively remove comments, and replace with a single space. The simpler +# regexps in the Email Addressing FAQ are imperfect - they will miss escaped +# chars in atoms, for example. + + while ($s =~ s/^((?:[^"\\]|\\.)* + (?:"(?:[^"\\]|\\.)*"(?:[^"\\]|\\.)*)*) + \((?:[^()\\]|\\.)*\)/$1 /osx) {} + return $s; +} + +# valid: returns true if the parameter is an RFC822 valid address +# +sub rfc822_valid { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + + return $s =~ m/^$rfc822re$/so && $s =~ m/^$rfc822_char*$/; +} + +# validlist: In scalar context, returns true if the parameter is an RFC822 +# valid list of addresses. +# +# In list context, returns an empty list on failure (an invalid +# address was found); otherwise a list whose first element is the +# number of addresses found and whose remaining elements are the +# addresses. This is needed to disambiguate failure (invalid) +# from success with no addresses found, because an empty string is +# a valid list. + +sub rfc822_validlist { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + # * null list items are valid according to the RFC + # * the '1' business is to aid in distinguishing failure from no results + + my @r; + if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so && + $s =~ m/^$rfc822_char*$/) { + while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) { + push(@r, $1); + } + return wantarray ? (scalar(@r), @r) : 1; + } + return wantarray ? () : 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5550901619197298648== 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 --===============5550901619197298648==-- From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLf-00081u-A6; Fri, 22 Nov 2013 21:33:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLd-00081p-Fc for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:10 +0000 Received: from [85.158.139.211:52443] by server-12.bemta-5.messagelabs.com id F0/12-30017-49DCF825; Fri, 22 Nov 2013 21:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385155984!3732671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26950 invoked from network); 22 Nov 2013 21:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLY-0004C8-BZ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLY-00045o-5E for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:04 +0000 Date: Fri, 22 Nov 2013 21:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Add linux version of get_maintainer.pl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5550901619197298648==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5550901619197298648== Content-Type: text/plain commit 9205d0b4e713dd8852f28c5c3a016813d415357b Author: Don Slutz AuthorDate: Tue Nov 5 09:11:49 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:22 2013 +0000 Add linux version of get_maintainer.pl This is get_maintainer.pl from linux commit bbbe96ed899e8ebde1a12d28f10461eb8bef1074 Tag at time of commit: v3.9-2313-gbbbe96e Was released as: v3.10-0-g8bb495e Signed-off-by: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 2170 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 2170 insertions(+), 0 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl new file mode 100755 index 0000000..5e4fb14 --- /dev/null +++ b/scripts/get_maintainer.pl @@ -0,0 +1,2170 @@ +#!/usr/bin/perl -w +# (c) 2007, Joe Perches +# created from checkpatch.pl +# +# Print selected MAINTAINERS information for +# the files modified in a patch or for a file +# +# usage: perl scripts/get_maintainer.pl [OPTIONS] +# perl scripts/get_maintainer.pl [OPTIONS] -f +# +# Licensed under the terms of the GNU GPL License version 2 + +use strict; + +my $P = $0; +my $V = '0.26'; + +use Getopt::Long qw(:config no_auto_abbrev); + +my $lk_path = "./"; +my $email = 1; +my $email_usename = 1; +my $email_maintainer = 1; +my $email_list = 1; +my $email_subscriber_list = 0; +my $email_git_penguin_chiefs = 0; +my $email_git = 0; +my $email_git_all_signature_types = 0; +my $email_git_blame = 0; +my $email_git_blame_signatures = 1; +my $email_git_fallback = 1; +my $email_git_min_signatures = 1; +my $email_git_max_maintainers = 5; +my $email_git_min_percent = 5; +my $email_git_since = "1-year-ago"; +my $email_hg_since = "-365"; +my $interactive = 0; +my $email_remove_duplicates = 1; +my $email_use_mailmap = 1; +my $output_multiline = 1; +my $output_separator = ", "; +my $output_roles = 0; +my $output_rolestats = 1; +my $scm = 0; +my $web = 0; +my $subsystem = 0; +my $status = 0; +my $keywords = 1; +my $sections = 0; +my $file_emails = 0; +my $from_filename = 0; +my $pattern_depth = 0; +my $version = 0; +my $help = 0; + +my $vcs_used = 0; + +my $exit = 0; + +my %commit_author_hash; +my %commit_signer_hash; + +my @penguin_chief = (); +push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org"); +#Andrew wants in on most everything - 2009/01/14 +#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org"); + +my @penguin_chief_names = (); +foreach my $chief (@penguin_chief) { + if ($chief =~ m/^(.*):(.*)/) { + my $chief_name = $1; + my $chief_addr = $2; + push(@penguin_chief_names, $chief_name); + } +} +my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)"; + +# Signature types of people who are either +# a) responsible for the code in question, or +# b) familiar enough with it to give relevant feedback +my @signature_tags = (); +push(@signature_tags, "Signed-off-by:"); +push(@signature_tags, "Reviewed-by:"); +push(@signature_tags, "Acked-by:"); + +my $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; + +# rfc822 email address - preloaded methods go here. +my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; +my $rfc822_char = '[\\000-\\377]'; + +# VCS command support: class-like functions and strings + +my %VCS_cmds; + +my %VCS_cmds_git = ( + "execute_cmd" => \&git_execute_cmd, + "available" => '(which("git") ne "") && (-d ".git")', + "find_signers_cmd" => + "git log --no-color --follow --since=\$email_git_since " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -- \$file", + "find_commit_signers_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -1 \$commit", + "find_commit_author_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n"' . + " -1 \$commit", + "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", + "blame_file_cmd" => "git blame -l \$file", + "commit_pattern" => "^GitCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([0-9a-f]+) ", + "author_pattern" => "^GitAuthor: (.*)", + "subject_pattern" => "^GitSubject: (.*)", +); + +my %VCS_cmds_hg = ( + "execute_cmd" => \&hg_execute_cmd, + "available" => '(which("hg") ne "") && (-d ".hg")', + "find_signers_cmd" => + "hg log --date=\$email_hg_since " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc}\\n'" . + " -- \$file", + "find_commit_signers_cmd" => + "hg log " . + "--template='HgSubject: {desc}\\n'" . + " -r \$commit", + "find_commit_author_cmd" => + "hg log " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc|firstline}\\n'" . + " -r \$commit", + "blame_range_cmd" => "", # not supported + "blame_file_cmd" => "hg blame -n \$file", + "commit_pattern" => "^HgCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([ 0-9a-f]+):", + "author_pattern" => "^HgAuthor: (.*)", + "subject_pattern" => "^HgSubject: (.*)", +); + +my $conf = which_conf(".get_maintainer.conf"); +if (-f $conf) { + my @conf_args; + open(my $conffile, '<', "$conf") + or warn "$P: Can't find a readable .get_maintainer.conf file $!\n"; + + while (<$conffile>) { + my $line = $_; + + $line =~ s/\s*\n?$//g; + $line =~ s/^\s*//g; + $line =~ s/\s+/ /g; + + next if ($line =~ m/^\s*#/); + next if ($line =~ m/^\s*$/); + + my @words = split(" ", $line); + foreach my $word (@words) { + last if ($word =~ m/^#/); + push (@conf_args, $word); + } + } + close($conffile); + unshift(@ARGV, @conf_args) if @conf_args; +} + +if (!GetOptions( + 'email!' => \$email, + 'git!' => \$email_git, + 'git-all-signature-types!' => \$email_git_all_signature_types, + 'git-blame!' => \$email_git_blame, + 'git-blame-signatures!' => \$email_git_blame_signatures, + 'git-fallback!' => \$email_git_fallback, + 'git-chief-penguins!' => \$email_git_penguin_chiefs, + 'git-min-signatures=i' => \$email_git_min_signatures, + 'git-max-maintainers=i' => \$email_git_max_maintainers, + 'git-min-percent=i' => \$email_git_min_percent, + 'git-since=s' => \$email_git_since, + 'hg-since=s' => \$email_hg_since, + 'i|interactive!' => \$interactive, + 'remove-duplicates!' => \$email_remove_duplicates, + 'mailmap!' => \$email_use_mailmap, + 'm!' => \$email_maintainer, + 'n!' => \$email_usename, + 'l!' => \$email_list, + 's!' => \$email_subscriber_list, + 'multiline!' => \$output_multiline, + 'roles!' => \$output_roles, + 'rolestats!' => \$output_rolestats, + 'separator=s' => \$output_separator, + 'subsystem!' => \$subsystem, + 'status!' => \$status, + 'scm!' => \$scm, + 'web!' => \$web, + 'pattern-depth=i' => \$pattern_depth, + 'k|keywords!' => \$keywords, + 'sections!' => \$sections, + 'fe|file-emails!' => \$file_emails, + 'f|file' => \$from_filename, + 'v|version' => \$version, + 'h|help|usage' => \$help, + )) { + die "$P: invalid argument - use --help if necessary\n"; +} + +if ($help != 0) { + usage(); + exit 0; +} + +if ($version != 0) { + print("${P} ${V}\n"); + exit 0; +} + +if (-t STDIN && !@ARGV) { + # We're talking to a terminal, but have no command line arguments. + die "$P: missing patchfile or -f file - use --help if necessary\n"; +} + +$output_multiline = 0 if ($output_separator ne ", "); +$output_rolestats = 1 if ($interactive); +$output_roles = 1 if ($output_rolestats); + +if ($sections) { + $email = 0; + $email_list = 0; + $scm = 0; + $status = 0; + $subsystem = 0; + $web = 0; + $keywords = 0; + $interactive = 0; +} else { + my $selections = $email + $scm + $status + $subsystem + $web; + if ($selections == 0) { + die "$P: Missing required option: email, scm, status, subsystem or web\n"; + } +} + +if ($email && + ($email_maintainer + $email_list + $email_subscriber_list + + $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) { + die "$P: Please select at least 1 email option\n"; +} + +if (!top_of_kernel_tree($lk_path)) { + die "$P: The current directory does not appear to be " + . "a linux kernel source tree.\n"; +} + +## Read MAINTAINERS for type/value pairs + +my @typevalue = (); +my %keyword_hash; + +open (my $maint, '<', "${lk_path}MAINTAINERS") + or die "$P: Can't open MAINTAINERS: $!\n"; +while (<$maint>) { + my $line = $_; + + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + + ##Filename pattern matching + if ($type eq "F" || $type eq "X") { + $value =~ s@\.@\\\.@g; ##Convert . to \. + $value =~ s/\*/\.\*/g; ##Convert * to .* + $value =~ s/\?/\./g; ##Convert ? to . + ##if pattern is a directory and it lacks a trailing slash, add one + if ((-d $value)) { + $value =~ s@([^/])$@$1/@; + } + } elsif ($type eq "K") { + $keyword_hash{@typevalue} = $value; + } + push(@typevalue, "$type:$value"); + } elsif (!/^(\s)*$/) { + $line =~ s/\n$//g; + push(@typevalue, $line); + } +} +close($maint); + + +# +# Read mail address map +# + +my $mailmap; + +read_mailmap(); + +sub read_mailmap { + $mailmap = { + names => {}, + addresses => {} + }; + + return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + + open(my $mailmap_file, '<', "${lk_path}.mailmap") + or warn "$P: Can't open .mailmap: $!\n"; + + while (<$mailmap_file>) { + s/#.*$//; #strip comments + s/^\s+|\s+$//g; #trim + + next if (/^\s*$/); #skip empty lines + #entries have one of the following formats: + # name1 + # + # name1 + # name1 name2 + # (see man git-shortlog) + + if (/^([^<]+)<([^>]+)>$/) { + my $real_name = $1; + my $address = $2; + + $real_name =~ s/\s+$//; + ($real_name, $address) = parse_email("$real_name <$address>"); + $mailmap->{names}->{$address} = $real_name; + + } elsif (/^<([^>]+)>\s*<([^>]+)>$/) { + my $real_address = $1; + my $wrong_address = $2; + + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_address = $3; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + $mailmap->{names}->{$wrong_address} = $real_name; + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_name = $3; + my $wrong_address = $4; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + + $wrong_name =~ s/\s+$//; + ($wrong_name, $wrong_address) = + parse_email("$wrong_name <$wrong_address>"); + + my $wrong_email = format_email($wrong_name, $wrong_address, 1); + $mailmap->{names}->{$wrong_email} = $real_name; + $mailmap->{addresses}->{$wrong_email} = $real_address; + } + } + close($mailmap_file); +} + +## use the filenames on the command line or find the filenames in the patchfiles + +my @files = (); +my @range = (); +my @keyword_tvi = (); +my @file_emails = (); + +if (!@ARGV) { + push(@ARGV, "&STDIN"); +} + +foreach my $file (@ARGV) { + if ($file ne "&STDIN") { + ##if $file is a directory and it lacks a trailing slash, add one + if ((-d $file)) { + $file =~ s@([^/])$@$1/@; + } elsif (!(-f $file)) { + die "$P: file '${file}' not found\n"; + } + } + if ($from_filename) { + push(@files, $file); + if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) { + open(my $f, '<', $file) + or die "$P: Can't open $file: $!\n"; + my $text = do { local($/) ; <$f> }; + close($f); + if ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($text =~ m/$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + if ($file_emails) { + my @poss_addr = $text =~ m$[A-Za-zÀ-ÿ\"\' \,\.\+-]*\s*[\,]*\s*[\(\<\{]{0,1}[A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+\.[A-Za-z0-9]+[\)\>\}]{0,1}$g; + push(@file_emails, clean_file_emails(@poss_addr)); + } + } + } else { + my $file_cnt = @files; + my $lastfile; + + open(my $patch, "< $file") + or die "$P: Can't open $file: $!\n"; + + # We can check arbitrary information before the patch + # like the commit message, mail headers, etc... + # This allows us to match arbitrary keywords against any part + # of a git format-patch generated file (subject tags, etc...) + + my $patch_prefix = ""; #Parsing the intro + + while (<$patch>) { + my $patch_line = $_; + if (m/^\+\+\+\s+(\S+)/ or m/^---\s+(\S+)/) { + my $filename = $1; + $filename =~ s@^[^/]*/@@; + $filename =~ s@\n@@; + $lastfile = $filename; + push(@files, $filename); + $patch_prefix = "^[+-].*"; #Now parsing the actual patch + } elsif (m/^\@\@ -(\d+),(\d+)/) { + if ($email_git_blame) { + push(@range, "$lastfile:$1:$2"); + } + } elsif ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($patch_line =~ m/${patch_prefix}$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + } + close($patch); + + if ($file_cnt == @files) { + warn "$P: file '${file}' doesn't appear to be a patch. " + . "Add -f to options?\n"; + } + @files = sort_and_uniq(@files); + } +} + +@file_emails = uniq(@file_emails); + +my %email_hash_name; +my %email_hash_address; +my @email_to = (); +my %hash_list_to; +my @list_to = (); +my @scm = (); +my @web = (); +my @subsystem = (); +my @status = (); +my %deduplicate_name_hash = (); +my %deduplicate_address_hash = (); + +my @maintainers = get_maintainers(); + +if (@maintainers) { + @maintainers = merge_email(@maintainers); + output(@maintainers); +} + +if ($scm) { + @scm = uniq(@scm); + output(@scm); +} + +if ($status) { + @status = uniq(@status); + output(@status); +} + +if ($subsystem) { + @subsystem = uniq(@subsystem); + output(@subsystem); +} + +if ($web) { + @web = uniq(@web); + output(@web); +} + +exit($exit); + +sub range_is_maintained { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'S') { + if ($value =~ /(maintain|support)/i) { + return 1; + } + } + } + } + return 0; +} + +sub range_has_maintainer { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'M') { + return 1; + } + } + } + return 0; +} + +sub get_maintainers { + %email_hash_name = (); + %email_hash_address = (); + %commit_author_hash = (); + %commit_signer_hash = (); + @email_to = (); + %hash_list_to = (); + @list_to = (); + @scm = (); + @web = (); + @subsystem = (); + @status = (); + %deduplicate_name_hash = (); + %deduplicate_address_hash = (); + if ($email_git_all_signature_types) { + $signature_pattern = "(.+?)[Bb][Yy]:"; + } else { + $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; + } + + # Find responsible parties + + my %exact_pattern_match_hash = (); + + foreach my $file (@files) { + + my %hash; + my $tvi = find_first_section(); + while ($tvi < @typevalue) { + my $start = find_starting_index($tvi); + my $end = find_ending_index($tvi); + my $exclude = 0; + my $i; + + #Do not match excluded file patterns + + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'X') { + if (file_match_pattern($file, $value)) { + $exclude = 1; + last; + } + } + } + } + + if (!$exclude) { + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(\C):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'F') { + if (file_match_pattern($file, $value)) { + my $value_pd = ($value =~ tr@/@@); + my $file_pd = ($file =~ tr@/@@); + $value_pd++ if (substr($value,-1,1) ne "/"); + $value_pd = -1 if ($value =~ /^\.\*/); + if ($value_pd >= $file_pd && + range_is_maintained($start, $end) && + range_has_maintainer($start, $end)) { + $exact_pattern_match_hash{$file} = 1; + } + if ($pattern_depth == 0 || + (($file_pd - $value_pd) < $pattern_depth)) { + $hash{$tvi} = $value_pd; + } + } + } elsif ($type eq 'N') { + if ($file =~ m/$value/x) { + $hash{$tvi} = 0; + } + } + } + } + } + $tvi = $end + 1; + } + + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + add_categories($line); + if ($sections) { + my $i; + my $start = find_starting_index($line); + my $end = find_ending_index($line); + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ /^[FX]:/) { ##Restore file patterns + $line =~ s/([^\\])\.([^\*])/$1\?$2/g; + $line =~ s/([^\\])\.$/$1\?/g; ##Convert . back to ? + $line =~ s/\\\./\./g; ##Convert \. to . + $line =~ s/\.\*/\*/g; ##Convert .* to * + } + $line =~ s/^([A-Z]):/$1:\t/g; + print("$line\n"); + } + print("\n"); + } + } + } + + if ($keywords) { + @keyword_tvi = sort_and_uniq(@keyword_tvi); + foreach my $line (@keyword_tvi) { + add_categories($line); + } + } + + foreach my $email (@email_to, @list_to) { + $email->[0] = deduplicate_email($email->[0]); + } + + foreach my $file (@files) { + if ($email && + ($email_git || ($email_git_fallback && + !$exact_pattern_match_hash{$file}))) { + vcs_file_signoffs($file); + } + if ($email && $email_git_blame) { + vcs_file_blame($file); + } + } + + if ($email) { + foreach my $chief (@penguin_chief) { + if ($chief =~ m/^(.*):(.*)/) { + my $email_address; + + $email_address = format_email($1, $2, $email_usename); + if ($email_git_penguin_chiefs) { + push(@email_to, [$email_address, 'chief penguin']); + } else { + @email_to = grep($_->[0] !~ /${email_address}/, @email_to); + } + } + } + + foreach my $email (@file_emails) { + my ($name, $address) = parse_email($email); + + my $tmp_email = format_email($name, $address, $email_usename); + push_email_address($tmp_email, ''); + add_role($tmp_email, 'in file'); + } + } + + my @to = (); + if ($email || $email_list) { + if ($email) { + @to = (@to, @email_to); + } + if ($email_list) { + @to = (@to, @list_to); + } + } + + if ($interactive) { + @to = interactive_get_maintainers(\@to); + } + + return @to; +} + +sub file_match_pattern { + my ($file, $pattern) = @_; + if (substr($pattern, -1) eq "/") { + if ($file =~ m@^$pattern@) { + return 1; + } + } else { + if ($file =~ m@^$pattern@) { + my $s1 = ($file =~ tr@/@@); + my $s2 = ($pattern =~ tr@/@@); + if ($s1 == $s2) { + return 1; + } + } + } + return 0; +} + +sub usage { + print < print email address(es) if any + --git => include recent git \*-by: signers + --git-all-signature-types => include signers regardless of signature type + or use only ${signature_pattern} signers (default: $email_git_all_signature_types) + --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback) + --git-chief-penguins => include ${penguin_chiefs} + --git-min-signatures => number of signatures required (default: $email_git_min_signatures) + --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers) + --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent) + --git-blame => use git blame to find modified commits for patch or file + --git-since => git history to use (default: $email_git_since) + --hg-since => hg history to use (default: $email_hg_since) + --interactive => display a menu (mostly useful if used with the --git option) + --m => include maintainer(s) if any + --n => include name 'Full Name ' + --l => include list(s) if any + --s => include subscriber only list(s) if any + --remove-duplicates => minimize duplicate email names/addresses + --roles => show roles (status:subsystem, git-signer, list, etc...) + --rolestats => show roles and statistics (commits/total_commits, %) + --file-emails => add email addresses found in -f file (default: 0 (off)) + --scm => print SCM tree(s) if any + --status => print status if any + --subsystem => print subsystem name if any + --web => print website(s) if any + +Output type options: + --separator [, ] => separator for multiple entries on 1 line + using --separator also sets --nomultiline if --separator is not [, ] + --multiline => print 1 entry per line + +Other options: + --pattern-depth => Number of pattern directory traversals (default: 0 (all)) + --keywords => scan patch for keywords (default: $keywords) + --sections => print all of the subsystem sections with pattern matches + --mailmap => use .mailmap file (default: $email_use_mailmap) + --version => show version + --help => show this help information + +Default options: + [--email --nogit --git-fallback --m --n --l --multiline -pattern-depth=0 + --remove-duplicates --rolestats] + +Notes: + Using "-f directory" may give unexpected results: + Used with "--git", git signators for _all_ files in and below + directory are examined as git recurses directories. + Any specified X: (exclude) pattern matches are _not_ ignored. + Used with "--nogit", directory is used as a pattern match, + no individual file within the directory or subdirectory + is matched. + Used with "--git-blame", does not iterate all files in directory + Using "--git-blame" is slow and may add old committers and authors + that are no longer active maintainers to the output. + Using "--roles" or "--rolestats" with git send-email --cc-cmd or any + other automated tools that expect only ["name"] + may not work because of additional output after . + Using "--rolestats" and "--git-blame" shows the #/total=% commits, + not the percentage of the entire file authored. # of commits is + not a good measure of amount of code authored. 1 major commit may + contain a thousand lines, 5 trivial commits may modify a single line. + If git is not installed, but mercurial (hg) is installed and an .hg + repository exists, the following options apply to mercurial: + --git, + --git-min-signatures, --git-max-maintainers, --git-min-percent, and + --git-blame + Use --hg-since not --git-since to control date selection + File ".get_maintainer.conf", if it exists in the linux kernel source root + directory, can change whatever get_maintainer defaults are desired. + Entries in this file can be any command line argument. + This file is prepended to any additional command line arguments. + Multiple lines and # comments are allowed. +EOT +} + +sub top_of_kernel_tree { + my ($lk_path) = @_; + + if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { + $lk_path .= "/"; + } + if ( (-f "${lk_path}COPYING") + && (-f "${lk_path}CREDITS") + && (-f "${lk_path}Kbuild") + && (-f "${lk_path}MAINTAINERS") + && (-f "${lk_path}Makefile") + && (-f "${lk_path}README") + && (-d "${lk_path}Documentation") + && (-d "${lk_path}arch") + && (-d "${lk_path}include") + && (-d "${lk_path}drivers") + && (-d "${lk_path}fs") + && (-d "${lk_path}init") + && (-d "${lk_path}ipc") + && (-d "${lk_path}kernel") + && (-d "${lk_path}lib") + && (-d "${lk_path}scripts")) { + return 1; + } + return 0; +} + +sub parse_email { + my ($formatted_email) = @_; + + my $name = ""; + my $address = ""; + + if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) { + $name = $1; + $address = $2; + } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) { + $address = $1; + } elsif ($formatted_email =~ /^(.+\@\S*).*$/) { + $address = $1; + } + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?"; + } + } else { + $formatted_email = $address; + } + + return $formatted_email; +} + +sub find_first_section { + my $index = 0; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub find_starting_index { + my ($index) = @_; + + while ($index > 0) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index--; + } + + return $index; +} + +sub find_ending_index { + my ($index) = @_; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(\C):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub get_maintainer_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $role = "unknown"; + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(\C):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "S") { + $role = $pvalue; + } + } + } + + $role = lc($role); + if ($role eq "supported") { + $role = "supporter"; + } elsif ($role eq "maintained") { + $role = "maintainer"; + } elsif ($role eq "odd fixes") { + $role = "odd fixer"; + } elsif ($role eq "orphan") { + $role = "orphan minder"; + } elsif ($role eq "obsolete") { + $role = "obsolete minder"; + } elsif ($role eq "buried alive in reporters") { + $role = "chief penguin"; + } + + return $role . ":" . $subsystem; +} + +sub get_list_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + + if ($subsystem eq "THE REST") { + $subsystem = ""; + } + + return $subsystem; +} + +sub add_categories { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + push(@subsystem, $typevalue[$start]); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(\C):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "L") { + my $list_address = $pvalue; + my $list_additional = ""; + my $list_role = get_list_role($i); + + if ($list_role ne "") { + $list_role = ":" . $list_role; + } + if ($list_address =~ m/([^\s]+)\s+(.*)$/) { + $list_address = $1; + $list_additional = $2; + } + if ($list_additional =~ m/subscribers-only/) { + if ($email_subscriber_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + push(@list_to, [$list_address, + "subscriber list${list_role}"]); + } + } + } else { + if ($email_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + if ($list_additional =~ m/moderated/) { + push(@list_to, [$list_address, + "moderated list${list_role}"]); + } else { + push(@list_to, [$list_address, + "open list${list_role}"]); + } + } + } + } + } elsif ($ptype eq "M") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(\C):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_maintainer) { + my $role = get_maintainer_role($i); + push_email_addresses($pvalue, $role); + } + } elsif ($ptype eq "T") { + push(@scm, $pvalue); + } elsif ($ptype eq "W") { + push(@web, $pvalue); + } elsif ($ptype eq "S") { + push(@status, $pvalue); + } + } + } +} + +sub email_inuse { + my ($name, $address) = @_; + + return 1 if (($name eq "") && ($address eq "")); + return 1 if (($name ne "") && exists($email_hash_name{lc($name)})); + return 1 if (($address ne "") && exists($email_hash_address{lc($address)})); + + return 0; +} + +sub push_email_address { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + + if ($address eq "") { + return 0; + } + + if (!$email_remove_duplicates) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + } elsif (!email_inuse($name, $address)) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + $email_hash_name{lc($name)}++ if ($name ne ""); + $email_hash_address{lc($address)}++; + } + + return 1; +} + +sub push_email_addresses { + my ($address, $role) = @_; + + my @address_list = (); + + if (rfc822_valid($address)) { + push_email_address($address, $role); + } elsif (@address_list = rfc822_validlist($address)) { + my $array_count = shift(@address_list); + while (my $entry = shift(@address_list)) { + push_email_address($entry, $role); + } + } else { + if (!push_email_address($address, $role)) { + warn("Invalid MAINTAINERS address: '" . $address . "'\n"); + } + } +} + +sub add_role { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, $email_usename); + + foreach my $entry (@email_to) { + if ($email_remove_duplicates) { + my ($entry_name, $entry_address) = parse_email($entry->[0]); + if (($name eq $entry_name || $address eq $entry_address) + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } else { + if ($email eq $entry->[0] + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } + } +} + +sub which { + my ($bin) = @_; + + foreach my $path (split(/:/, $ENV{PATH})) { + if (-e "$path/$bin") { + return "$path/$bin"; + } + } + + return ""; +} + +sub which_conf { + my ($conf) = @_; + + foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) { + if (-e "$path/$conf") { + return "$path/$conf"; + } + } + + return ""; +} + +sub mailmap_email { + my ($line) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, 1); + my $real_name = $name; + my $real_address = $address; + + if (exists $mailmap->{names}->{$email} || + exists $mailmap->{addresses}->{$email}) { + if (exists $mailmap->{names}->{$email}) { + $real_name = $mailmap->{names}->{$email}; + } + if (exists $mailmap->{addresses}->{$email}) { + $real_address = $mailmap->{addresses}->{$email}; + } + } else { + if (exists $mailmap->{names}->{$address}) { + $real_name = $mailmap->{names}->{$address}; + } + if (exists $mailmap->{addresses}->{$address}) { + $real_address = $mailmap->{addresses}->{$address}; + } + } + return format_email($real_name, $real_address, 1); +} + +sub mailmap { + my (@addresses) = @_; + + my @mapped_emails = (); + foreach my $line (@addresses) { + push(@mapped_emails, mailmap_email($line)); + } + merge_by_realname(@mapped_emails) if ($email_use_mailmap); + return @mapped_emails; +} + +sub merge_by_realname { + my %address_map; + my (@emails) = @_; + + foreach my $email (@emails) { + my ($name, $address) = parse_email($email); + if (exists $address_map{$name}) { + $address = $address_map{$name}; + $email = format_email($name, $address, 1); + } else { + $address_map{$name} = $address; + } + } +} + +sub git_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + $output =~ s/^\s*//gm; + @lines = split("\n", $output); + + return @lines; +} + +sub hg_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + @lines = split("\n", $output); + + return @lines; +} + +sub extract_formatted_signatures { + my (@signature_lines) = @_; + + my @type = @signature_lines; + + s/\s*(.*):.*/$1/ for (@type); + + # cut -f2- -d":" + s/\s*.*:\s*(.+)\s*/$1/ for (@signature_lines); + +## Reformat email addresses (with names) to avoid badly written signatures + + foreach my $signer (@signature_lines) { + $signer = deduplicate_email($signer); + } + + return (\@type, \@signature_lines); +} + +sub vcs_find_signers { + my ($cmd) = @_; + my $commits; + my @lines = (); + my @signatures = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + my $pattern = $VCS_cmds{"commit_pattern"}; + + $commits = grep(/$pattern/, @lines); # of commits + + @signatures = grep(/^[ \t]*${signature_pattern}.*\@.*$/, @lines); + + return (0, @signatures) if !@signatures; + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + if (!$email_git_penguin_chiefs) { + @signatures = grep(!/${penguin_chiefs}/i, @signatures); + } + + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + + return ($commits, @$signers_ref); +} + +sub vcs_find_author { + my ($cmd) = @_; + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + if (!$email_git_penguin_chiefs) { + @lines = grep(!/${penguin_chiefs}/i, @lines); + } + + return @lines if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + my ($name, $address) = parse_email($author); + $author = format_email($name, $address, 1); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + return @authors; +} + +sub vcs_save_commits { + my ($cmd) = @_; + my @lines = (); + my @commits = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) { + push(@commits, $1); + } + } + + return @commits; +} + +sub vcs_blame { + my ($file) = @_; + my $cmd; + my @commits = (); + + return @commits if (!(-f $file)); + + if (@range && $VCS_cmds{"blame_range_cmd"} eq "") { + my @all_commits = (); + + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @all_commits = vcs_save_commits($cmd); + + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) { + push(@commits, $all_commits[$i]); + } + } + } elsif (@range) { + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + $cmd = $VCS_cmds{"blame_range_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + push(@commits, vcs_save_commits($cmd)); + } + } else { + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @commits = vcs_save_commits($cmd); + } + + foreach my $commit (@commits) { + $commit =~ s/^\^//g; + } + + return @commits; +} + +my $printed_novcs = 0; +sub vcs_exists { + %VCS_cmds = %VCS_cmds_git; + return 1 if eval $VCS_cmds{"available"}; + %VCS_cmds = %VCS_cmds_hg; + return 2 if eval $VCS_cmds{"available"}; + %VCS_cmds = (); + if (!$printed_novcs) { + warn("$P: No supported VCS found. Add --nogit to options?\n"); + warn("Using a git repository produces better results.\n"); + warn("Try Linus Torvalds' latest git repository using:\n"); + warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n"); + $printed_novcs = 1; + } + return 0; +} + +sub vcs_is_git { + vcs_exists(); + return $vcs_used == 1; +} + +sub vcs_is_hg { + return $vcs_used == 2; +} + +sub interactive_get_maintainers { + my ($list_ref) = @_; + my @list = @$list_ref; + + vcs_exists(); + + my %selected; + my %authored; + my %signed; + my $count = 0; + my $maintained = 0; + foreach my $entry (@list) { + $maintained = 1 if ($entry->[1] =~ /^(maintainer|supporter)/i); + $selected{$count} = 1; + $authored{$count} = 0; + $signed{$count} = 0; + $count++; + } + + #menu loop + my $done = 0; + my $print_options = 0; + my $redraw = 1; + while (!$done) { + $count = 0; + if ($redraw) { + printf STDERR "\n%1s %2s %-65s", + "*", "#", "email/list and role:stats"; + if ($email_git || + ($email_git_fallback && !$maintained) || + $email_git_blame) { + print STDERR "auth sign"; + } + print STDERR "\n"; + foreach my $entry (@list) { + my $email = $entry->[0]; + my $role = $entry->[1]; + my $sel = ""; + $sel = "*" if ($selected{$count}); + my $commit_author = $commit_author_hash{$email}; + my $commit_signer = $commit_signer_hash{$email}; + my $authored = 0; + my $signed = 0; + $authored++ for (@{$commit_author}); + $signed++ for (@{$commit_signer}); + printf STDERR "%1s %2d %-65s", $sel, $count + 1, $email; + printf STDERR "%4d %4d", $authored, $signed + if ($authored > 0 || $signed > 0); + printf STDERR "\n %s\n", $role; + if ($authored{$count}) { + my $commit_author = $commit_author_hash{$email}; + foreach my $ref (@{$commit_author}) { + print STDERR " Author: @{$ref}[1]\n"; + } + } + if ($signed{$count}) { + my $commit_signer = $commit_signer_hash{$email}; + foreach my $ref (@{$commit_signer}) { + print STDERR " @{$ref}[2]: @{$ref}[1]\n"; + } + } + + $count++; + } + } + my $date_ref = \$email_git_since; + $date_ref = \$email_hg_since if (vcs_is_hg()); + if ($print_options) { + $print_options = 0; + if (vcs_exists()) { + print STDERR <; + chomp($input); + + $redraw = 1; + my $rerun = 0; + my @wish = split(/[, ]+/, $input); + foreach my $nr (@wish) { + $nr = lc($nr); + my $sel = substr($nr, 0, 1); + my $str = substr($nr, 1); + my $val = 0; + $val = $1 if $str =~ /^(\d+)$/; + + if ($sel eq "y") { + $interactive = 0; + $done = 1; + $output_rolestats = 0; + $output_roles = 0; + last; + } elsif ($nr =~ /^\d+$/ && $nr > 0 && $nr <= $count) { + $selected{$nr - 1} = !$selected{$nr - 1}; + } elsif ($sel eq "*" || $sel eq '^') { + my $toggle = 0; + $toggle = 1 if ($sel eq '*'); + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = $toggle; + } + } elsif ($sel eq "0") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i}; + } + } elsif ($sel eq "t") { + if (lc($str) eq "m") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(maintainer|supporter)/i); + } + } elsif (lc($str) eq "g") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(author|commit|signer)/i); + } + } elsif (lc($str) eq "l") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(open list)/i); + } + } elsif (lc($str) eq "s") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(subscriber list)/i); + } + } + } elsif ($sel eq "a") { + if ($val > 0 && $val <= $count) { + $authored{$val - 1} = !$authored{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $authored{$i} = $toggle; + } + } + } elsif ($sel eq "s") { + if ($val > 0 && $val <= $count) { + $signed{$val - 1} = !$signed{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $signed{$i} = $toggle; + } + } + } elsif ($sel eq "o") { + $print_options = 1; + $redraw = 1; + } elsif ($sel eq "g") { + if ($str eq "f") { + bool_invert(\$email_git_fallback); + } else { + bool_invert(\$email_git); + } + $rerun = 1; + } elsif ($sel eq "b") { + if ($str eq "s") { + bool_invert(\$email_git_blame_signatures); + } else { + bool_invert(\$email_git_blame); + } + $rerun = 1; + } elsif ($sel eq "c") { + if ($val > 0) { + $email_git_min_signatures = $val; + $rerun = 1; + } + } elsif ($sel eq "x") { + if ($val > 0) { + $email_git_max_maintainers = $val; + $rerun = 1; + } + } elsif ($sel eq "%") { + if ($str ne "" && $val >= 0) { + $email_git_min_percent = $val; + $rerun = 1; + } + } elsif ($sel eq "d") { + if (vcs_is_git()) { + $email_git_since = $str; + } elsif (vcs_is_hg()) { + $email_hg_since = $str; + } + $rerun = 1; + } elsif ($sel eq "t") { + bool_invert(\$email_git_all_signature_types); + $rerun = 1; + } elsif ($sel eq "f") { + bool_invert(\$file_emails); + $rerun = 1; + } elsif ($sel eq "r") { + bool_invert(\$email_remove_duplicates); + $rerun = 1; + } elsif ($sel eq "m") { + bool_invert(\$email_use_mailmap); + read_mailmap(); + $rerun = 1; + } elsif ($sel eq "k") { + bool_invert(\$keywords); + $rerun = 1; + } elsif ($sel eq "p") { + if ($str ne "" && $val >= 0) { + $pattern_depth = $val; + $rerun = 1; + } + } elsif ($sel eq "h" || $sel eq "?") { + print STDERR <[0]; + $address = $deduplicate_name_hash{lc($name)}->[1]; + $matched = 1; + } elsif ($deduplicate_address_hash{lc($address)}) { + $name = $deduplicate_address_hash{lc($address)}->[0]; + $address = $deduplicate_address_hash{lc($address)}->[1]; + $matched = 1; + } + if (!$matched) { + $deduplicate_name_hash{lc($name)} = [ $name, $address ]; + $deduplicate_address_hash{lc($address)} = [ $name, $address ]; + } + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + return $email; +} + +sub save_commits_by_author { + my (@lines) = @_; + + my @authors = (); + my @commits = (); + my @subjects = (); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + push(@commits, $1) if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + push(@subjects, $1) if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + } + + for (my $i = 0; $i < @authors; $i++) { + my $exists = 0; + foreach my $ref(@{$commit_author_hash{$authors[$i]}}) { + if (@{$ref}[0] eq $commits[$i] && + @{$ref}[1] eq $subjects[$i]) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_author_hash{$authors[$i]}}, + [ ($commits[$i], $subjects[$i]) ]); + } + } +} + +sub save_commits_by_signer { + my (@lines) = @_; + + my $commit = ""; + my $subject = ""; + + foreach my $line (@lines) { + $commit = $1 if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + $subject = $1 if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + if ($line =~ /^[ \t]*${signature_pattern}.*\@.*$/) { + my @signatures = ($line); + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + my @types = @$types_ref; + my @signers = @$signers_ref; + + my $type = $types[0]; + my $signer = $signers[0]; + + $signer = deduplicate_email($signer); + + my $exists = 0; + foreach my $ref(@{$commit_signer_hash{$signer}}) { + if (@{$ref}[0] eq $commit && + @{$ref}[1] eq $subject && + @{$ref}[2] eq $type) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_signer_hash{$signer}}, + [ ($commit, $subject, $type) ]); + } + } + } +} + +sub vcs_assign { + my ($role, $divisor, @lines) = @_; + + my %hash; + my $count = 0; + + return if (@lines <= 0); + + if ($divisor <= 0) { + warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n"); + $divisor = 1; + } + + @lines = mailmap(@lines); + + return if (@lines <= 0); + + @lines = sort(@lines); + + # uniq -c + $hash{$_}++ for @lines; + + # sort -rn + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + my $sign_offs = $hash{$line}; + my $percent = $sign_offs * 100 / $divisor; + + $percent = 100 if ($percent > 100); + $count++; + last if ($sign_offs < $email_git_min_signatures || + $count > $email_git_max_maintainers || + $percent < $email_git_min_percent); + push_email_address($line, ''); + if ($output_rolestats) { + my $fmt_percent = sprintf("%.0f", $percent); + add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%"); + } else { + add_role($line, $role); + } + } +} + +sub vcs_file_signoffs { + my ($file) = @_; + + my @signers = (); + my $commits; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + my $cmd = $VCS_cmds{"find_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd + + ($commits, @signers) = vcs_find_signers($cmd); + + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + + vcs_assign("commit_signer", $commits, @signers); +} + +sub vcs_file_blame { + my ($file) = @_; + + my @signers = (); + my @all_commits = (); + my @commits = (); + my $total_commits; + my $total_lines; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + @all_commits = vcs_blame($file); + @commits = uniq(@all_commits); + $total_commits = @commits; + $total_lines = @all_commits; + + if ($email_git_blame_signatures) { + if (vcs_is_hg()) { + my $commit_count; + my @commit_signers = (); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } else { + foreach my $commit (@commits) { + my $commit_count; + my @commit_signers = (); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } + } + } + + if ($from_filename) { + if ($output_rolestats) { + my @blame_signers; + if (vcs_is_hg()) {{ # Double brace for last exit + my $commit_count; + my @commit_signers = (); + @commits = uniq(@commits); + @commits = sort(@commits); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + if (!$email_git_penguin_chiefs) { + @lines = grep(!/${penguin_chiefs}/i, @lines); + } + + last if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + push(@signers, @authors); + }} + else { + foreach my $commit (@commits) { + my $i; + my $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + my @author = vcs_find_author($cmd); + next if !@author; + + my $formatted_author = deduplicate_email($author[0]); + + my $count = grep(/$commit/, @all_commits); + for ($i = 0; $i < $count ; $i++) { + push(@blame_signers, $formatted_author); + } + } + } + if (@blame_signers) { + vcs_assign("authored lines", $total_lines, @blame_signers); + } + } + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("commits", $total_commits, @signers); + } else { + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("modified commits", $total_commits, @signers); + } +} + +sub uniq { + my (@parms) = @_; + + my %saw; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub sort_and_uniq { + my (@parms) = @_; + + my %saw; + @parms = sort @parms; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub clean_file_emails { + my (@file_emails) = @_; + my @fmt_emails = (); + + foreach my $email (@file_emails) { + $email =~ s/[\(\<\{]{0,1}([A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+)[\)\>\}]{0,1}/\<$1\>/g; + my ($name, $address) = parse_email($email); + if ($name eq '"[,\.]"') { + $name = ""; + } + + my @nw = split(/[^A-Za-zÀ-ÿ\'\,\.\+-]/, $name); + if (@nw > 2) { + my $first = $nw[@nw - 3]; + my $middle = $nw[@nw - 2]; + my $last = $nw[@nw - 1]; + + if (((length($first) == 1 && $first =~ m/[A-Za-z]/) || + (length($first) == 2 && substr($first, -1) eq ".")) || + (length($middle) == 1 || + (length($middle) == 2 && substr($middle, -1) eq "."))) { + $name = "$first $middle $last"; + } else { + $name = "$middle $last"; + } + } + + if (substr($name, -1) =~ /[,\.]/) { + $name = substr($name, 0, length($name) - 1); + } elsif (substr($name, -2) =~ /[,\.]"/) { + $name = substr($name, 0, length($name) - 2) . '"'; + } + + if (substr($name, 0, 1) =~ /[,\.]/) { + $name = substr($name, 1, length($name) - 1); + } elsif (substr($name, 0, 2) =~ /"[,\.]/) { + $name = '"' . substr($name, 2, length($name) - 2); + } + + my $fmt_email = format_email($name, $address, $email_usename); + push(@fmt_emails, $fmt_email); + } + return @fmt_emails; +} + +sub merge_email { + my @lines; + my %saw; + + for (@_) { + my ($address, $role) = @$_; + if (!$saw{$address}) { + if ($output_roles) { + push(@lines, "$address ($role)"); + } else { + push(@lines, $address); + } + $saw{$address} = 1; + } + } + + return @lines; +} + +sub output { + my (@parms) = @_; + + if ($output_multiline) { + foreach my $line (@parms) { + print("${line}\n"); + } + } else { + print(join($output_separator, @parms)); + print("\n"); + } +} + +my $rfc822re; + +sub make_rfc822re { +# Basic lexical tokens are specials, domain_literal, quoted_string, atom, and +# comment. We must allow for rfc822_lwsp (or comments) after each of these. +# This regexp will only work on addresses which have had comments stripped +# and replaced with rfc822_lwsp. + + my $specials = '()<>@,;:\\\\".\\[\\]'; + my $controls = '\\000-\\037\\177'; + + my $dtext = "[^\\[\\]\\r\\\\]"; + my $domain_literal = "\\[(?:$dtext|\\\\.)*\\]$rfc822_lwsp*"; + + my $quoted_string = "\"(?:[^\\\"\\r\\\\]|\\\\.|$rfc822_lwsp)*\"$rfc822_lwsp*"; + +# Use zero-width assertion to spot the limit of an atom. A simple +# $rfc822_lwsp* causes the regexp engine to hang occasionally. + my $atom = "[^$specials $controls]+(?:$rfc822_lwsp+|\\Z|(?=[\\[\"$specials]))"; + my $word = "(?:$atom|$quoted_string)"; + my $localpart = "$word(?:\\.$rfc822_lwsp*$word)*"; + + my $sub_domain = "(?:$atom|$domain_literal)"; + my $domain = "$sub_domain(?:\\.$rfc822_lwsp*$sub_domain)*"; + + my $addr_spec = "$localpart\@$rfc822_lwsp*$domain"; + + my $phrase = "$word*"; + my $route = "(?:\@$domain(?:,\@$rfc822_lwsp*$domain)*:$rfc822_lwsp*)"; + my $route_addr = "\\<$rfc822_lwsp*$route?$addr_spec\\>$rfc822_lwsp*"; + my $mailbox = "(?:$addr_spec|$phrase$route_addr)"; + + my $group = "$phrase:$rfc822_lwsp*(?:$mailbox(?:,\\s*$mailbox)*)?;\\s*"; + my $address = "(?:$mailbox|$group)"; + + return "$rfc822_lwsp*$address"; +} + +sub rfc822_strip_comments { + my $s = shift; +# Recursively remove comments, and replace with a single space. The simpler +# regexps in the Email Addressing FAQ are imperfect - they will miss escaped +# chars in atoms, for example. + + while ($s =~ s/^((?:[^"\\]|\\.)* + (?:"(?:[^"\\]|\\.)*"(?:[^"\\]|\\.)*)*) + \((?:[^()\\]|\\.)*\)/$1 /osx) {} + return $s; +} + +# valid: returns true if the parameter is an RFC822 valid address +# +sub rfc822_valid { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + + return $s =~ m/^$rfc822re$/so && $s =~ m/^$rfc822_char*$/; +} + +# validlist: In scalar context, returns true if the parameter is an RFC822 +# valid list of addresses. +# +# In list context, returns an empty list on failure (an invalid +# address was found); otherwise a list whose first element is the +# number of addresses found and whose remaining elements are the +# addresses. This is needed to disambiguate failure (invalid) +# from success with no addresses found, because an empty string is +# a valid list. + +sub rfc822_validlist { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + # * null list items are valid according to the RFC + # * the '1' business is to aid in distinguishing failure from no results + + my @r; + if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so && + $s =~ m/^$rfc822_char*$/) { + while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) { + push(@r, $1); + } + return wantarray ? (scalar(@r), @r) : 1; + } + return wantarray ? () : 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5550901619197298648== 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 --===============5550901619197298648==-- From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLm-00082p-Fa; Fri, 22 Nov 2013 21: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 1VjyLl-00082g-9c for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:17 +0000 Received: from [85.158.139.211:61898] by server-16.bemta-5.messagelabs.com id BB/93-11843-C9DCF825; Fri, 22 Nov 2013 21:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385155994!3810657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16065 invoked from network); 22 Nov 2013 21: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; 22 Nov 2013 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLi-0004CB-Io for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLi-00046i-G5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:14 +0000 Date: Fri, 22 Nov 2013 21:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get_maintainer.pl: Convert to Xen 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 f85e314d268ebf39249fa9327782d712e2274feb Author: Don Slutz AuthorDate: Tue Nov 5 09:11:50 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:23 2013 +0000 get_maintainer.pl: Convert to Xen tree Signed-off-by: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 50 ++++++++++++++++++--------------------------- 1 files changed, 20 insertions(+), 30 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 5e4fb14..7465c2b 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -13,11 +13,11 @@ use strict; my $P = $0; -my $V = '0.26'; +my $V = '0.26-xen'; use Getopt::Long qw(:config no_auto_abbrev); -my $lk_path = "./"; +my $xen_path = "./"; my $email = 1; my $email_usename = 1; my $email_maintainer = 1; @@ -260,9 +260,9 @@ if ($email && die "$P: Please select at least 1 email option\n"; } -if (!top_of_kernel_tree($lk_path)) { +if (!top_of_tree($xen_path)) { die "$P: The current directory does not appear to be " - . "a linux kernel source tree.\n"; + . "a Xen source tree.\n"; } ## Read MAINTAINERS for type/value pairs @@ -270,7 +270,7 @@ if (!top_of_kernel_tree($lk_path)) { my @typevalue = (); my %keyword_hash; -open (my $maint, '<', "${lk_path}MAINTAINERS") +open (my $maint, '<', "${xen_path}MAINTAINERS") or die "$P: Can't open MAINTAINERS: $!\n"; while (<$maint>) { my $line = $_; @@ -314,9 +314,9 @@ sub read_mailmap { addresses => {} }; - return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + return if (!$email_use_mailmap || !(-f "${xen_path}.mailmap")); - open(my $mailmap_file, '<', "${lk_path}.mailmap") + open(my $mailmap_file, '<', "${xen_path}.mailmap") or warn "$P: Can't open .mailmap: $!\n"; while (<$mailmap_file>) { @@ -798,7 +798,7 @@ Notes: --git-min-signatures, --git-max-maintainers, --git-min-percent, and --git-blame Use --hg-since not --git-since to control date selection - File ".get_maintainer.conf", if it exists in the linux kernel source root + File ".get_maintainer.conf", if it exists in the Xen source root directory, can change whatever get_maintainer defaults are desired. Entries in this file can be any command line argument. This file is prepended to any additional command line arguments. @@ -806,28 +806,18 @@ Notes: EOT } -sub top_of_kernel_tree { - my ($lk_path) = @_; - - if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { - $lk_path .= "/"; - } - if ( (-f "${lk_path}COPYING") - && (-f "${lk_path}CREDITS") - && (-f "${lk_path}Kbuild") - && (-f "${lk_path}MAINTAINERS") - && (-f "${lk_path}Makefile") - && (-f "${lk_path}README") - && (-d "${lk_path}Documentation") - && (-d "${lk_path}arch") - && (-d "${lk_path}include") - && (-d "${lk_path}drivers") - && (-d "${lk_path}fs") - && (-d "${lk_path}init") - && (-d "${lk_path}ipc") - && (-d "${lk_path}kernel") - && (-d "${lk_path}lib") - && (-d "${lk_path}scripts")) { +sub top_of_tree { + my ($xen_path) = @_; + + if ($xen_path ne "" && substr($xen_path,length($xen_path)-1,1) ne "/") { + $xen_path .= "/"; + } + if ( (-f "${xen_path}COPYING") + && (-f "${xen_path}MAINTAINERS") + && (-f "${xen_path}Makefile") + && (-d "${xen_path}docs") + && (-f "${xen_path}CODING_STYLE") + && (-d "${xen_path}xen")) { return 1; } return 0; @@ -1398,8 +1388,8 @@ sub vcs_exists { if (!$printed_novcs) { warn("$P: No supported VCS found. Add --nogit to options?\n"); warn("Using a git repository produces better results.\n"); - warn("Try Linus Torvalds' latest git repository using:\n"); - warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n"); + warn("Try latest git repository using:\n"); + warn("git clone git://xenbits.xen.org/xen.git\n"); $printed_novcs = 1; } 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 Nov 22 21:33:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLm-00082p-Fa; Fri, 22 Nov 2013 21: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 1VjyLl-00082g-9c for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:17 +0000 Received: from [85.158.139.211:61898] by server-16.bemta-5.messagelabs.com id BB/93-11843-C9DCF825; Fri, 22 Nov 2013 21:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385155994!3810657!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16065 invoked from network); 22 Nov 2013 21: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; 22 Nov 2013 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLi-0004CB-Io for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLi-00046i-G5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:14 +0000 Date: Fri, 22 Nov 2013 21:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get_maintainer.pl: Convert to Xen 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 f85e314d268ebf39249fa9327782d712e2274feb Author: Don Slutz AuthorDate: Tue Nov 5 09:11:50 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:23 2013 +0000 get_maintainer.pl: Convert to Xen tree Signed-off-by: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 50 ++++++++++++++++++--------------------------- 1 files changed, 20 insertions(+), 30 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 5e4fb14..7465c2b 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -13,11 +13,11 @@ use strict; my $P = $0; -my $V = '0.26'; +my $V = '0.26-xen'; use Getopt::Long qw(:config no_auto_abbrev); -my $lk_path = "./"; +my $xen_path = "./"; my $email = 1; my $email_usename = 1; my $email_maintainer = 1; @@ -260,9 +260,9 @@ if ($email && die "$P: Please select at least 1 email option\n"; } -if (!top_of_kernel_tree($lk_path)) { +if (!top_of_tree($xen_path)) { die "$P: The current directory does not appear to be " - . "a linux kernel source tree.\n"; + . "a Xen source tree.\n"; } ## Read MAINTAINERS for type/value pairs @@ -270,7 +270,7 @@ if (!top_of_kernel_tree($lk_path)) { my @typevalue = (); my %keyword_hash; -open (my $maint, '<', "${lk_path}MAINTAINERS") +open (my $maint, '<', "${xen_path}MAINTAINERS") or die "$P: Can't open MAINTAINERS: $!\n"; while (<$maint>) { my $line = $_; @@ -314,9 +314,9 @@ sub read_mailmap { addresses => {} }; - return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + return if (!$email_use_mailmap || !(-f "${xen_path}.mailmap")); - open(my $mailmap_file, '<', "${lk_path}.mailmap") + open(my $mailmap_file, '<', "${xen_path}.mailmap") or warn "$P: Can't open .mailmap: $!\n"; while (<$mailmap_file>) { @@ -798,7 +798,7 @@ Notes: --git-min-signatures, --git-max-maintainers, --git-min-percent, and --git-blame Use --hg-since not --git-since to control date selection - File ".get_maintainer.conf", if it exists in the linux kernel source root + File ".get_maintainer.conf", if it exists in the Xen source root directory, can change whatever get_maintainer defaults are desired. Entries in this file can be any command line argument. This file is prepended to any additional command line arguments. @@ -806,28 +806,18 @@ Notes: EOT } -sub top_of_kernel_tree { - my ($lk_path) = @_; - - if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { - $lk_path .= "/"; - } - if ( (-f "${lk_path}COPYING") - && (-f "${lk_path}CREDITS") - && (-f "${lk_path}Kbuild") - && (-f "${lk_path}MAINTAINERS") - && (-f "${lk_path}Makefile") - && (-f "${lk_path}README") - && (-d "${lk_path}Documentation") - && (-d "${lk_path}arch") - && (-d "${lk_path}include") - && (-d "${lk_path}drivers") - && (-d "${lk_path}fs") - && (-d "${lk_path}init") - && (-d "${lk_path}ipc") - && (-d "${lk_path}kernel") - && (-d "${lk_path}lib") - && (-d "${lk_path}scripts")) { +sub top_of_tree { + my ($xen_path) = @_; + + if ($xen_path ne "" && substr($xen_path,length($xen_path)-1,1) ne "/") { + $xen_path .= "/"; + } + if ( (-f "${xen_path}COPYING") + && (-f "${xen_path}MAINTAINERS") + && (-f "${xen_path}Makefile") + && (-d "${xen_path}docs") + && (-f "${xen_path}CODING_STYLE") + && (-d "${xen_path}xen")) { return 1; } return 0; @@ -1398,8 +1388,8 @@ sub vcs_exists { if (!$printed_novcs) { warn("$P: No supported VCS found. Add --nogit to options?\n"); warn("Using a git repository produces better results.\n"); - warn("Try Linus Torvalds' latest git repository using:\n"); - warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n"); + warn("Try latest git repository using:\n"); + warn("git clone git://xenbits.xen.org/xen.git\n"); $printed_novcs = 1; } 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 Nov 22 21:33:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLw-00083s-II; Fri, 22 Nov 2013 21: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 1VjyLv-00083k-Fx for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:27 +0000 Received: from [85.158.143.35:15271] by server-3.bemta-4.messagelabs.com id 69/EB-32360-6ADCF825; Fri, 22 Nov 2013 21:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385156005!512840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13683 invoked from network); 22 Nov 2013 21:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLs-0004CK-Ts for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLs-000474-Lu for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:24 +0000 Date: Fri, 22 Nov 2013 21:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get_maintainer.pl: Adjust to Xen workflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6738db02d397ff7edd6ff7af156980cd9d780ad Author: Don Slutz AuthorDate: Tue Nov 5 09:11:51 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:23 2013 +0000 get_maintainer.pl: Adjust to Xen workflow Based on feedback from reviewers: * Disable git fallback by default: it has a tendency to mail anyone who did a single oneline change and should not be necessary for a project of Xen's size. * Disable rolestats: Makes cut-and-paste from the output into the commit message easy. * Drop "THE REST" fallback: Don't spam Keir *too* much. Signed-off-by: Don Slutz Acked-by: Ian Campbell [ijc -- expanded the changelog] --- scripts/get_maintainer.pl | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 7465c2b..df920e2 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -28,7 +28,7 @@ my $email_git = 0; my $email_git_all_signature_types = 0; my $email_git_blame = 0; my $email_git_blame_signatures = 1; -my $email_git_fallback = 1; +my $email_git_fallback = 0; my $email_git_min_signatures = 1; my $email_git_max_maintainers = 5; my $email_git_min_percent = 5; @@ -37,10 +37,11 @@ my $email_hg_since = "-365"; my $interactive = 0; my $email_remove_duplicates = 1; my $email_use_mailmap = 1; +my $email_drop_the_rest_supporter_if_supporter_found = 1; my $output_multiline = 1; my $output_separator = ", "; my $output_roles = 0; -my $output_rolestats = 1; +my $output_rolestats = 0; my $scm = 0; my $web = 0; my $subsystem = 0; @@ -196,6 +197,7 @@ if (!GetOptions( 'i|interactive!' => \$interactive, 'remove-duplicates!' => \$email_remove_duplicates, 'mailmap!' => \$email_use_mailmap, + 'drop_the_rest_supporter!' => \$email_drop_the_rest_supporter_if_supporter_found, 'm!' => \$email_maintainer, 'n!' => \$email_usename, 'l!' => \$email_list, @@ -651,6 +653,19 @@ sub get_maintainers { } } + if ($email_drop_the_rest_supporter_if_supporter_found && $#email_to > 0) { + my @email_new; + my $do_replace = 0; + foreach my $email (@email_to) { + if ($email->[1] ne 'supporter:THE REST') { + $do_replace = 1; + push @email_new, $email; + } + } + @email_to = @email_new + if $do_replace; + } + foreach my $email (@email_to, @list_to) { $email->[0] = deduplicate_email($email->[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 Nov 22 21:33:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLw-00083s-II; Fri, 22 Nov 2013 21: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 1VjyLv-00083k-Fx for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:27 +0000 Received: from [85.158.143.35:15271] by server-3.bemta-4.messagelabs.com id 69/EB-32360-6ADCF825; Fri, 22 Nov 2013 21:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385156005!512840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13683 invoked from network); 22 Nov 2013 21:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyLs-0004CK-Ts for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyLs-000474-Lu for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:24 +0000 Date: Fri, 22 Nov 2013 21:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get_maintainer.pl: Adjust to Xen workflow X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6738db02d397ff7edd6ff7af156980cd9d780ad Author: Don Slutz AuthorDate: Tue Nov 5 09:11:51 2013 -0500 Commit: Ian Campbell CommitDate: Tue Nov 19 14:02:23 2013 +0000 get_maintainer.pl: Adjust to Xen workflow Based on feedback from reviewers: * Disable git fallback by default: it has a tendency to mail anyone who did a single oneline change and should not be necessary for a project of Xen's size. * Disable rolestats: Makes cut-and-paste from the output into the commit message easy. * Drop "THE REST" fallback: Don't spam Keir *too* much. Signed-off-by: Don Slutz Acked-by: Ian Campbell [ijc -- expanded the changelog] --- scripts/get_maintainer.pl | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 7465c2b..df920e2 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -28,7 +28,7 @@ my $email_git = 0; my $email_git_all_signature_types = 0; my $email_git_blame = 0; my $email_git_blame_signatures = 1; -my $email_git_fallback = 1; +my $email_git_fallback = 0; my $email_git_min_signatures = 1; my $email_git_max_maintainers = 5; my $email_git_min_percent = 5; @@ -37,10 +37,11 @@ my $email_hg_since = "-365"; my $interactive = 0; my $email_remove_duplicates = 1; my $email_use_mailmap = 1; +my $email_drop_the_rest_supporter_if_supporter_found = 1; my $output_multiline = 1; my $output_separator = ", "; my $output_roles = 0; -my $output_rolestats = 1; +my $output_rolestats = 0; my $scm = 0; my $web = 0; my $subsystem = 0; @@ -196,6 +197,7 @@ if (!GetOptions( 'i|interactive!' => \$interactive, 'remove-duplicates!' => \$email_remove_duplicates, 'mailmap!' => \$email_use_mailmap, + 'drop_the_rest_supporter!' => \$email_drop_the_rest_supporter_if_supporter_found, 'm!' => \$email_maintainer, 'n!' => \$email_usename, 'l!' => \$email_list, @@ -651,6 +653,19 @@ sub get_maintainers { } } + if ($email_drop_the_rest_supporter_if_supporter_found && $#email_to > 0) { + my @email_new; + my $do_replace = 0; + foreach my $email (@email_to) { + if ($email->[1] ne 'supporter:THE REST') { + $do_replace = 1; + push @email_new, $email; + } + } + @email_to = @email_new + if $do_replace; + } + foreach my $email (@email_to, @list_to) { $email->[0] = deduplicate_email($email->[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 Nov 22 21:33:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM6-000858-Lz; Fri, 22 Nov 2013 21:33:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM5-000850-NB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:37 +0000 Received: from [193.109.254.147:46951] by server-15.bemta-14.messagelabs.com id 4B/44-06807-1BDCF825; Fri, 22 Nov 2013 21:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385156015!208498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5193 invoked from network); 22 Nov 2013 21:33:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM3-0004CS-3a for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyM3-00047U-1Y for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:35 +0000 Date: Fri, 22 Nov 2013 21:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: change most remaining LIBXL_LOG to LOG in libxl_qmp.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 f28b2f4dfd566091e7d36f5d298c162feb4a5cd6 Author: Kelley Nielsen AuthorDate: Thu Nov 14 17:41:07 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:05:35 2013 +0000 libxl: change most remaining LIBXL_LOG to LOG in libxl_qmp.c Coding style has recently been changed for libxl. The convenience macro LOG() has been introduced, and invocations of the old macro LIBXL__LOG() are to be replaced with it. Change occurences of the old macro to the new one in the functions qmp_handle_response() and qmp_handle_error_response(). The new macros need access to a local libxl__gc *gc, so add it as a parameter to both these functions, and pass the instance in qmp_next() down the call chain to qmp_handle_response() and in turn to qmp_handle_error_response(). Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Reviewed-by: Anthony PERARD [ijc -- reverted one unintential w/s change] --- tools/libxl/libxl_qmp.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index db40126..411a9b5 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -260,7 +260,7 @@ static callback_id_pair *qmp_get_callback_from_id(libxl__qmp_handler *qmp, return NULL; } -static void qmp_handle_error_response(libxl__qmp_handler *qmp, +static void qmp_handle_error_response(libxl__gc *gc, libxl__qmp_handler *qmp, const libxl__json_object *resp) { callback_id_pair *pp = qmp_get_callback_from_id(qmp, resp); @@ -283,19 +283,17 @@ static void qmp_handle_error_response(libxl__qmp_handler *qmp, free(pp); } - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "received an error message from QMP server: %s", - libxl__json_object_get_string(resp)); + LOG(ERROR, "received an error message from QMP server: %s", + libxl__json_object_get_string(resp)); } -static int qmp_handle_response(libxl__qmp_handler *qmp, +static int qmp_handle_response(libxl__gc *gc, libxl__qmp_handler *qmp, const libxl__json_object *resp) { libxl__qmp_message_type type = LIBXL__QMP_MESSAGE_TYPE_INVALID; type = qmp_response_type(qmp, resp); - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, - "message type: %s", libxl__qmp_message_type_to_string(type)); + LOG(DEBUG, "message type: %s", libxl__qmp_message_type_to_string(type)); switch (type) { case LIBXL__QMP_MESSAGE_TYPE_QMP: @@ -317,14 +315,14 @@ static int qmp_handle_response(libxl__qmp_handler *qmp, /* tell that the id have been processed */ qmp->wait_for_id = 0; } - LIBXL_STAILQ_REMOVE( - &qmp->callback_list, pp, callback_id_pair, next); + LIBXL_STAILQ_REMOVE(&qmp->callback_list, pp, callback_id_pair, + next); free(pp); } return 0; } case LIBXL__QMP_MESSAGE_TYPE_ERROR: - qmp_handle_error_response(qmp, resp); + qmp_handle_error_response(gc, qmp, resp); return -1; case LIBXL__QMP_MESSAGE_TYPE_EVENT: return 0; @@ -481,7 +479,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) o = libxl__json_parse(gc, s); if (o) { - rc = qmp_handle_response(qmp, o); + rc = qmp_handle_response(gc, qmp, o); } else { LOG(ERROR, "Parse error of : %s\n", s); return -1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM6-000858-Lz; Fri, 22 Nov 2013 21:33:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM5-000850-NB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:37 +0000 Received: from [193.109.254.147:46951] by server-15.bemta-14.messagelabs.com id 4B/44-06807-1BDCF825; Fri, 22 Nov 2013 21:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385156015!208498!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5193 invoked from network); 22 Nov 2013 21:33:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyM3-0004CS-3a for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyM3-00047U-1Y for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:35 +0000 Date: Fri, 22 Nov 2013 21:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: change most remaining LIBXL_LOG to LOG in libxl_qmp.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 f28b2f4dfd566091e7d36f5d298c162feb4a5cd6 Author: Kelley Nielsen AuthorDate: Thu Nov 14 17:41:07 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:05:35 2013 +0000 libxl: change most remaining LIBXL_LOG to LOG in libxl_qmp.c Coding style has recently been changed for libxl. The convenience macro LOG() has been introduced, and invocations of the old macro LIBXL__LOG() are to be replaced with it. Change occurences of the old macro to the new one in the functions qmp_handle_response() and qmp_handle_error_response(). The new macros need access to a local libxl__gc *gc, so add it as a parameter to both these functions, and pass the instance in qmp_next() down the call chain to qmp_handle_response() and in turn to qmp_handle_error_response(). Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Reviewed-by: Anthony PERARD [ijc -- reverted one unintential w/s change] --- tools/libxl/libxl_qmp.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index db40126..411a9b5 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -260,7 +260,7 @@ static callback_id_pair *qmp_get_callback_from_id(libxl__qmp_handler *qmp, return NULL; } -static void qmp_handle_error_response(libxl__qmp_handler *qmp, +static void qmp_handle_error_response(libxl__gc *gc, libxl__qmp_handler *qmp, const libxl__json_object *resp) { callback_id_pair *pp = qmp_get_callback_from_id(qmp, resp); @@ -283,19 +283,17 @@ static void qmp_handle_error_response(libxl__qmp_handler *qmp, free(pp); } - LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, - "received an error message from QMP server: %s", - libxl__json_object_get_string(resp)); + LOG(ERROR, "received an error message from QMP server: %s", + libxl__json_object_get_string(resp)); } -static int qmp_handle_response(libxl__qmp_handler *qmp, +static int qmp_handle_response(libxl__gc *gc, libxl__qmp_handler *qmp, const libxl__json_object *resp) { libxl__qmp_message_type type = LIBXL__QMP_MESSAGE_TYPE_INVALID; type = qmp_response_type(qmp, resp); - LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, - "message type: %s", libxl__qmp_message_type_to_string(type)); + LOG(DEBUG, "message type: %s", libxl__qmp_message_type_to_string(type)); switch (type) { case LIBXL__QMP_MESSAGE_TYPE_QMP: @@ -317,14 +315,14 @@ static int qmp_handle_response(libxl__qmp_handler *qmp, /* tell that the id have been processed */ qmp->wait_for_id = 0; } - LIBXL_STAILQ_REMOVE( - &qmp->callback_list, pp, callback_id_pair, next); + LIBXL_STAILQ_REMOVE(&qmp->callback_list, pp, callback_id_pair, + next); free(pp); } return 0; } case LIBXL__QMP_MESSAGE_TYPE_ERROR: - qmp_handle_error_response(qmp, resp); + qmp_handle_error_response(gc, qmp, resp); return -1; case LIBXL__QMP_MESSAGE_TYPE_EVENT: return 0; @@ -481,7 +479,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) o = libxl__json_parse(gc, s); if (o) { - rc = qmp_handle_response(qmp, o); + rc = qmp_handle_response(gc, qmp, o); } else { LOG(ERROR, "Parse error of : %s\n", s); return -1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyMH-00086p-Oz; Fri, 22 Nov 2013 21: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 1VjyMG-00086b-0q for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:48 +0000 Received: from [193.109.254.147:59743] by server-12.bemta-14.messagelabs.com id 2F/2C-25062-BBDCF825; Fri, 22 Nov 2013 21:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385156025!210487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9235 invoked from network); 22 Nov 2013 21:33:46 -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 Nov 2013 21:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMD-0004CY-CF for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMD-00047q-6s for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:45 +0000 Date: Fri, 22 Nov 2013 21:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use new macro LOGE() in libxl_qmp.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 c61ca4baa041c49b70b3ccee04cac48fdf6f7bff Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:51 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: Use new macro LOGE() in libxl_qmp.c Code cleanup -- no functional changes Coding style has recently been changed for libxl. The convenience macro LOGE() has been introduced, and invocations of the old macro LIBXL__LOG_ERROR() are to be replaced with it. Change all occurences of the old macro (in functions that have a local libxl_gc *gc) except the one in register_serials_chardev_callback() to the new one. (This function lacks a local libxl__gc *gc, which LOGE() requires.) Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 411a9b5..4e55454 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -342,8 +342,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid) qmp = calloc(1, sizeof (libxl__qmp_handler)); if (qmp == NULL) { - LIBXL__LOG_ERRNO(libxl__gc_owner(gc), LIBXL__LOG_ERROR, - "Failed to allocate qmp_handler"); + LOGE(ERROR, "Failed to allocate qmp_handler"); return NULL; } qmp->ctx = CTX; @@ -437,7 +436,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) } else if (ret < 0) { if (errno == EINTR) continue; - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Select error"); + LOGE(ERROR, "Select error"); return -1; } @@ -446,7 +445,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) LOG(ERROR, "Unexpected end of socket"); return -1; } else if (rd < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error"); + LOGE(ERROR, "Socket read error"); return rd; } @@ -533,8 +532,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, elm = malloc(sizeof (callback_id_pair)); if (elm == NULL) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to allocate a QMP callback"); + LOGE(ERROR, "Failed to allocate a QMP callback"); goto out; } elm->id = qmp->last_id_used; @@ -692,7 +690,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Connection error"); + LOGE(ERROR, "Connection error"); qmp_free_handler(qmp); return NULL; } @@ -724,16 +722,13 @@ void libxl__qmp_close(libxl__qmp_handler *qmp) void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *qmp_socket; qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to remove QMP socket file %s", - qmp_socket); + LOGE(ERROR, "Failed to remove QMP socket file %s", qmp_socket); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyMH-00086p-Oz; Fri, 22 Nov 2013 21: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 1VjyMG-00086b-0q for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:48 +0000 Received: from [193.109.254.147:59743] by server-12.bemta-14.messagelabs.com id 2F/2C-25062-BBDCF825; Fri, 22 Nov 2013 21:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385156025!210487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9235 invoked from network); 22 Nov 2013 21:33:46 -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 Nov 2013 21:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMD-0004CY-CF for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMD-00047q-6s for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:45 +0000 Date: Fri, 22 Nov 2013 21:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Use new macro LOGE() in libxl_qmp.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 c61ca4baa041c49b70b3ccee04cac48fdf6f7bff Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:51 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: Use new macro LOGE() in libxl_qmp.c Code cleanup -- no functional changes Coding style has recently been changed for libxl. The convenience macro LOGE() has been introduced, and invocations of the old macro LIBXL__LOG_ERROR() are to be replaced with it. Change all occurences of the old macro (in functions that have a local libxl_gc *gc) except the one in register_serials_chardev_callback() to the new one. (This function lacks a local libxl__gc *gc, which LOGE() requires.) Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 411a9b5..4e55454 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -342,8 +342,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid) qmp = calloc(1, sizeof (libxl__qmp_handler)); if (qmp == NULL) { - LIBXL__LOG_ERRNO(libxl__gc_owner(gc), LIBXL__LOG_ERROR, - "Failed to allocate qmp_handler"); + LOGE(ERROR, "Failed to allocate qmp_handler"); return NULL; } qmp->ctx = CTX; @@ -437,7 +436,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) } else if (ret < 0) { if (errno == EINTR) continue; - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Select error"); + LOGE(ERROR, "Select error"); return -1; } @@ -446,7 +445,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) LOG(ERROR, "Unexpected end of socket"); return -1; } else if (rd < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error"); + LOGE(ERROR, "Socket read error"); return rd; } @@ -533,8 +532,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp, elm = malloc(sizeof (callback_id_pair)); if (elm == NULL) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to allocate a QMP callback"); + LOGE(ERROR, "Failed to allocate a QMP callback"); goto out; } elm->id = qmp->last_id_used; @@ -692,7 +690,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Connection error"); + LOGE(ERROR, "Connection error"); qmp_free_handler(qmp); return NULL; } @@ -724,16 +722,13 @@ void libxl__qmp_close(libxl__qmp_handler *qmp) void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *qmp_socket; qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to remove QMP socket file %s", - qmp_socket); + LOGE(ERROR, "Failed to remove QMP socket file %s", qmp_socket); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33: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 1VjyMR-00088E-TB; Fri, 22 Nov 2013 21:33:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMQ-00087z-3n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:58 +0000 Received: from [193.109.254.147:60055] by server-7.bemta-14.messagelabs.com id 7B/BC-14870-5CDCF825; Fri, 22 Nov 2013 21:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385156035!206855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16300 invoked from network); 22 Nov 2013 21:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMN-0004Ch-IY for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMN-00048C-GV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:55 +0000 Date: Fri, 22 Nov 2013 21:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use GCSPRINTF in place of libxl_sprintf() in libxl_qmp.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 5ad997a70583f7ee43baaefd6ad2e5d71fc44663 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:52 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: use GCSPRINTF in place of libxl_sprintf() in libxl_qmp.c Code cleanup -- no functional changes The convenience macro GCSPRINTF has been written to be used in place of libxl_sprintf. Change all calls to libxl_sprintf() in libxl_qmp.c to invocations of the new macro. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 4e55454..8433e42 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -101,7 +101,7 @@ static int store_serial_port_info(libxl__qmp_handler *qmp, } path = libxl__xs_get_dompath(gc, qmp->domid); - path = libxl__sprintf(gc, "%s/serial/%d/tty", path, port); + path = GCSPRINTF("%s/serial/%d/tty", path, port); ret = libxl__xs_write(gc, XBT_NULL, path, "%s", chardev + 4); @@ -160,7 +160,7 @@ static int qmp_write_domain_console_item(libxl__gc *gc, int domid, char *path; path = libxl__xs_get_dompath(gc, domid); - path = libxl__sprintf(gc, "%s/console/%s", path, item); + path = GCSPRINTF("%s/console/%s", path, item); return libxl__xs_write(gc, XBT_NULL, path, "%s", value); } @@ -672,8 +672,7 @@ static void qmp_parameters_add_integer(libxl__gc *gc, } #define QMP_PARAMETERS_SPRINTF(args, name, format, ...) \ - qmp_parameters_add_string(gc, args, name, \ - libxl__sprintf(gc, format, __VA_ARGS__)) + qmp_parameters_add_string(gc, args, name, GCSPRINTF(format, __VA_ARGS__)) /* * API @@ -687,8 +686,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) qmp = qmp_init_handler(gc, domid); - qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl__run_dir_path(), domid); + qmp_socket = GCSPRINTF("%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { LOGE(ERROR, "Connection error"); qmp_free_handler(qmp); @@ -724,8 +722,7 @@ void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid) { char *qmp_socket; - qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl__run_dir_path(), domid); + qmp_socket = GCSPRINTF("%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { LOGE(ERROR, "Failed to remove QMP socket file %s", qmp_socket); @@ -754,8 +751,8 @@ static int pci_add_callback(libxl__qmp_handler *qmp, const libxl__json_object *bus = NULL; GC_INIT(qmp->ctx); int i, j, rc = -1; - char *asked_id = libxl__sprintf(gc, PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + char *asked_id = GCSPRINTF(PCI_PT_QDEV_ID, + pcidev->bus, pcidev->dev, pcidev->func); for (i = 0; (bus = libxl__json_array_get(response, i)); i++) { const libxl__json_object *devices = NULL; @@ -823,8 +820,8 @@ int libxl__qmp_pci_add(libxl__gc *gc, int domid, libxl_device_pci *pcidev) if (!qmp) return -1; - hostaddr = libxl__sprintf(gc, "%04x:%02x:%02x.%01x", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + hostaddr = GCSPRINTF("%04x:%02x:%02x.%01x", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); if (!hostaddr) return -1; @@ -860,8 +857,7 @@ int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev) { char *id = NULL; - id = libxl__sprintf(gc, PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + id = GCSPRINTF(PCI_PT_QDEV_ID, pcidev->bus, pcidev->dev, pcidev->func); return qmp_device_del(gc, domid, id); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:33:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:33: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 1VjyMR-00088E-TB; Fri, 22 Nov 2013 21:33:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMQ-00087z-3n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:58 +0000 Received: from [193.109.254.147:60055] by server-7.bemta-14.messagelabs.com id 7B/BC-14870-5CDCF825; Fri, 22 Nov 2013 21:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385156035!206855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16300 invoked from network); 22 Nov 2013 21:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMN-0004Ch-IY for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMN-00048C-GV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:33:55 +0000 Date: Fri, 22 Nov 2013 21:33:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use GCSPRINTF in place of libxl_sprintf() in libxl_qmp.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 5ad997a70583f7ee43baaefd6ad2e5d71fc44663 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:52 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: use GCSPRINTF in place of libxl_sprintf() in libxl_qmp.c Code cleanup -- no functional changes The convenience macro GCSPRINTF has been written to be used in place of libxl_sprintf. Change all calls to libxl_sprintf() in libxl_qmp.c to invocations of the new macro. Suggested-by: Anthony PERARD Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_qmp.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 4e55454..8433e42 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -101,7 +101,7 @@ static int store_serial_port_info(libxl__qmp_handler *qmp, } path = libxl__xs_get_dompath(gc, qmp->domid); - path = libxl__sprintf(gc, "%s/serial/%d/tty", path, port); + path = GCSPRINTF("%s/serial/%d/tty", path, port); ret = libxl__xs_write(gc, XBT_NULL, path, "%s", chardev + 4); @@ -160,7 +160,7 @@ static int qmp_write_domain_console_item(libxl__gc *gc, int domid, char *path; path = libxl__xs_get_dompath(gc, domid); - path = libxl__sprintf(gc, "%s/console/%s", path, item); + path = GCSPRINTF("%s/console/%s", path, item); return libxl__xs_write(gc, XBT_NULL, path, "%s", value); } @@ -672,8 +672,7 @@ static void qmp_parameters_add_integer(libxl__gc *gc, } #define QMP_PARAMETERS_SPRINTF(args, name, format, ...) \ - qmp_parameters_add_string(gc, args, name, \ - libxl__sprintf(gc, format, __VA_ARGS__)) + qmp_parameters_add_string(gc, args, name, GCSPRINTF(format, __VA_ARGS__)) /* * API @@ -687,8 +686,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid) qmp = qmp_init_handler(gc, domid); - qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl__run_dir_path(), domid); + qmp_socket = GCSPRINTF("%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) { LOGE(ERROR, "Connection error"); qmp_free_handler(qmp); @@ -724,8 +722,7 @@ void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid) { char *qmp_socket; - qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d", - libxl__run_dir_path(), domid); + qmp_socket = GCSPRINTF("%s/qmp-libxl-%d", libxl__run_dir_path(), domid); if (unlink(qmp_socket) == -1) { if (errno != ENOENT) { LOGE(ERROR, "Failed to remove QMP socket file %s", qmp_socket); @@ -754,8 +751,8 @@ static int pci_add_callback(libxl__qmp_handler *qmp, const libxl__json_object *bus = NULL; GC_INIT(qmp->ctx); int i, j, rc = -1; - char *asked_id = libxl__sprintf(gc, PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + char *asked_id = GCSPRINTF(PCI_PT_QDEV_ID, + pcidev->bus, pcidev->dev, pcidev->func); for (i = 0; (bus = libxl__json_array_get(response, i)); i++) { const libxl__json_object *devices = NULL; @@ -823,8 +820,8 @@ int libxl__qmp_pci_add(libxl__gc *gc, int domid, libxl_device_pci *pcidev) if (!qmp) return -1; - hostaddr = libxl__sprintf(gc, "%04x:%02x:%02x.%01x", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + hostaddr = GCSPRINTF("%04x:%02x:%02x.%01x", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); if (!hostaddr) return -1; @@ -860,8 +857,7 @@ int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev) { char *id = NULL; - id = libxl__sprintf(gc, PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + id = GCSPRINTF(PCI_PT_QDEV_ID, pcidev->bus, pcidev->dev, pcidev->func); return qmp_device_del(gc, domid, id); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMb-00089j-WE; Fri, 22 Nov 2013 21:34:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMa-00089X-Kg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:08 +0000 Received: from [85.158.137.68:56163] by server-6.bemta-3.messagelabs.com id 8B/23-04868-FCDCF825; Fri, 22 Nov 2013 21:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385156046!3282496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28067 invoked from network); 22 Nov 2013 21:34:07 -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; 22 Nov 2013 21:34:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMX-0004DG-OB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMX-00048j-Lv for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:05 +0000 Date: Fri, 22 Nov 2013 21:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use GCSPRINTF instead of libxl__sprintf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa76b2010c311a6b812c97f9f17886f18df1069b Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:53 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: use GCSPRINTF instead of libxl__sprintf Code cleanup - no functional changes The convenience macro GCSPRINTF has been written to be used in place of libxl__sprintf(). Replace all calls to libxl__sprintf() in libxl_utils.c with invocations of the new macro. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 682f874..53ebf73 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -173,8 +173,8 @@ int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid) int ret; stubdom_id_s = libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/image/device-model-domid", - libxl__xs_get_dompath(gc, guest_domid))); + GCSPRINTF("%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid))); if (stubdom_id_s) ret = atoi(stubdom_id_s); else @@ -190,7 +190,8 @@ int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid) uint32_t value; int ret = 0; - target = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/target", libxl__xs_get_dompath(gc, domid))); + target = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/target", + libxl__xs_get_dompath(gc, domid))); if (!target) goto out; value = strtol(target, &endptr, 10); @@ -227,20 +228,20 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) char *logfile, *logfile_new; int i, rc; - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name); + logfile = GCSPRINTF("/var/log/xen/%s.log", name); if (stat(logfile, &stat_buf) == 0) { /* file exists, rotate */ - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.10", name); + logfile = GCSPRINTF("/var/log/xen/%s.log.10", name); unlink(logfile); for (i = 9; i > 0; i--) { - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i); - logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i + 1); + logfile = GCSPRINTF("/var/log/xen/%s.log.%d", name, i); + logfile_new = GCSPRINTF("/var/log/xen/%s.log.%d", name, i + 1); rc = logrename(gc, logfile, logfile_new); if (rc) goto out; } - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name); - logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.1", name); + logfile = GCSPRINTF("/var/log/xen/%s.log", name); + logfile_new = GCSPRINTF("/var/log/xen/%s.log.1", name); rc = logrename(gc, logfile, logfile_new); if (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 Nov 22 21:34:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMb-00089j-WE; Fri, 22 Nov 2013 21:34:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMa-00089X-Kg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:08 +0000 Received: from [85.158.137.68:56163] by server-6.bemta-3.messagelabs.com id 8B/23-04868-FCDCF825; Fri, 22 Nov 2013 21:34:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385156046!3282496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28067 invoked from network); 22 Nov 2013 21:34:07 -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; 22 Nov 2013 21:34:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMX-0004DG-OB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMX-00048j-Lv for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:05 +0000 Date: Fri, 22 Nov 2013 21:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use GCSPRINTF instead of libxl__sprintf X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa76b2010c311a6b812c97f9f17886f18df1069b Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:53 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:09:43 2013 +0000 libxl: use GCSPRINTF instead of libxl__sprintf Code cleanup - no functional changes The convenience macro GCSPRINTF has been written to be used in place of libxl__sprintf(). Replace all calls to libxl__sprintf() in libxl_utils.c with invocations of the new macro. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 682f874..53ebf73 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -173,8 +173,8 @@ int libxl_get_stubdom_id(libxl_ctx *ctx, int guest_domid) int ret; stubdom_id_s = libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/image/device-model-domid", - libxl__xs_get_dompath(gc, guest_domid))); + GCSPRINTF("%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid))); if (stubdom_id_s) ret = atoi(stubdom_id_s); else @@ -190,7 +190,8 @@ int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid) uint32_t value; int ret = 0; - target = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/target", libxl__xs_get_dompath(gc, domid))); + target = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/target", + libxl__xs_get_dompath(gc, domid))); if (!target) goto out; value = strtol(target, &endptr, 10); @@ -227,20 +228,20 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) char *logfile, *logfile_new; int i, rc; - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name); + logfile = GCSPRINTF("/var/log/xen/%s.log", name); if (stat(logfile, &stat_buf) == 0) { /* file exists, rotate */ - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.10", name); + logfile = GCSPRINTF("/var/log/xen/%s.log.10", name); unlink(logfile); for (i = 9; i > 0; i--) { - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i); - logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.%d", name, i + 1); + logfile = GCSPRINTF("/var/log/xen/%s.log.%d", name, i); + logfile_new = GCSPRINTF("/var/log/xen/%s.log.%d", name, i + 1); rc = logrename(gc, logfile, logfile_new); if (rc) goto out; } - logfile = libxl__sprintf(gc, "/var/log/xen/%s.log", name); - logfile_new = libxl__sprintf(gc, "/var/log/xen/%s.log.1", name); + logfile = GCSPRINTF("/var/log/xen/%s.log", name); + logfile_new = GCSPRINTF("/var/log/xen/%s.log.1", name); rc = logrename(gc, logfile, logfile_new); if (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 Nov 22 21:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyMm-0008C1-4d; Fri, 22 Nov 2013 21:34:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMk-0008Bk-MH for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:18 +0000 Received: from [193.109.254.147:3121] by server-6.bemta-14.messagelabs.com id 5D/9B-19621-ADDCF825; Fri, 22 Nov 2013 21:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156056!212121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13520 invoked from network); 22 Nov 2013 21:34:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMh-0004DM-UT for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMh-00049t-SL for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:15 +0000 Date: Fri, 22 Nov 2013 21:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.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 6976583283ad3ccd0f07aca7497fff8e7ae1f267 Author: Kelley Nielsen AuthorDate: Thu Nov 14 17:50:43 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:10:31 2013 +0000 libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.c Code cleanup - no functional changes The convenience macro LOGE has been written to take the place of LIBXL__LOG_ERRNO. LOGE depends on the existence of a local libgl__gc *gc. Replace two invocations of LIBXL__LOG_ERRNO, which are in functions that already have a libxl__gc *gc present, to invocations of the new macro. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Reviewed-by: Anthony PERARD --- tools/libxl/libxl_utils.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 53ebf73..2add83a 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -191,7 +191,7 @@ int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid) int ret = 0; target = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/target", - libxl__xs_get_dompath(gc, domid))); + libxl__xs_get_dompath(gc, domid))); if (!target) goto out; value = strtol(target, &endptr, 10); @@ -207,15 +207,14 @@ out: static int logrename(libxl__gc *gc, const char *old, const char *new) { - libxl_ctx *ctx = libxl__gc_owner(gc); int r; r = rename(old, new); if (r) { if (errno == ENOENT) return 0; /* ok */ - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to rotate logfile - could not" - " rename %s to %s", old, new); + LOGE(ERROR, "failed to rotate logfile - " + "could not rename %s to %s", old, new); return ERROR_FAIL; } return 0; @@ -248,9 +247,9 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) goto out; } else { if (errno != ENOENT) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_WARNING, "problem checking existence of" - " logfile %s, which might have needed to be rotated", - name); + LOGE(WARN, "problem checking existence of logfile %s, " + "which might have needed to be rotated", + name); } *full_name = strdup(logfile); rc = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyMm-0008C1-4d; Fri, 22 Nov 2013 21:34:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMk-0008Bk-MH for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:18 +0000 Received: from [193.109.254.147:3121] by server-6.bemta-14.messagelabs.com id 5D/9B-19621-ADDCF825; Fri, 22 Nov 2013 21:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156056!212121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13520 invoked from network); 22 Nov 2013 21:34:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMh-0004DM-UT for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMh-00049t-SL for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:15 +0000 Date: Fri, 22 Nov 2013 21:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.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 6976583283ad3ccd0f07aca7497fff8e7ae1f267 Author: Kelley Nielsen AuthorDate: Thu Nov 14 17:50:43 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:10:31 2013 +0000 libxl: use LOGE instead of LIBXL__LOG_ERRNO in libxl_utils.c Code cleanup - no functional changes The convenience macro LOGE has been written to take the place of LIBXL__LOG_ERRNO. LOGE depends on the existence of a local libgl__gc *gc. Replace two invocations of LIBXL__LOG_ERRNO, which are in functions that already have a libxl__gc *gc present, to invocations of the new macro. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Reviewed-by: Anthony PERARD --- tools/libxl/libxl_utils.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 53ebf73..2add83a 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -191,7 +191,7 @@ int libxl_is_stubdom(libxl_ctx *ctx, uint32_t domid, uint32_t *target_domid) int ret = 0; target = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/target", - libxl__xs_get_dompath(gc, domid))); + libxl__xs_get_dompath(gc, domid))); if (!target) goto out; value = strtol(target, &endptr, 10); @@ -207,15 +207,14 @@ out: static int logrename(libxl__gc *gc, const char *old, const char *new) { - libxl_ctx *ctx = libxl__gc_owner(gc); int r; r = rename(old, new); if (r) { if (errno == ENOENT) return 0; /* ok */ - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to rotate logfile - could not" - " rename %s to %s", old, new); + LOGE(ERROR, "failed to rotate logfile - " + "could not rename %s to %s", old, new); return ERROR_FAIL; } return 0; @@ -248,9 +247,9 @@ int libxl_create_logfile(libxl_ctx *ctx, const char *name, char **full_name) goto out; } else { if (errno != ENOENT) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_WARNING, "problem checking existence of" - " logfile %s, which might have needed to be rotated", - name); + LOGE(WARN, "problem checking existence of logfile %s, " + "which might have needed to be rotated", + name); } *full_name = strdup(logfile); rc = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34: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 1VjyMx-0008E6-7R; Fri, 22 Nov 2013 21:34:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMv-0008Dk-81 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:29 +0000 Received: from [85.158.139.211:60496] by server-1.bemta-5.messagelabs.com id 53/1F-21065-4EDCF825; Fri, 22 Nov 2013 21:34:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1385156066!3742796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18770 invoked from network); 22 Nov 2013 21:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMs-0004DS-4y for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMs-0004AL-2G for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:26 +0000 Date: Fri, 22 Nov 2013 21:34:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOG and LOGE instead of LIBXL__LOG* in libxl_utils.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 68cd21e88376f79b958e6413657bdaa12b5e4ec0 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:55 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:13:43 2013 +0000 libxl: use LOG and LOGE instead of LIBXL__LOG* in libxl_utils.c Code cleanup - no functional changes The convenience macros LOG and LOGE have been written to take the place of the old macros in the LIBXL__LOG* family. Replace the invocations of the old macros in the function libxl_read_file_contents() with invocations of the corresponding new ones. Create a local libxl__gc gc* for the new macros to use by invoking GC_INIT(ctx) at the top of the function, and clean it up by invoking GC_FREE at the two exit points. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 2add83a..df98abd 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -290,6 +290,7 @@ out: int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, void **data_r, int *datalen_r) { + GC_INIT(ctx); FILE *f = 0; uint8_t *data = 0; int datalen = 0; @@ -300,23 +301,23 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, f = fopen(filename, "r"); if (!f) { if (errno == ENOENT) return ENOENT; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to open %s", filename); + LOGE(ERROR, "failed to open %s", filename); goto xe; } if (fstat(fileno(f), &stab)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to fstat %s", filename); + LOGE(ERROR, "failed to fstat %s", filename); goto xe; } if (!S_ISREG(stab.st_mode)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "%s is not a plain file", filename); + LOGE(ERROR, "%s is not a plain file", filename); errno = ENOTTY; goto xe; } if (stab.st_size > INT_MAX) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "file %s is far too large", filename); + LOG(ERROR, "file %s is far too large", filename); errno = EFBIG; goto xe; } @@ -330,10 +331,10 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, rs = fread(data, 1, datalen, f); if (rs != datalen) { if (ferror(f)) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to read %s", filename); + LOGE(ERROR, "failed to read %s", filename); else if (feof(f)) - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s changed size while we" - " were reading it", filename); + LOG(ERROR, "%s changed size while we were reading it", + filename); else abort(); goto xe; @@ -342,16 +343,18 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, if (fclose(f)) { f = 0; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to close %s", filename); + LOGE(ERROR, "failed to close %s", filename); goto xe; } if (data_r) *data_r = data; if (datalen_r) *datalen_r = datalen; + GC_FREE; return 0; xe: + GC_FREE; e = errno; assert(e != ENOENT); if (f) fclose(f); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34: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 1VjyMx-0008E6-7R; Fri, 22 Nov 2013 21:34:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMv-0008Dk-81 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:29 +0000 Received: from [85.158.139.211:60496] by server-1.bemta-5.messagelabs.com id 53/1F-21065-4EDCF825; Fri, 22 Nov 2013 21:34:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1385156066!3742796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18770 invoked from network); 22 Nov 2013 21:34:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyMs-0004DS-4y for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyMs-0004AL-2G for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:26 +0000 Date: Fri, 22 Nov 2013 21:34:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOG and LOGE instead of LIBXL__LOG* in libxl_utils.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 68cd21e88376f79b958e6413657bdaa12b5e4ec0 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:55 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:13:43 2013 +0000 libxl: use LOG and LOGE instead of LIBXL__LOG* in libxl_utils.c Code cleanup - no functional changes The convenience macros LOG and LOGE have been written to take the place of the old macros in the LIBXL__LOG* family. Replace the invocations of the old macros in the function libxl_read_file_contents() with invocations of the corresponding new ones. Create a local libxl__gc gc* for the new macros to use by invoking GC_INIT(ctx) at the top of the function, and clean it up by invoking GC_FREE at the two exit points. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 2add83a..df98abd 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -290,6 +290,7 @@ out: int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, void **data_r, int *datalen_r) { + GC_INIT(ctx); FILE *f = 0; uint8_t *data = 0; int datalen = 0; @@ -300,23 +301,23 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, f = fopen(filename, "r"); if (!f) { if (errno == ENOENT) return ENOENT; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to open %s", filename); + LOGE(ERROR, "failed to open %s", filename); goto xe; } if (fstat(fileno(f), &stab)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to fstat %s", filename); + LOGE(ERROR, "failed to fstat %s", filename); goto xe; } if (!S_ISREG(stab.st_mode)) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "%s is not a plain file", filename); + LOGE(ERROR, "%s is not a plain file", filename); errno = ENOTTY; goto xe; } if (stab.st_size > INT_MAX) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "file %s is far too large", filename); + LOG(ERROR, "file %s is far too large", filename); errno = EFBIG; goto xe; } @@ -330,10 +331,10 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, rs = fread(data, 1, datalen, f); if (rs != datalen) { if (ferror(f)) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to read %s", filename); + LOGE(ERROR, "failed to read %s", filename); else if (feof(f)) - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "%s changed size while we" - " were reading it", filename); + LOG(ERROR, "%s changed size while we were reading it", + filename); else abort(); goto xe; @@ -342,16 +343,18 @@ int libxl_read_file_contents(libxl_ctx *ctx, const char *filename, if (fclose(f)) { f = 0; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to close %s", filename); + LOGE(ERROR, "failed to close %s", filename); goto xe; } if (data_r) *data_r = data; if (datalen_r) *datalen_r = datalen; + GC_FREE; return 0; xe: + GC_FREE; e = errno; assert(e != ENOENT); if (f) fclose(f); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN6-0008FV-BI; Fri, 22 Nov 2013 21:34:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN4-0008FH-Th for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:39 +0000 Received: from [85.158.139.211:64246] by server-2.bemta-5.messagelabs.com id 53/AF-29392-EEDCF825; Fri, 22 Nov 2013 21:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1385156076!1836953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12514 invoked from network); 22 Nov 2013 21:34: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; 22 Nov 2013 21:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN2-0004Da-Bu for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyN2-0004Am-9G for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:36 +0000 Date: Fri, 22 Nov 2013 21:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOG instead of LIBXL__LOG in libxl_utils.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 b8c22d2eba24e6706e8b2dd73ab306793a7d7d08 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:56 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:13:43 2013 +0000 libxl: use LOG instead of LIBXL__LOG in libxl_utils.c To conform to the new coding style, replace the invocation of LIBXL__LOG in the function libxl_pipe() in the file libxl_utils.c with an invocation of LOG. Create a local libxl__gc gc* for LOG to use by invoking GC_INIT(ctx) at the top of the function, and clean it up by invoking GC_FREE at the exit. Create a variable, ret, to consolidate exits in one place and avoid invoking GC_FREE twice. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index df98abd..cccec9b 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -478,11 +478,14 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath) int libxl_pipe(libxl_ctx *ctx, int pipes[2]) { + GC_INIT(ctx); + int ret = 0; if (pipe(pipes) < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Failed to create a pipe"); - return -1; + LOG(ERROR, "Failed to create a pipe"); + ret = -1; } - return 0; + GC_FREE; + return ret; } int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN6-0008FV-BI; Fri, 22 Nov 2013 21:34:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN4-0008FH-Th for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:39 +0000 Received: from [85.158.139.211:64246] by server-2.bemta-5.messagelabs.com id 53/AF-29392-EEDCF825; Fri, 22 Nov 2013 21:34:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1385156076!1836953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12514 invoked from network); 22 Nov 2013 21:34: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; 22 Nov 2013 21:34:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyN2-0004Da-Bu for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyN2-0004Am-9G for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:36 +0000 Date: Fri, 22 Nov 2013 21:34:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use LOG instead of LIBXL__LOG in libxl_utils.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 b8c22d2eba24e6706e8b2dd73ab306793a7d7d08 Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:23:56 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:13:43 2013 +0000 libxl: use LOG instead of LIBXL__LOG in libxl_utils.c To conform to the new coding style, replace the invocation of LIBXL__LOG in the function libxl_pipe() in the file libxl_utils.c with an invocation of LOG. Create a local libxl__gc gc* for LOG to use by invoking GC_INIT(ctx) at the top of the function, and clean it up by invoking GC_FREE at the exit. Create a variable, ret, to consolidate exits in one place and avoid invoking GC_FREE twice. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index df98abd..cccec9b 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -478,11 +478,14 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath) int libxl_pipe(libxl_ctx *ctx, int pipes[2]) { + GC_INIT(ctx); + int ret = 0; if (pipe(pipes) < 0) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Failed to create a pipe"); - return -1; + LOG(ERROR, "Failed to create a pipe"); + ret = -1; } - return 0; + GC_FREE; + return ret; } int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyNH-0008H8-EB; Fri, 22 Nov 2013 21:34:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNF-0008Gq-71 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:49 +0000 Received: from [85.158.137.68:57222] by server-7.bemta-3.messagelabs.com id 93/AC-27599-8FDCF825; Fri, 22 Nov 2013 21:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385156086!3225485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20824 invoked from network); 22 Nov 2013 21:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNC-0004Dg-H9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNC-0004B8-En for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:46 +0000 Date: Fri, 22 Nov 2013 21:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] opw: libxl: use CTX macro in libxl_utils.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 a8cf1428fc8675af6c8383c092d83e81f5dba77b Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:24:00 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:15:09 2013 +0000 opw: libxl: use CTX macro in libxl_utils.c The new coding style uses the convenience macro CTX as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the two places it occurs in libxl_utils.c. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index cccec9b..9f5f589 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -57,7 +57,7 @@ char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid) char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid) { - char *s = libxl_domid_to_name(libxl__gc_owner(gc), domid); + char *s = libxl_domid_to_name(CTX, domid); libxl__ptr_add(gc, s); return s; } @@ -135,7 +135,7 @@ int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid) char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { - char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); + char *s = libxl_cpupoolid_to_name(CTX, poolid); libxl__ptr_add(gc, s); return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:34:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21: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 1VjyNH-0008H8-EB; Fri, 22 Nov 2013 21:34:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNF-0008Gq-71 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:49 +0000 Received: from [85.158.137.68:57222] by server-7.bemta-3.messagelabs.com id 93/AC-27599-8FDCF825; Fri, 22 Nov 2013 21:34:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385156086!3225485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20824 invoked from network); 22 Nov 2013 21:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNC-0004Dg-H9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNC-0004B8-En for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:46 +0000 Date: Fri, 22 Nov 2013 21:34:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] opw: libxl: use CTX macro in libxl_utils.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 a8cf1428fc8675af6c8383c092d83e81f5dba77b Author: Kelley Nielsen AuthorDate: Mon Nov 11 15:24:00 2013 -0800 Commit: Ian Campbell CommitDate: Tue Nov 19 14:15:09 2013 +0000 opw: libxl: use CTX macro in libxl_utils.c The new coding style uses the convenience macro CTX as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the two places it occurs in libxl_utils.c. Suggested-by: Ian Campbell Signed-off-by: Kelley Nielsen Acked-by: Ian Campbell --- tools/libxl/libxl_utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index cccec9b..9f5f589 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -57,7 +57,7 @@ char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid) char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid) { - char *s = libxl_domid_to_name(libxl__gc_owner(gc), domid); + char *s = libxl_domid_to_name(CTX, domid); libxl__ptr_add(gc, s); return s; } @@ -135,7 +135,7 @@ int libxl_cpupoolid_is_valid(libxl_ctx *ctx, uint32_t poolid) char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid) { - char *s = libxl_cpupoolid_to_name(libxl__gc_owner(gc), poolid); + char *s = libxl_cpupoolid_to_name(CTX, poolid); libxl__ptr_add(gc, s); return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNd-0008Ii-7o; Fri, 22 Nov 2013 21:35:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNP-0008IP-Cw for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:59 +0000 Received: from [85.158.143.35:6491] by server-3.bemta-4.messagelabs.com id E8/7C-32360-20ECF825; Fri, 22 Nov 2013 21:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1385156096!519728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9361 invoked from network); 22 Nov 2013 21:34:57 -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; 22 Nov 2013 21:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNM-0004Dp-NQ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNM-0004BV-Kh for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:56 +0000 Date: Fri, 22 Nov 2013 21:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: flush TLB by VMID when a new domain is creating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 80ede1ac29b9207b274c85d2b91201d8c4db55ec Author: Julien Grall AuthorDate: Thu Nov 14 17:00:34 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 14:37:41 2013 +0000 xen/arm: p2m: flush TLB by VMID when a new domain is creating Once the VMID is marked unused, a new domain can reuse the VMID for its own. If the TLB is not flushed, entries can contain wrong translation. When a new p2m is allocated, switch to the new VMID and flush TLB on every physical CPUs. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 10 ++++++++++ xen/include/asm-arm/arm32/flushtlb.h | 11 +++++++++++ xen/include/asm-arm/arm64/flushtlb.h | 11 +++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2d09fef..82dda65 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -302,6 +302,15 @@ int p2m_alloc_table(struct domain *d) d->arch.vttbr = page_to_maddr(p2m->first_level) | ((uint64_t)p2m->vmid&0xff)<<48; + p2m_load_VTTBR(d); + + /* Make sure that all TLBs corresponding to the new VMID are flushed + * before using it + */ + flush_tlb(); + + p2m_load_VTTBR(current->domain); + spin_unlock(&p2m->lock); return 0; @@ -357,6 +366,7 @@ static void p2m_free_vmid(struct domain *d) spin_lock(&vmid_alloc_lock); if ( p2m->vmid != INVALID_VMID ) clear_bit(p2m->vmid, vmid_mask); + spin_unlock(&vmid_alloc_lock); } diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h index a258f58..ab166f3 100644 --- a/xen/include/asm-arm/arm32/flushtlb.h +++ b/xen/include/asm-arm/arm32/flushtlb.h @@ -12,6 +12,17 @@ static inline void flush_tlb_local(void) isb(); } +/* Flush inner shareable TLBs, current VMID only */ +static inline void flush_tlb(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLIS); + + dsb(); + isb(); +} + /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(void) { diff --git a/xen/include/asm-arm/arm64/flushtlb.h b/xen/include/asm-arm/arm64/flushtlb.h index d0535a0..9ce79a8 100644 --- a/xen/include/asm-arm/arm64/flushtlb.h +++ b/xen/include/asm-arm/arm64/flushtlb.h @@ -12,6 +12,17 @@ static inline void flush_tlb_local(void) : : : "memory"); } +/* Flush innershareable TLBs, current VMID only */ +static inline void flush_tlb(void) +{ + asm volatile( + "dsb sy;" + "tlbi vmalle1is;" + "dsb sy;" + "isb;" + : : : "memory"); +} + /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(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 Nov 22 21:35:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNd-0008Ii-7o; Fri, 22 Nov 2013 21:35:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNP-0008IP-Cw for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:59 +0000 Received: from [85.158.143.35:6491] by server-3.bemta-4.messagelabs.com id E8/7C-32360-20ECF825; Fri, 22 Nov 2013 21:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1385156096!519728!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9361 invoked from network); 22 Nov 2013 21:34:57 -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; 22 Nov 2013 21:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNM-0004Dp-NQ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNM-0004BV-Kh for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:34:56 +0000 Date: Fri, 22 Nov 2013 21:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: flush TLB by VMID when a new domain is creating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 80ede1ac29b9207b274c85d2b91201d8c4db55ec Author: Julien Grall AuthorDate: Thu Nov 14 17:00:34 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 14:37:41 2013 +0000 xen/arm: p2m: flush TLB by VMID when a new domain is creating Once the VMID is marked unused, a new domain can reuse the VMID for its own. If the TLB is not flushed, entries can contain wrong translation. When a new p2m is allocated, switch to the new VMID and flush TLB on every physical CPUs. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 10 ++++++++++ xen/include/asm-arm/arm32/flushtlb.h | 11 +++++++++++ xen/include/asm-arm/arm64/flushtlb.h | 11 +++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2d09fef..82dda65 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -302,6 +302,15 @@ int p2m_alloc_table(struct domain *d) d->arch.vttbr = page_to_maddr(p2m->first_level) | ((uint64_t)p2m->vmid&0xff)<<48; + p2m_load_VTTBR(d); + + /* Make sure that all TLBs corresponding to the new VMID are flushed + * before using it + */ + flush_tlb(); + + p2m_load_VTTBR(current->domain); + spin_unlock(&p2m->lock); return 0; @@ -357,6 +366,7 @@ static void p2m_free_vmid(struct domain *d) spin_lock(&vmid_alloc_lock); if ( p2m->vmid != INVALID_VMID ) clear_bit(p2m->vmid, vmid_mask); + spin_unlock(&vmid_alloc_lock); } diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h index a258f58..ab166f3 100644 --- a/xen/include/asm-arm/arm32/flushtlb.h +++ b/xen/include/asm-arm/arm32/flushtlb.h @@ -12,6 +12,17 @@ static inline void flush_tlb_local(void) isb(); } +/* Flush inner shareable TLBs, current VMID only */ +static inline void flush_tlb(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLIS); + + dsb(); + isb(); +} + /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(void) { diff --git a/xen/include/asm-arm/arm64/flushtlb.h b/xen/include/asm-arm/arm64/flushtlb.h index d0535a0..9ce79a8 100644 --- a/xen/include/asm-arm/arm64/flushtlb.h +++ b/xen/include/asm-arm/arm64/flushtlb.h @@ -12,6 +12,17 @@ static inline void flush_tlb_local(void) : : : "memory"); } +/* Flush innershareable TLBs, current VMID only */ +static inline void flush_tlb(void) +{ + asm volatile( + "dsb sy;" + "tlbi vmalle1is;" + "dsb sy;" + "isb;" + : : : "memory"); +} + /* Flush local TLBs, all VMIDs, non-hypervisor mode */ static inline void flush_tlb_all_local(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 Nov 22 21:35:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNf-0008Jh-Vq; Fri, 22 Nov 2013 21:35:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNf-0008J4-9n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:15 +0000 Received: from [193.109.254.147:54191] by server-9.bemta-14.messagelabs.com id 49/7C-08751-11ECF825; Fri, 22 Nov 2013 21:35:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385156112!209712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1150 invoked from network); 22 Nov 2013 21:35:13 -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; 22 Nov 2013 21:35:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNb-0004EL-Tr for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNW-0004C5-R3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:06 +0000 Date: Fri, 22 Nov 2013 21:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: correct duplicate MPIDR check to actually skip 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 9b6b1b815c500d142ba4f13d5cd1929e385c56b6 Author: Matthew Daley AuthorDate: Fri Nov 8 13:32:03 2013 +1300 Commit: Ian Campbell CommitDate: Tue Nov 19 14:39:12 2013 +0000 xen/arm: correct duplicate MPIDR check to actually skip the node Signed-off-by: Matthew Daley Acked-by: Julien Grall --- xen/arch/arm/smpboot.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index b836be4..6c90fa6 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -161,9 +161,11 @@ void __init smp_init_cpus(void) printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", dt_node_full_name(cpu)); - continue; + break; } } + if ( j != cpuidx ) + continue; /* * Build a stashed array of MPIDR values. Numbering scheme requires -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNf-0008Jh-Vq; Fri, 22 Nov 2013 21:35:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNf-0008J4-9n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:15 +0000 Received: from [193.109.254.147:54191] by server-9.bemta-14.messagelabs.com id 49/7C-08751-11ECF825; Fri, 22 Nov 2013 21:35:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385156112!209712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1150 invoked from network); 22 Nov 2013 21:35:13 -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; 22 Nov 2013 21:35:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNb-0004EL-Tr for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNW-0004C5-R3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:06 +0000 Date: Fri, 22 Nov 2013 21:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: correct duplicate MPIDR check to actually skip 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 9b6b1b815c500d142ba4f13d5cd1929e385c56b6 Author: Matthew Daley AuthorDate: Fri Nov 8 13:32:03 2013 +1300 Commit: Ian Campbell CommitDate: Tue Nov 19 14:39:12 2013 +0000 xen/arm: correct duplicate MPIDR check to actually skip the node Signed-off-by: Matthew Daley Acked-by: Julien Grall --- xen/arch/arm/smpboot.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index b836be4..6c90fa6 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -161,9 +161,11 @@ void __init smp_init_cpus(void) printk(XENLOG_WARNING "cpu node `%s`: duplicate /cpu reg properties in the DT\n", dt_node_full_name(cpu)); - continue; + break; } } + if ( j != cpuidx ) + continue; /* * Build a stashed array of MPIDR values. Numbering scheme requires -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNr-0008Lp-6j; Fri, 22 Nov 2013 21:35:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNp-0008LW-VG for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:26 +0000 Received: from [85.158.139.211:8074] by server-12.bemta-5.messagelabs.com id 40/33-30017-D1ECF825; Fri, 22 Nov 2013 21:35:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385156123!3749177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21057 invoked from network); 22 Nov 2013 21:35:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:35:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNn-0004EX-Bb for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNm-0004D3-2F for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:23 +0000 Date: Fri, 22 Nov 2013 21:35:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: ioremap_attr: return NULL is __vmap failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1b346fdb72c86367c28e79d140ccc8515a0c3f4 Author: Julien Grall AuthorDate: Mon Nov 18 13:08:23 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:00:03 2013 +0000 xen/arm: ioremap_attr: return NULL is __vmap failed Most of ioremap_* caller check if ioremap returns NULL. Actually, if the physical address is non-aligned, Xen will return the pointer given by __vmap plus the offset in the page. So if ioremap_* fails, the caller will retrieve an non-NULL address and continue as if there was no error. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 123280e..2de7dc7 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -742,8 +742,12 @@ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) unsigned long pfn = PFN_DOWN(pa); unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); + void *ptr = __vmap(&pfn, nr, 1, 1, attributes); - return (__vmap(&pfn, nr, 1, 1, attributes) + offs); + if ( ptr == NULL ) + return NULL; + + return ptr + offs; } void *ioremap(paddr_t pa, size_t len) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyNr-0008Lp-6j; Fri, 22 Nov 2013 21:35:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNp-0008LW-VG for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:26 +0000 Received: from [85.158.139.211:8074] by server-12.bemta-5.messagelabs.com id 40/33-30017-D1ECF825; Fri, 22 Nov 2013 21:35:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385156123!3749177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21057 invoked from network); 22 Nov 2013 21:35:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:35:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNn-0004EX-Bb for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNm-0004D3-2F for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:23 +0000 Date: Fri, 22 Nov 2013 21:35:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: ioremap_attr: return NULL is __vmap failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1b346fdb72c86367c28e79d140ccc8515a0c3f4 Author: Julien Grall AuthorDate: Mon Nov 18 13:08:23 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:00:03 2013 +0000 xen/arm: ioremap_attr: return NULL is __vmap failed Most of ioremap_* caller check if ioremap returns NULL. Actually, if the physical address is non-aligned, Xen will return the pointer given by __vmap plus the offset in the page. So if ioremap_* fails, the caller will retrieve an non-NULL address and continue as if there was no error. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 123280e..2de7dc7 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -742,8 +742,12 @@ void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) unsigned long pfn = PFN_DOWN(pa); unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); + void *ptr = __vmap(&pfn, nr, 1, 1, attributes); - return (__vmap(&pfn, nr, 1, 1, attributes) + offs); + if ( ptr == NULL ) + return NULL; + + return ptr + offs; } void *ioremap(paddr_t pa, size_t len) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyO1-0008Ni-Cy; Fri, 22 Nov 2013 21:35:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyO0-0008NT-8J for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:36 +0000 Received: from [85.158.139.211:2401] by server-5.bemta-5.messagelabs.com id 20/62-14928-72ECF825; Fri, 22 Nov 2013 21:35:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156133!698273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24679 invoked from network); 22 Nov 2013 21:35:34 -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 Nov 2013 21:35:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNx-0004Ef-HF for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNx-0004DT-F5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:33 +0000 Date: Fri, 22 Nov 2013 21:35:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if platform initialization failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92cf481ac5495d80e5fe76a5c453388b07e55e63 Author: Julien Grall AuthorDate: Fri Nov 15 15:27:36 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:00:50 2013 +0000 xen/arm: Panic if platform initialization failed Actually, if an error occurs, Xen will silently ignore it and continue. Convert platform_init to a void function and panic if we fail to correctly initialize the platform. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 5 +++-- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db135f8..0fbbdc7 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -54,7 +54,7 @@ static void dump_platform_table(void) printk(" - %s\n", p->name); } -int __init platform_init(void) +void __init platform_init(void) { int res = 0; @@ -82,7 +82,8 @@ int __init platform_init(void) if ( platform && platform->init ) res = platform->init(); - return res; + if ( res ) + panic("Unable to initialize the platform\n"); } int __init platform_init_time(void) diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 43afebb..c282b30 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -45,7 +45,7 @@ struct platform_desc { */ #define PLATFORM_QUIRK_DOM0_MAPPING_11 (1 << 0) -int __init platform_init(void); +void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); #ifdef CONFIG_ARM_32 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyO1-0008Ni-Cy; Fri, 22 Nov 2013 21:35:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyO0-0008NT-8J for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:36 +0000 Received: from [85.158.139.211:2401] by server-5.bemta-5.messagelabs.com id 20/62-14928-72ECF825; Fri, 22 Nov 2013 21:35:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156133!698273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24679 invoked from network); 22 Nov 2013 21:35:34 -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 Nov 2013 21:35:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyNx-0004Ef-HF for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyNx-0004DT-F5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:33 +0000 Date: Fri, 22 Nov 2013 21:35:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if platform initialization failed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92cf481ac5495d80e5fe76a5c453388b07e55e63 Author: Julien Grall AuthorDate: Fri Nov 15 15:27:36 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:00:50 2013 +0000 xen/arm: Panic if platform initialization failed Actually, if an error occurs, Xen will silently ignore it and continue. Convert platform_init to a void function and panic if we fail to correctly initialize the platform. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 5 +++-- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db135f8..0fbbdc7 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -54,7 +54,7 @@ static void dump_platform_table(void) printk(" - %s\n", p->name); } -int __init platform_init(void) +void __init platform_init(void) { int res = 0; @@ -82,7 +82,8 @@ int __init platform_init(void) if ( platform && platform->init ) res = platform->init(); - return res; + if ( res ) + panic("Unable to initialize the platform\n"); } int __init platform_init_time(void) diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 43afebb..c282b30 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -45,7 +45,7 @@ struct platform_desc { */ #define PLATFORM_QUIRK_DOM0_MAPPING_11 (1 << 0) -int __init platform_init(void); +void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); #ifdef CONFIG_ARM_32 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyOB-0008PP-G8; Fri, 22 Nov 2013 21:35:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOA-0008PD-AL for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:46 +0000 Received: from [85.158.143.35:10019] by server-3.bemta-4.messagelabs.com id 46/BC-32360-13ECF825; Fri, 22 Nov 2013 21:35:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385156143!523593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22974 invoked from network); 22 Nov 2013 21:35:44 -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; 22 Nov 2013 21:35:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyO7-0004El-MJ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyO7-0004Dp-L3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:43 +0000 Date: Fri, 22 Nov 2013 21:35:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if we are unable to initialize 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 5238d28edc8cf2881df4b9494596660acc4c7c08 Author: Julien Grall AuthorDate: Fri Nov 15 15:27:37 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:01:08 2013 +0000 xen/arm: Panic if we are unable to initialize platform timer The caller of xen_init_time, start_xen, doesn't check the return value of the function. Xen will silently ignore the error and continue. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index a30d422..938995d 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -132,7 +132,7 @@ int __init init_xen_time(void) res = platform_init_time(); if ( res ) - return res; + panic("Timer: Cannot initialize platform timer\n"); /* Check that this CPU supports the Generic Timer interface */ if ( !cpu_has_gentimer ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:47 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyOB-0008PP-G8; Fri, 22 Nov 2013 21:35:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOA-0008PD-AL for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:46 +0000 Received: from [85.158.143.35:10019] by server-3.bemta-4.messagelabs.com id 46/BC-32360-13ECF825; Fri, 22 Nov 2013 21:35:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385156143!523593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22974 invoked from network); 22 Nov 2013 21:35:44 -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; 22 Nov 2013 21:35:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyO7-0004El-MJ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyO7-0004Dp-L3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:43 +0000 Date: Fri, 22 Nov 2013 21:35:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Panic if we are unable to initialize 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 5238d28edc8cf2881df4b9494596660acc4c7c08 Author: Julien Grall AuthorDate: Fri Nov 15 15:27:37 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:01:08 2013 +0000 xen/arm: Panic if we are unable to initialize platform timer The caller of xen_init_time, start_xen, doesn't check the return value of the function. Xen will silently ignore the error and continue. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index a30d422..938995d 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -132,7 +132,7 @@ int __init init_xen_time(void) res = platform_init_time(); if ( res ) - return res; + panic("Timer: Cannot initialize platform timer\n"); /* Check that this CPU supports the Generic Timer interface */ if ( !cpu_has_gentimer ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyOM-0008R9-J5; Fri, 22 Nov 2013 21:35:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOL-0008Qy-HJ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:57 +0000 Received: from [193.109.254.147:6120] by server-1.bemta-14.messagelabs.com id E6/29-10312-C3ECF825; Fri, 22 Nov 2013 21:35:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385156154!212423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3089 invoked from network); 22 Nov 2013 21:35:55 -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; 22 Nov 2013 21:35:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOH-0004Eu-S9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOH-0004EB-Q5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:53 +0000 Date: Fri, 22 Nov 2013 21:35:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Report aarch64 capability. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25795713b1dc65c2d23d1a7ee927fa8926a78625 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:09 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:04:58 2013 +0000 xen: arm: Report aarch64 capability. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/setup.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1081b43..cdcc2e7 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -731,6 +731,10 @@ void arch_get_xen_caps(xen_capabilities_info_t *info) (*info)[0] = '\0'; +#ifdef CONFIG_ARM_64 + snprintf(s, sizeof(s), "xen-%d.%d-aarch64 ", major, minor); + safe_strcat(*info, s); +#endif snprintf(s, sizeof(s), "xen-%d.%d-armv7l ", major, minor); safe_strcat(*info, s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:35:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:35: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 1VjyOM-0008R9-J5; Fri, 22 Nov 2013 21:35:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOL-0008Qy-HJ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:57 +0000 Received: from [193.109.254.147:6120] by server-1.bemta-14.messagelabs.com id E6/29-10312-C3ECF825; Fri, 22 Nov 2013 21:35:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385156154!212423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3089 invoked from network); 22 Nov 2013 21:35:55 -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; 22 Nov 2013 21:35:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOH-0004Eu-S9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOH-0004EB-Q5 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:35:53 +0000 Date: Fri, 22 Nov 2013 21:35:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Report aarch64 capability. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25795713b1dc65c2d23d1a7ee927fa8926a78625 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:09 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:04:58 2013 +0000 xen: arm: Report aarch64 capability. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/setup.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1081b43..cdcc2e7 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -731,6 +731,10 @@ void arch_get_xen_caps(xen_capabilities_info_t *info) (*info)[0] = '\0'; +#ifdef CONFIG_ARM_64 + snprintf(s, sizeof(s), "xen-%d.%d-aarch64 ", major, minor); + safe_strcat(*info, s); +#endif snprintf(s, sizeof(s), "xen-%d.%d-armv7l ", major, minor); safe_strcat(*info, s); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOW-0008Sx-Lr; Fri, 22 Nov 2013 21:36:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOV-0008Sj-0o for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:07 +0000 Received: from [193.109.254.147:18281] by server-8.bemta-14.messagelabs.com id A9/B1-03701-64ECF825; Fri, 22 Nov 2013 21:36:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1385156164!212133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18769 invoked from network); 22 Nov 2013 21:36:05 -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; 22 Nov 2013 21:36:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOS-0004FT-5M for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOR-0004Ei-Vl for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:04 +0000 Date: Fri, 22 Nov 2013 21:36:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add comment regard arm64 zImage v0 vs v1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41ae62495be7caa69a40c52df2470968439fa979 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:10 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:04:58 2013 +0000 xen: arm: Add comment regard arm64 zImage v0 vs v1 Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/kernel.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 315d12c..7036d94 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -139,6 +139,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, uint64_t text_offset; /* Image load offset */ uint64_t res1; uint64_t res2; + /* zImage V1 only from here */ uint64_t res3; uint64_t res4; uint64_t res5; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOW-0008Sx-Lr; Fri, 22 Nov 2013 21:36:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOV-0008Sj-0o for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:07 +0000 Received: from [193.109.254.147:18281] by server-8.bemta-14.messagelabs.com id A9/B1-03701-64ECF825; Fri, 22 Nov 2013 21:36:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1385156164!212133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18769 invoked from network); 22 Nov 2013 21:36:05 -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; 22 Nov 2013 21:36:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOS-0004FT-5M for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOR-0004Ei-Vl for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:04 +0000 Date: Fri, 22 Nov 2013 21:36:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add comment regard arm64 zImage v0 vs v1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41ae62495be7caa69a40c52df2470968439fa979 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:10 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:04:58 2013 +0000 xen: arm: Add comment regard arm64 zImage v0 vs v1 Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/kernel.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 315d12c..7036d94 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -139,6 +139,7 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, uint64_t text_offset; /* Image load offset */ uint64_t res1; uint64_t res2; + /* zImage V1 only from here */ uint64_t res3; uint64_t res4; uint64_t res5; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOg-0008UP-PV; Fri, 22 Nov 2013 21:36:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOf-0008UF-Af for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:17 +0000 Received: from [85.158.137.68:45459] by server-15.bemta-3.messagelabs.com id 2F/D7-11556-05ECF825; Fri, 22 Nov 2013 21:36:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385156174!3286619!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23664 invoked from network); 22 Nov 2013 21:36:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOc-0004FZ-BW for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOc-0004Fq-8w for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:14 +0000 Date: Fri, 22 Nov 2013 21:36:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move dom0 gic and timer device tree nodes under /xen-core-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 1c08d6004ea7973332631946b5a0ebb0858eaec4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:11 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:40:48 2013 +0000 xen: arm: move dom0 gic and timer device tree nodes under /xen-core-devices/ Julien observed that we were relying on the provided host DTB supplying suitable #address-cells and #size-cells values to allow us to represent these addresses, which may not reliably be the case. Moving these under our own known (somewhat analogous to the use of /soc/ or /motherboard/ on some platforms) allows us to control these sizes. Since the new node is created out of thin air it does not have a corresponding struct dt_device_node and therefore we cannot use dt_n_addr_cells or dt_n_size_cells, we can use hardcoded constants instead. For the same reason we define and use set_xen_range instead of dt_set_range. The hypervisor, cpus and psci node all either defined #foo-cells for their children or do not contain reg properties and therefore can remain at the top level. The logging in make_gic_node was inconsistent. Fix it. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 76 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 61 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 186746c..e574fb0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,6 +48,24 @@ custom_param("dom0_mem", parse_dom0_mem); */ #define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) +/* + * Number of cells used for addresses and sizes under the /xen/ + * node. + * + * We don't have a struct dt_device_node we can reference as a parent + * to get these values, so use these constants instead. + */ +#define XEN_FDT_NODE_ADDRESS_CELLS 2 +#define XEN_FDT_NODE_SIZE_CELLS 2 +#define XEN_FDT_NODE_REG_SIZE \ + dt_cells_to_size(XEN_FDT_NODE_ADDRESS_CELLS + XEN_FDT_NODE_SIZE_CELLS) + +static void set_xen_range(__be32 **cellp, u64 address, u64 size) +{ + dt_set_cell(cellp, XEN_FDT_NODE_ADDRESS_CELLS, address); + dt_set_cell(cellp, XEN_FDT_NODE_SIZE_CELLS, size); +} + struct vcpu *__init alloc_dom0_vcpu0(void) { if ( opt_dom0_max_vcpus == 0 ) @@ -477,8 +495,7 @@ 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) +static int make_gic_node(const struct domain *d, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; @@ -512,20 +529,19 @@ static int make_gic_node(const struct domain *d, void *fdt, 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)); + len = XEN_FDT_NODE_REG_SIZE * 2; + new_cells = xzalloc_bytes(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); + set_xen_range(&tmp, d->arch.vgic.dbase, PAGE_SIZE); - DPRINT(" Set Cpu Base 0x%"PRIpaddr" size = 0x%"PRIpaddr"\n", + DPRINT(" Set Cpu Base 0x%"PRIpaddr"-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); + set_xen_range(&tmp, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -550,8 +566,7 @@ 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 int make_timer_node(const struct domain *d, void *fdt) { static const struct dt_device_match timer_ids[] __initconst = { @@ -611,6 +626,41 @@ static int make_timer_node(const struct domain *d, void *fdt, return res; } +static int make_xen_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + int res; + + res = fdt_begin_node(fdt, "xen-core-devices"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", + XEN_FDT_NODE_ADDRESS_CELLS); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", + XEN_FDT_NODE_SIZE_CELLS); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = make_gic_node(d, fdt); + if ( res ) + return res; + + res = make_timer_node(d, 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) { @@ -776,11 +826,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_gic_node(d, kinfo->fdt, np); - if ( res ) - return res; - - res = make_timer_node(d, kinfo->fdt, np); + res = make_xen_node(d, kinfo->fdt, np); if ( res ) return res; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOg-0008UP-PV; Fri, 22 Nov 2013 21:36:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOf-0008UF-Af for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:17 +0000 Received: from [85.158.137.68:45459] by server-15.bemta-3.messagelabs.com id 2F/D7-11556-05ECF825; Fri, 22 Nov 2013 21:36:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385156174!3286619!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23664 invoked from network); 22 Nov 2013 21:36:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOc-0004FZ-BW for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOc-0004Fq-8w for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:14 +0000 Date: Fri, 22 Nov 2013 21:36:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move dom0 gic and timer device tree nodes under /xen-core-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 1c08d6004ea7973332631946b5a0ebb0858eaec4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:11 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:40:48 2013 +0000 xen: arm: move dom0 gic and timer device tree nodes under /xen-core-devices/ Julien observed that we were relying on the provided host DTB supplying suitable #address-cells and #size-cells values to allow us to represent these addresses, which may not reliably be the case. Moving these under our own known (somewhat analogous to the use of /soc/ or /motherboard/ on some platforms) allows us to control these sizes. Since the new node is created out of thin air it does not have a corresponding struct dt_device_node and therefore we cannot use dt_n_addr_cells or dt_n_size_cells, we can use hardcoded constants instead. For the same reason we define and use set_xen_range instead of dt_set_range. The hypervisor, cpus and psci node all either defined #foo-cells for their children or do not contain reg properties and therefore can remain at the top level. The logging in make_gic_node was inconsistent. Fix it. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 76 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 61 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 186746c..e574fb0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,6 +48,24 @@ custom_param("dom0_mem", parse_dom0_mem); */ #define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) +/* + * Number of cells used for addresses and sizes under the /xen/ + * node. + * + * We don't have a struct dt_device_node we can reference as a parent + * to get these values, so use these constants instead. + */ +#define XEN_FDT_NODE_ADDRESS_CELLS 2 +#define XEN_FDT_NODE_SIZE_CELLS 2 +#define XEN_FDT_NODE_REG_SIZE \ + dt_cells_to_size(XEN_FDT_NODE_ADDRESS_CELLS + XEN_FDT_NODE_SIZE_CELLS) + +static void set_xen_range(__be32 **cellp, u64 address, u64 size) +{ + dt_set_cell(cellp, XEN_FDT_NODE_ADDRESS_CELLS, address); + dt_set_cell(cellp, XEN_FDT_NODE_SIZE_CELLS, size); +} + struct vcpu *__init alloc_dom0_vcpu0(void) { if ( opt_dom0_max_vcpus == 0 ) @@ -477,8 +495,7 @@ 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) +static int make_gic_node(const struct domain *d, void *fdt) { const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; @@ -512,20 +529,19 @@ static int make_gic_node(const struct domain *d, void *fdt, 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)); + len = XEN_FDT_NODE_REG_SIZE * 2; + new_cells = xzalloc_bytes(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); + set_xen_range(&tmp, d->arch.vgic.dbase, PAGE_SIZE); - DPRINT(" Set Cpu Base 0x%"PRIpaddr" size = 0x%"PRIpaddr"\n", + DPRINT(" Set Cpu Base 0x%"PRIpaddr"-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); + set_xen_range(&tmp, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -550,8 +566,7 @@ 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 int make_timer_node(const struct domain *d, void *fdt) { static const struct dt_device_match timer_ids[] __initconst = { @@ -611,6 +626,41 @@ static int make_timer_node(const struct domain *d, void *fdt, return res; } +static int make_xen_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent) +{ + int res; + + res = fdt_begin_node(fdt, "xen-core-devices"); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", + XEN_FDT_NODE_ADDRESS_CELLS); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", + XEN_FDT_NODE_SIZE_CELLS); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = make_gic_node(d, fdt); + if ( res ) + return res; + + res = make_timer_node(d, 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) { @@ -776,11 +826,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_gic_node(d, kinfo->fdt, np); - if ( res ) - return res; - - res = make_timer_node(d, kinfo->fdt, np); + res = make_xen_node(d, kinfo->fdt, np); if ( res ) return res; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOr-0008Vr-Sg; Fri, 22 Nov 2013 21:36:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOq-0008Ve-33 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:28 +0000 Received: from [85.158.137.68:34405] by server-12.bemta-3.messagelabs.com id AC/C9-20055-B5ECF825; Fri, 22 Nov 2013 21:36:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156184!3273093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8563 invoked from network); 22 Nov 2013 21:36:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOm-0004Ff-Lq for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOm-0004GL-FE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:24 +0000 Date: Fri, 22 Nov 2013 21:36:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: allocate dom0 memory separately from preparing the dtb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8da14b8c549094f9851c6844f052676a98c3a150 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:12 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:40:56 2013 +0000 xen: arm: allocate dom0 memory separately from preparing the dtb Mixing these two together is a pain, it forces us to prepare the dtb before processing the kernel which means we don't know whether the guest is 32- or 64-bit while we construct its DTB. Instead split out the memory allocation (including 1:1 workaround handling) and p2m setup into a separate phase and then create a memory node in the DTB based on the result. This allows us to move kernel parsing before DTB setup. As part of this it was also necessary to rework where the decision regarding the placement of the DTB and initrd in RAM was made. It is now made when loading the kernel, which allows it to make use of the zImage/ELF specific information and therefore to make decisions based on complete knowledge and do it right rather than guessing in prepare_dtb and relying on a later check to see if things worked. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 203 ++++++++++++++++++++++--------------------- xen/arch/arm/kernel.c | 78 +++++++++++------ xen/arch/arm/kernel.h | 2 - 3 files changed, 156 insertions(+), 127 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e574fb0..f0def77 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -81,11 +81,8 @@ struct vcpu *__init alloc_dom0_vcpu0(void) return alloc_vcpu(dom0, 0, 0); } -static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_property *pp, - const struct dt_device_node *np, __be32 *new_cell) +static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { - 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 = NULL; @@ -116,53 +113,61 @@ 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); - dt_set_range(&new_cell, np, start, size); - kinfo->mem.bank[0].start = start; kinfo->mem.bank[0].size = size; kinfo->mem.nr_banks = 1; - return reg_size; + kinfo->unassigned_mem -= size; } -static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, - const struct dt_property *pp, - const struct dt_device_node *np, __be32 *new_cell) +static void allocate_memory(struct domain *d, struct kernel_info *kinfo) { - int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); - int l = 0; + + struct dt_device_node *memory = NULL; + const void *reg; + u32 reg_len, reg_size; 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, pp, np, new_cell); + return allocate_memory_11(d, kinfo); - while ( kinfo->unassigned_mem > 0 && l + reg_size <= pp->length - && kinfo->mem.nr_banks < NR_MEM_BANKS ) + while ( (memory = dt_find_node_by_type(memory, "memory")) ) { - 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; - 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 ) - panic("Failed to populate P2M\n"); - kinfo->mem.bank[kinfo->mem.nr_banks].start = start; - kinfo->mem.bank[kinfo->mem.nr_banks].size = size; - kinfo->mem.nr_banks++; - kinfo->unassigned_mem -= size; - - l += reg_size; - } + int l; + + DPRINT("memory node\n"); + + reg_size = dt_cells_to_size(dt_n_addr_cells(memory) + dt_n_size_cells(memory)); + + reg = dt_get_property(memory, "reg", ®_len); + if ( reg == NULL ) + panic("Memory node has no reg property!\n"); + + for ( l = 0; + kinfo->unassigned_mem > 0 && l + reg_size <= reg_len + && kinfo->mem.nr_banks < NR_MEM_BANKS; + l += reg_size ) + { + paddr_t start, size; - return l; + if ( dt_device_get_address(memory, bank, &start, &size) ) + panic("Unable to retrieve the bank %u for %s\n", + bank, dt_node_full_name(memory)); + + if ( size > kinfo->unassigned_mem ) + size = kinfo->unassigned_mem; + + printk("Populate P2M %#"PRIx64"->%#"PRIx64"\n", + start, start + size); + if ( p2m_populate_ram(d, start, start + size) < 0 ) + panic("Failed to populate P2M\n"); + kinfo->mem.bank[kinfo->mem.nr_banks].start = start; + kinfo->mem.bank[kinfo->mem.nr_banks].size = size; + kinfo->mem.nr_banks++; + + kinfo->unassigned_mem -= size; + } + } } static int write_properties(struct domain *d, struct kernel_info *kinfo, @@ -211,23 +216,6 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, continue; } } - /* - * In a memory node: adjust reg property. - * TODO: handle properly memory node (ie: device_type = "memory") - */ - else if ( dt_node_name_is_equal(np, "memory") ) - { - if ( dt_property_name_is_equal(pp, "reg") ) - { - new_data = xzalloc_bytes(pp->length); - if ( new_data == NULL ) - return -FDT_ERR_XEN(ENOMEM); - - prop_len = set_memory_reg(d, kinfo, pp, np, - (__be32 *)new_data); - prop_data = new_data; - } - } res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); @@ -304,6 +292,46 @@ static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, return res; } +static int make_memory_node(const struct domain *d, + void *fdt, + const struct kernel_info *kinfo) +{ + int res, i; + int nr_cells = XEN_FDT_NODE_REG_SIZE*kinfo->mem.nr_banks; + __be32 reg[nr_cells]; + __be32 *cells; + + DPRINT("Create memory node\n"); + + /* ePAPR 3.4 */ + res = fdt_begin_node(fdt, "memory"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "device_type", "memory"); + if ( res ) + return res; + + cells = ®[0]; + for ( i = 0 ; i < kinfo->mem.nr_banks; i++ ) + { + u64 start = kinfo->mem.bank[i].start; + u64 size = kinfo->mem.bank[i].size; + + DPRINT(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + set_xen_range(&cells, start, size); + } + + res = fdt_property(fdt, "reg", reg, nr_cells); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) { @@ -627,7 +655,8 @@ static int make_timer_node(const struct domain *d, void *fdt) } static int make_xen_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *parent, + const struct kernel_info *kinfo) { int res; @@ -649,6 +678,10 @@ static int make_xen_node(const struct domain *d, void *fdt, if ( res ) return res; + res = make_memory_node(d, fdt, kinfo); + if ( res ) + return res; + res = make_gic_node(d, fdt); if ( res ) return res; @@ -750,6 +783,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_TYPE("memory"), DT_MATCH_GIC, DT_MATCH_TIMER, { /* sentinel */ }, @@ -826,7 +860,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_xen_node(d, kinfo->fdt, np); + res = make_xen_node(d, kinfo->fdt, np, kinfo); if ( res ) return res; } @@ -841,14 +875,9 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) const void *fdt; int new_size; int ret; - paddr_t end; - paddr_t initrd_len; - paddr_t dtb_len; ASSERT(dt_host && (dt_host->sibling == NULL)); - kinfo->unassigned_mem = dom0_mem; - fdt = device_tree_flattened; new_size = fdt_totalsize(fdt) + DOM0_FDT_EXTRA_SIZE; @@ -870,36 +899,6 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) if ( ret < 0 ) goto err; - /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - initrd_len = ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); - dtb_len = ROUNDUP(fdt_totalsize(kinfo->fdt), MB(2)); - new_size = initrd_len + dtb_len; - - /* - * 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. - * If the bootloader provides an initrd, it will be loaded just - * after the DTB. - */ - end = kinfo->mem.bank[0].start + kinfo->mem.bank[0].size; - end = MIN(kinfo->mem.bank[0].start + (128<<20) + new_size, end); - - kinfo->initrd_paddr = end - initrd_len; - kinfo->dtb_paddr = kinfo->initrd_paddr - dtb_len; - - 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."); - ret = -FDT_ERR_XEN(EINVAL); - goto err; - } - return 0; err: @@ -994,11 +993,19 @@ int construct_dom0(struct domain *d) d->max_pages = ~0U; - rc = prepare_dtb(d, &kinfo); + kinfo.unassigned_mem = dom0_mem; + + allocate_memory(d, &kinfo); + + rc = kernel_prepare(&kinfo); if ( rc < 0 ) return rc; - rc = kernel_prepare(&kinfo); +#ifdef CONFIG_ARM_64 + d->arch.type = kinfo.type; +#endif + + rc = prepare_dtb(d, &kinfo); if ( rc < 0 ) return rc; @@ -1006,9 +1013,6 @@ int construct_dom0(struct domain *d) if ( rc < 0 ) return rc; - if ( kinfo.check_overlap ) - kinfo.check_overlap(&kinfo); - /* The following loads use the domain's p2m */ p2m_load_VTTBR(d); #ifdef CONFIG_ARM_64 @@ -1019,6 +1023,10 @@ int construct_dom0(struct domain *d) WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2); #endif + /* + * kernel_load will determine the placement of the initrd & fdt in + * RAM, so call it first. + */ kernel_load(&kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ initrd_load(&kinfo); @@ -1033,7 +1041,6 @@ int construct_dom0(struct domain *d) regs->pc = (register_t)kinfo.entry; - if ( is_pv32_domain(d) ) { regs->cpsr = PSR_GUEST32_INIT; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7036d94..9c1c1ad 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,26 +68,56 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) clear_fixmap(FIXMAP_MISC); } -static void kernel_zimage_check_overlap(struct kernel_info *info) +static void place_modules(struct kernel_info *info, + paddr_t kernel_start, + paddr_t kernel_end) { - paddr_t zimage_start = info->zimage.load_addr; - paddr_t zimage_end = info->zimage.load_addr + info->zimage.len; - paddr_t start = info->dtb_paddr; - paddr_t end; + /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ + const paddr_t initrd_len = + ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); + const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); + const paddr_t total = initrd_len + dtb_len; - end = info->initrd_paddr + early_info.modules.module[MOD_INITRD].size; + /* Convenient */ + const paddr_t mem_start = info->mem.bank[0].start; + const paddr_t mem_size = info->mem.bank[0].size; + const paddr_t mem_end = mem_start + mem_size; + const paddr_t kernel_size = kernel_end - kernel_start; + + paddr_t addr; + + if ( total + kernel_size > mem_size ) + panic("Not enough memory in the first bank for the dtb+initrd."); /* - * In the dom0 memory, the initrd will be just after the DTB. So we - * only need to check if the zImage range will overlap the - * DTB-initrd range. + * 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. + * + * If the bootloader provides an initrd, it will be loaded just + * after the DTB. + * + * We try to place dtb+initrd at 128MB, (or, if we have less RAM, + * as high as possible). If there is no space then fallback to + * just after the kernel, if there is room, otherwise just before. */ - if ( (start > zimage_end) || (end < zimage_start) ) + + if ( kernel_end < MIN(mem_start + MB(128), mem_end - total) ) + addr = MIN(mem_start + MB(128), mem_end - total); + else if ( mem_end - ROUNDUP(kernel_end, MB(2)) >= total ) + addr = ROUNDUP(kernel_end, MB(2)); + else if ( kernel_start - mem_start >= total ) + addr = kernel_start - total; + else + { + panic("Unable to find suitable location for dtb+initrd."); return; + } - panic(XENLOG_ERR "The kernel(0x%"PRIpaddr"-0x%"PRIpaddr - ") is overlapping the DTB-initrd(0x%"PRIpaddr"-0x%"PRIpaddr")\n", - zimage_start, zimage_end, start, end); + info->dtb_paddr = addr; + info->initrd_paddr = info->dtb_paddr + dtb_len; } static void kernel_zimage_load(struct kernel_info *info) @@ -98,6 +128,8 @@ static void kernel_zimage_load(struct kernel_info *info) paddr_t len = info->zimage.len; unsigned long offs; + place_modules(info, load_addr, load_addr + len); + printk("Loading zImage from %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr"\n", paddr, load_addr, load_addr + len); for ( offs = 0; offs < len; ) @@ -176,7 +208,6 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->check_overlap = kernel_zimage_check_overlap; info->type = DOMAIN_PV64; @@ -236,17 +267,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, 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; + load_end = MIN(info->mem.bank[0].start + MB(128), load_end); info->zimage.load_addr = load_end - end; /* Align to 2MB */ @@ -258,7 +279,6 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->check_overlap = kernel_zimage_check_overlap; #ifdef CONFIG_ARM_64 info->type = DOMAIN_PV32; @@ -269,10 +289,15 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, static void kernel_elf_load(struct kernel_info *info) { + place_modules(info, + info->elf.parms.virt_kstart, + info->elf.parms.virt_kend); + printk("Loading ELF image into guest memory\n"); info->elf.elf.dest_base = (void*)(unsigned long)info->elf.parms.virt_kstart; info->elf.elf.dest_size = info->elf.parms.virt_kend - info->elf.parms.virt_kstart; + elf_load_binary(&info->elf.elf); printk("Free temporary kernel buffer\n"); @@ -321,7 +346,6 @@ static int kernel_try_elf_prepare(struct kernel_info *info, */ info->entry = info->elf.parms.virt_entry; info->load = kernel_elf_load; - info->check_overlap = NULL; if ( elf_check_broken(&info->elf.elf) ) printk("Xen: warning: ELF kernel broken: %s\n", diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index debf590..b48c2c9 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -40,8 +40,6 @@ struct kernel_info { }; void (*load)(struct kernel_info *info); - /* Callback to check overlap between the kernel and the device tree */ - void (*check_overlap)(struct kernel_info *kinfo); int load_attr; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyOr-0008Vr-Sg; Fri, 22 Nov 2013 21:36:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOq-0008Ve-33 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:28 +0000 Received: from [85.158.137.68:34405] by server-12.bemta-3.messagelabs.com id AC/C9-20055-B5ECF825; Fri, 22 Nov 2013 21:36:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156184!3273093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8563 invoked from network); 22 Nov 2013 21:36:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOm-0004Ff-Lq for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOm-0004GL-FE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:24 +0000 Date: Fri, 22 Nov 2013 21:36:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: allocate dom0 memory separately from preparing the dtb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8da14b8c549094f9851c6844f052676a98c3a150 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:12 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:40:56 2013 +0000 xen: arm: allocate dom0 memory separately from preparing the dtb Mixing these two together is a pain, it forces us to prepare the dtb before processing the kernel which means we don't know whether the guest is 32- or 64-bit while we construct its DTB. Instead split out the memory allocation (including 1:1 workaround handling) and p2m setup into a separate phase and then create a memory node in the DTB based on the result. This allows us to move kernel parsing before DTB setup. As part of this it was also necessary to rework where the decision regarding the placement of the DTB and initrd in RAM was made. It is now made when loading the kernel, which allows it to make use of the zImage/ELF specific information and therefore to make decisions based on complete knowledge and do it right rather than guessing in prepare_dtb and relying on a later check to see if things worked. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 203 ++++++++++++++++++++++--------------------- xen/arch/arm/kernel.c | 78 +++++++++++------ xen/arch/arm/kernel.h | 2 - 3 files changed, 156 insertions(+), 127 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e574fb0..f0def77 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -81,11 +81,8 @@ struct vcpu *__init alloc_dom0_vcpu0(void) return alloc_vcpu(dom0, 0, 0); } -static int set_memory_reg_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_property *pp, - const struct dt_device_node *np, __be32 *new_cell) +static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { - 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 = NULL; @@ -116,53 +113,61 @@ 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); - dt_set_range(&new_cell, np, start, size); - kinfo->mem.bank[0].start = start; kinfo->mem.bank[0].size = size; kinfo->mem.nr_banks = 1; - return reg_size; + kinfo->unassigned_mem -= size; } -static int set_memory_reg(struct domain *d, struct kernel_info *kinfo, - const struct dt_property *pp, - const struct dt_device_node *np, __be32 *new_cell) +static void allocate_memory(struct domain *d, struct kernel_info *kinfo) { - int reg_size = dt_cells_to_size(dt_n_addr_cells(np) + dt_n_size_cells(np)); - int l = 0; + + struct dt_device_node *memory = NULL; + const void *reg; + u32 reg_len, reg_size; 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, pp, np, new_cell); + return allocate_memory_11(d, kinfo); - while ( kinfo->unassigned_mem > 0 && l + reg_size <= pp->length - && kinfo->mem.nr_banks < NR_MEM_BANKS ) + while ( (memory = dt_find_node_by_type(memory, "memory")) ) { - 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; - 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 ) - panic("Failed to populate P2M\n"); - kinfo->mem.bank[kinfo->mem.nr_banks].start = start; - kinfo->mem.bank[kinfo->mem.nr_banks].size = size; - kinfo->mem.nr_banks++; - kinfo->unassigned_mem -= size; - - l += reg_size; - } + int l; + + DPRINT("memory node\n"); + + reg_size = dt_cells_to_size(dt_n_addr_cells(memory) + dt_n_size_cells(memory)); + + reg = dt_get_property(memory, "reg", ®_len); + if ( reg == NULL ) + panic("Memory node has no reg property!\n"); + + for ( l = 0; + kinfo->unassigned_mem > 0 && l + reg_size <= reg_len + && kinfo->mem.nr_banks < NR_MEM_BANKS; + l += reg_size ) + { + paddr_t start, size; - return l; + if ( dt_device_get_address(memory, bank, &start, &size) ) + panic("Unable to retrieve the bank %u for %s\n", + bank, dt_node_full_name(memory)); + + if ( size > kinfo->unassigned_mem ) + size = kinfo->unassigned_mem; + + printk("Populate P2M %#"PRIx64"->%#"PRIx64"\n", + start, start + size); + if ( p2m_populate_ram(d, start, start + size) < 0 ) + panic("Failed to populate P2M\n"); + kinfo->mem.bank[kinfo->mem.nr_banks].start = start; + kinfo->mem.bank[kinfo->mem.nr_banks].size = size; + kinfo->mem.nr_banks++; + + kinfo->unassigned_mem -= size; + } + } } static int write_properties(struct domain *d, struct kernel_info *kinfo, @@ -211,23 +216,6 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, continue; } } - /* - * In a memory node: adjust reg property. - * TODO: handle properly memory node (ie: device_type = "memory") - */ - else if ( dt_node_name_is_equal(np, "memory") ) - { - if ( dt_property_name_is_equal(pp, "reg") ) - { - new_data = xzalloc_bytes(pp->length); - if ( new_data == NULL ) - return -FDT_ERR_XEN(ENOMEM); - - prop_len = set_memory_reg(d, kinfo, pp, np, - (__be32 *)new_data); - prop_data = new_data; - } - } res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); @@ -304,6 +292,46 @@ static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, return res; } +static int make_memory_node(const struct domain *d, + void *fdt, + const struct kernel_info *kinfo) +{ + int res, i; + int nr_cells = XEN_FDT_NODE_REG_SIZE*kinfo->mem.nr_banks; + __be32 reg[nr_cells]; + __be32 *cells; + + DPRINT("Create memory node\n"); + + /* ePAPR 3.4 */ + res = fdt_begin_node(fdt, "memory"); + if ( res ) + return res; + + res = fdt_property_string(fdt, "device_type", "memory"); + if ( res ) + return res; + + cells = ®[0]; + for ( i = 0 ; i < kinfo->mem.nr_banks; i++ ) + { + u64 start = kinfo->mem.bank[i].start; + u64 size = kinfo->mem.bank[i].size; + + DPRINT(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + set_xen_range(&cells, start, size); + } + + res = fdt_property(fdt, "reg", reg, nr_cells); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) { @@ -627,7 +655,8 @@ static int make_timer_node(const struct domain *d, void *fdt) } static int make_xen_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *parent, + const struct kernel_info *kinfo) { int res; @@ -649,6 +678,10 @@ static int make_xen_node(const struct domain *d, void *fdt, if ( res ) return res; + res = make_memory_node(d, fdt, kinfo); + if ( res ) + return res; + res = make_gic_node(d, fdt); if ( res ) return res; @@ -750,6 +783,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_TYPE("memory"), DT_MATCH_GIC, DT_MATCH_TIMER, { /* sentinel */ }, @@ -826,7 +860,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_xen_node(d, kinfo->fdt, np); + res = make_xen_node(d, kinfo->fdt, np, kinfo); if ( res ) return res; } @@ -841,14 +875,9 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) const void *fdt; int new_size; int ret; - paddr_t end; - paddr_t initrd_len; - paddr_t dtb_len; ASSERT(dt_host && (dt_host->sibling == NULL)); - kinfo->unassigned_mem = dom0_mem; - fdt = device_tree_flattened; new_size = fdt_totalsize(fdt) + DOM0_FDT_EXTRA_SIZE; @@ -870,36 +899,6 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) if ( ret < 0 ) goto err; - /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - initrd_len = ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); - dtb_len = ROUNDUP(fdt_totalsize(kinfo->fdt), MB(2)); - new_size = initrd_len + dtb_len; - - /* - * 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. - * If the bootloader provides an initrd, it will be loaded just - * after the DTB. - */ - end = kinfo->mem.bank[0].start + kinfo->mem.bank[0].size; - end = MIN(kinfo->mem.bank[0].start + (128<<20) + new_size, end); - - kinfo->initrd_paddr = end - initrd_len; - kinfo->dtb_paddr = kinfo->initrd_paddr - dtb_len; - - 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."); - ret = -FDT_ERR_XEN(EINVAL); - goto err; - } - return 0; err: @@ -994,11 +993,19 @@ int construct_dom0(struct domain *d) d->max_pages = ~0U; - rc = prepare_dtb(d, &kinfo); + kinfo.unassigned_mem = dom0_mem; + + allocate_memory(d, &kinfo); + + rc = kernel_prepare(&kinfo); if ( rc < 0 ) return rc; - rc = kernel_prepare(&kinfo); +#ifdef CONFIG_ARM_64 + d->arch.type = kinfo.type; +#endif + + rc = prepare_dtb(d, &kinfo); if ( rc < 0 ) return rc; @@ -1006,9 +1013,6 @@ int construct_dom0(struct domain *d) if ( rc < 0 ) return rc; - if ( kinfo.check_overlap ) - kinfo.check_overlap(&kinfo); - /* The following loads use the domain's p2m */ p2m_load_VTTBR(d); #ifdef CONFIG_ARM_64 @@ -1019,6 +1023,10 @@ int construct_dom0(struct domain *d) WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2); #endif + /* + * kernel_load will determine the placement of the initrd & fdt in + * RAM, so call it first. + */ kernel_load(&kinfo); /* initrd_load will fix up the fdt, so call it before dtb_load */ initrd_load(&kinfo); @@ -1033,7 +1041,6 @@ int construct_dom0(struct domain *d) regs->pc = (register_t)kinfo.entry; - if ( is_pv32_domain(d) ) { regs->cpsr = PSR_GUEST32_INIT; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 7036d94..9c1c1ad 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -68,26 +68,56 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) clear_fixmap(FIXMAP_MISC); } -static void kernel_zimage_check_overlap(struct kernel_info *info) +static void place_modules(struct kernel_info *info, + paddr_t kernel_start, + paddr_t kernel_end) { - paddr_t zimage_start = info->zimage.load_addr; - paddr_t zimage_end = info->zimage.load_addr + info->zimage.len; - paddr_t start = info->dtb_paddr; - paddr_t end; + /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ + const paddr_t initrd_len = + ROUNDUP(early_info.modules.module[MOD_INITRD].size, MB(2)); + const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); + const paddr_t total = initrd_len + dtb_len; - end = info->initrd_paddr + early_info.modules.module[MOD_INITRD].size; + /* Convenient */ + const paddr_t mem_start = info->mem.bank[0].start; + const paddr_t mem_size = info->mem.bank[0].size; + const paddr_t mem_end = mem_start + mem_size; + const paddr_t kernel_size = kernel_end - kernel_start; + + paddr_t addr; + + if ( total + kernel_size > mem_size ) + panic("Not enough memory in the first bank for the dtb+initrd."); /* - * In the dom0 memory, the initrd will be just after the DTB. So we - * only need to check if the zImage range will overlap the - * DTB-initrd range. + * 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. + * + * If the bootloader provides an initrd, it will be loaded just + * after the DTB. + * + * We try to place dtb+initrd at 128MB, (or, if we have less RAM, + * as high as possible). If there is no space then fallback to + * just after the kernel, if there is room, otherwise just before. */ - if ( (start > zimage_end) || (end < zimage_start) ) + + if ( kernel_end < MIN(mem_start + MB(128), mem_end - total) ) + addr = MIN(mem_start + MB(128), mem_end - total); + else if ( mem_end - ROUNDUP(kernel_end, MB(2)) >= total ) + addr = ROUNDUP(kernel_end, MB(2)); + else if ( kernel_start - mem_start >= total ) + addr = kernel_start - total; + else + { + panic("Unable to find suitable location for dtb+initrd."); return; + } - panic(XENLOG_ERR "The kernel(0x%"PRIpaddr"-0x%"PRIpaddr - ") is overlapping the DTB-initrd(0x%"PRIpaddr"-0x%"PRIpaddr")\n", - zimage_start, zimage_end, start, end); + info->dtb_paddr = addr; + info->initrd_paddr = info->dtb_paddr + dtb_len; } static void kernel_zimage_load(struct kernel_info *info) @@ -98,6 +128,8 @@ static void kernel_zimage_load(struct kernel_info *info) paddr_t len = info->zimage.len; unsigned long offs; + place_modules(info, load_addr, load_addr + len); + printk("Loading zImage from %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr"\n", paddr, load_addr, load_addr + len); for ( offs = 0; offs < len; ) @@ -176,7 +208,6 @@ static int kernel_try_zimage64_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->check_overlap = kernel_zimage_check_overlap; info->type = DOMAIN_PV64; @@ -236,17 +267,7 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, 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; + load_end = MIN(info->mem.bank[0].start + MB(128), load_end); info->zimage.load_addr = load_end - end; /* Align to 2MB */ @@ -258,7 +279,6 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; - info->check_overlap = kernel_zimage_check_overlap; #ifdef CONFIG_ARM_64 info->type = DOMAIN_PV32; @@ -269,10 +289,15 @@ static int kernel_try_zimage32_prepare(struct kernel_info *info, static void kernel_elf_load(struct kernel_info *info) { + place_modules(info, + info->elf.parms.virt_kstart, + info->elf.parms.virt_kend); + printk("Loading ELF image into guest memory\n"); info->elf.elf.dest_base = (void*)(unsigned long)info->elf.parms.virt_kstart; info->elf.elf.dest_size = info->elf.parms.virt_kend - info->elf.parms.virt_kstart; + elf_load_binary(&info->elf.elf); printk("Free temporary kernel buffer\n"); @@ -321,7 +346,6 @@ static int kernel_try_elf_prepare(struct kernel_info *info, */ info->entry = info->elf.parms.virt_entry; info->load = kernel_elf_load; - info->check_overlap = NULL; if ( elf_check_broken(&info->elf.elf) ) printk("Xen: warning: ELF kernel broken: %s\n", diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index debf590..b48c2c9 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -40,8 +40,6 @@ struct kernel_info { }; void (*load)(struct kernel_info *info); - /* Callback to check overlap between the kernel and the device tree */ - void (*check_overlap)(struct kernel_info *kinfo); int load_attr; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyP1-00005t-27; Fri, 22 Nov 2013 21:36:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOz-00005b-A3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:37 +0000 Received: from [193.109.254.147:7200] by server-7.bemta-14.messagelabs.com id DF/AD-14870-46ECF825; Fri, 22 Nov 2013 21:36:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1385156195!211105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24265 invoked from network); 22 Nov 2013 21:36:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOw-0004Fn-Rg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOw-0004Gp-Pn for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:34 +0000 Date: Fri, 22 Nov 2013 21:36:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add enable-method to cpu nodes for arm64 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 2c43bedb2c79219d60540ae37552646c98acd5ec Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:13 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: add enable-method to cpu nodes for arm64 guests. This is required by the Linux arm64 boot protocol. We use PSCI. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f0def77..4014b0a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -513,6 +513,13 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } + if ( is_pv64_domain(d) ) + { + res = fdt_property_string(fdt, "enable-method", "psci"); + if ( res ) + return res; + } + res = fdt_end_node(fdt); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyP1-00005t-27; Fri, 22 Nov 2013 21:36:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOz-00005b-A3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:37 +0000 Received: from [193.109.254.147:7200] by server-7.bemta-14.messagelabs.com id DF/AD-14870-46ECF825; Fri, 22 Nov 2013 21:36:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1385156195!211105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24265 invoked from network); 22 Nov 2013 21:36:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyOw-0004Fn-Rg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyOw-0004Gp-Pn for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:34 +0000 Date: Fri, 22 Nov 2013 21:36:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: add enable-method to cpu nodes for arm64 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 2c43bedb2c79219d60540ae37552646c98acd5ec Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:13 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: add enable-method to cpu nodes for arm64 guests. This is required by the Linux arm64 boot protocol. We use PSCI. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f0def77..4014b0a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -513,6 +513,13 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } + if ( is_pv64_domain(d) ) + { + res = fdt_property_string(fdt, "enable-method", "psci"); + if ( res ) + return res; + } + res = fdt_end_node(fdt); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyPB-00007a-4z; Fri, 22 Nov 2013 21:36:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyP9-00007J-Ch for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:47 +0000 Received: from [193.109.254.147:57038] by server-16.bemta-14.messagelabs.com id 86/67-03396-E6ECF825; Fri, 22 Nov 2013 21:36:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385156205!208787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14038 invoked from network); 22 Nov 2013 21:36:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyP7-0004Ft-1L for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyP6-0004HF-VO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:45 +0000 Date: Fri, 22 Nov 2013 21:36:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: include header for for arch_do_{sys, dom}ctl prototype X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 192a99841eb50ac835bf724b458ff53634e77ea1 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:14 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: include header for for arch_do_{sys, dom}ctl prototype Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domctl.c | 1 + xen/arch/arm/sysctl.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 851ee40..4cf0294 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -9,6 +9,7 @@ #include #include #include +#include #include long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 6388204..98bab6a 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -10,6 +10,7 @@ #include #include #include +#include #include void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:36:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:36: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 1VjyPB-00007a-4z; Fri, 22 Nov 2013 21:36:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyP9-00007J-Ch for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:47 +0000 Received: from [193.109.254.147:57038] by server-16.bemta-14.messagelabs.com id 86/67-03396-E6ECF825; Fri, 22 Nov 2013 21:36:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385156205!208787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14038 invoked from network); 22 Nov 2013 21:36:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:36:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyP7-0004Ft-1L for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyP6-0004HF-VO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:45 +0000 Date: Fri, 22 Nov 2013 21:36:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: include header for for arch_do_{sys, dom}ctl prototype X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 192a99841eb50ac835bf724b458ff53634e77ea1 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:14 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: include header for for arch_do_{sys, dom}ctl prototype Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domctl.c | 1 + xen/arch/arm/sysctl.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 851ee40..4cf0294 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -9,6 +9,7 @@ #include #include #include +#include #include long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 6388204..98bab6a 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -10,6 +10,7 @@ #include #include #include +#include #include void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:37:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPM-00009Q-83; Fri, 22 Nov 2013 21:37:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPJ-000097-P9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:58 +0000 Received: from [193.109.254.147:57402] by server-6.bemta-14.messagelabs.com id 42/9C-19621-97ECF825; Fri, 22 Nov 2013 21:36:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385156215!210771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19527 invoked from network); 22 Nov 2013 21:36:56 -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 Nov 2013 21:36:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPH-0004G2-6i for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPH-0004Hb-5P for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:55 +0000 Date: Fri, 22 Nov 2013 21:36:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement XEN_DOMCTL_set_address_size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b862f0b018c36c2d375e2edab5b787115822507c Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:15 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: implement XEN_DOMCTL_set_address_size This is subarch specific to plumb through to arm32 and arm64 versions. The toolstack uses this to select 32- vs 64-bit guests (or rather it does on x86 and soon will for arm too). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/domctl.c | 35 +++++++++++++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/domctl.c | 59 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/domctl.c | 6 +++- xen/include/asm-arm/hypercall.h | 3 ++ 6 files changed, 104 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index aacdcb9..65ecff4 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -7,5 +7,6 @@ obj-y += traps.o obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o +obj-y += domctl.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/domctl.c b/xen/arch/arm/arm32/domctl.c new file mode 100644 index 0000000..c2ca4d3 --- /dev/null +++ b/xen/arch/arm/arm32/domctl.c @@ -0,0 +1,35 @@ +/****************************************************************************** + * Subarch-specific domctl.c + * + * Copyright (c) 2013, Citrix Systems + */ + +#include +#include +#include +#include +#include +#include +#include + +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + switch ( domctl->cmd ) + { + case XEN_DOMCTL_set_address_size: + return domctl->u.address_size.size == 32 ? 0 : -EINVAL; + default: + return -ENOSYS; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 5d28bad..d2d5875 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -6,5 +6,6 @@ obj-y += traps.o obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o +obj-y += domctl.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c new file mode 100644 index 0000000..e2b4617 --- /dev/null +++ b/xen/arch/arm/arm64/domctl.c @@ -0,0 +1,59 @@ +/****************************************************************************** + * Subarch-specific domctl.c + * + * Copyright (c) 2013, Citrix Systems + */ + +#include +#include +#include +#include +#include +#include +#include + +static long switch_mode(struct domain *d, enum domain_type type) +{ + if ( d == NULL ) + return -EINVAL; + if ( d->tot_pages != 0 ) + return -EBUSY; + if ( d->arch.type == type ) + return 0; + + d->arch.type = type; + + return 0; +} + +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + switch ( domctl->cmd ) + { + case XEN_DOMCTL_set_address_size: + switch ( domctl->u.address_size.size ) + { + case 32: + return switch_mode(d, DOMAIN_PV32); + case 64: + return switch_mode(d, DOMAIN_PV64); + default: + return -EINVAL; + } + break; + + default: + return -ENOSYS; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 4cf0294..546e86b 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -15,7 +15,11 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) { - return -ENOSYS; + switch ( domctl->cmd ) + { + default: + return subarch_do_domctl(domctl, d, u_domctl); + } } void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) diff --git a/xen/include/asm-arm/hypercall.h b/xen/include/asm-arm/hypercall.h index 3327a96..94a92d4 100644 --- a/xen/include/asm-arm/hypercall.h +++ b/xen/include/asm-arm/hypercall.h @@ -6,6 +6,9 @@ int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); + #endif /* __ASM_ARM_HYPERCALL_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 Nov 22 21:37:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPM-00009Q-83; Fri, 22 Nov 2013 21:37:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPJ-000097-P9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:58 +0000 Received: from [193.109.254.147:57402] by server-6.bemta-14.messagelabs.com id 42/9C-19621-97ECF825; Fri, 22 Nov 2013 21:36:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385156215!210771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19527 invoked from network); 22 Nov 2013 21:36:56 -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 Nov 2013 21:36:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPH-0004G2-6i for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPH-0004Hb-5P for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:36:55 +0000 Date: Fri, 22 Nov 2013 21:36:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement XEN_DOMCTL_set_address_size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b862f0b018c36c2d375e2edab5b787115822507c Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:15 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: implement XEN_DOMCTL_set_address_size This is subarch specific to plumb through to arm32 and arm64 versions. The toolstack uses this to select 32- vs 64-bit guests (or rather it does on x86 and soon will for arm too). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/domctl.c | 35 +++++++++++++++++++++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/domctl.c | 59 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/domctl.c | 6 +++- xen/include/asm-arm/hypercall.h | 3 ++ 6 files changed, 104 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index aacdcb9..65ecff4 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -7,5 +7,6 @@ obj-y += traps.o obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o +obj-y += domctl.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm32/domctl.c b/xen/arch/arm/arm32/domctl.c new file mode 100644 index 0000000..c2ca4d3 --- /dev/null +++ b/xen/arch/arm/arm32/domctl.c @@ -0,0 +1,35 @@ +/****************************************************************************** + * Subarch-specific domctl.c + * + * Copyright (c) 2013, Citrix Systems + */ + +#include +#include +#include +#include +#include +#include +#include + +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + switch ( domctl->cmd ) + { + case XEN_DOMCTL_set_address_size: + return domctl->u.address_size.size == 32 ? 0 : -EINVAL; + default: + return -ENOSYS; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 5d28bad..d2d5875 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -6,5 +6,6 @@ obj-y += traps.o obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o +obj-y += domctl.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c new file mode 100644 index 0000000..e2b4617 --- /dev/null +++ b/xen/arch/arm/arm64/domctl.c @@ -0,0 +1,59 @@ +/****************************************************************************** + * Subarch-specific domctl.c + * + * Copyright (c) 2013, Citrix Systems + */ + +#include +#include +#include +#include +#include +#include +#include + +static long switch_mode(struct domain *d, enum domain_type type) +{ + if ( d == NULL ) + return -EINVAL; + if ( d->tot_pages != 0 ) + return -EBUSY; + if ( d->arch.type == type ) + return 0; + + d->arch.type = type; + + return 0; +} + +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + switch ( domctl->cmd ) + { + case XEN_DOMCTL_set_address_size: + switch ( domctl->u.address_size.size ) + { + case 32: + return switch_mode(d, DOMAIN_PV32); + case 64: + return switch_mode(d, DOMAIN_PV64); + default: + return -EINVAL; + } + break; + + default: + return -ENOSYS; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 4cf0294..546e86b 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -15,7 +15,11 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) { - return -ENOSYS; + switch ( domctl->cmd ) + { + default: + return subarch_do_domctl(domctl, d, u_domctl); + } } void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) diff --git a/xen/include/asm-arm/hypercall.h b/xen/include/asm-arm/hypercall.h index 3327a96..94a92d4 100644 --- a/xen/include/asm-arm/hypercall.h +++ b/xen/include/asm-arm/hypercall.h @@ -6,6 +6,9 @@ int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); +long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); + #endif /* __ASM_ARM_HYPERCALL_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 Nov 22 21:37:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPV-0000B9-Ak; Fri, 22 Nov 2013 21:37:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPT-0000At-RY for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:08 +0000 Received: from [193.109.254.147:12132] by server-12.bemta-14.messagelabs.com id 02/6D-25062-38ECF825; Fri, 22 Nov 2013 21:37:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156225!212380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19844 invoked from network); 22 Nov 2013 21:37:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPR-0004Gb-CW for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPR-0004I9-9v for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:05 +0000 Date: Fri, 22 Nov 2013 21:37:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement arch_set_info_guest for 64-bit vcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27ac7f3bab482f860b6191f3bb6848a468987d2c Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:16 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: implement arch_set_info_guest for 64-bit vcpus This all seems too easy... Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 64 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index cb0424d..5ff7adf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -550,7 +550,7 @@ void arch_domain_destroy(struct domain *d) free_xenheap_page(d->shared_info); } -static int is_guest_psr(uint32_t psr) +static int is_guest_pv32_psr(uint32_t psr) { switch (psr & PSR_MODE_MASK) { @@ -569,6 +569,29 @@ static int is_guest_psr(uint32_t psr) } } + +#ifdef CONFIG_ARM_64 +static int is_guest_pv64_psr(uint32_t psr) +{ + if ( psr & PSR_MODE_BIT ) + return 0; + + switch (psr & PSR_MODE_MASK) + { + case PSR_MODE_EL1h: + case PSR_MODE_EL1t: + case PSR_MODE_EL0t: + return 1; + case PSR_MODE_EL3h: + case PSR_MODE_EL3t: + case PSR_MODE_EL2h: + case PSR_MODE_EL2t: + default: + return 0; + } +} +#endif + /* * Initialise VCPU state. The context can be supplied by either the * toolstack (XEN_DOMCTL_setvcpucontext) or the guest @@ -580,19 +603,32 @@ int arch_set_info_guest( struct vcpu_guest_context *ctxt = c.nat; struct vcpu_guest_core_regs *regs = &c.nat->user_regs; - if ( !is_guest_psr(regs->cpsr) ) - return -EINVAL; - - if ( regs->spsr_svc && !is_guest_psr(regs->spsr_svc) ) - return -EINVAL; - if ( regs->spsr_abt && !is_guest_psr(regs->spsr_abt) ) - return -EINVAL; - if ( regs->spsr_und && !is_guest_psr(regs->spsr_und) ) - return -EINVAL; - if ( regs->spsr_irq && !is_guest_psr(regs->spsr_irq) ) - return -EINVAL; - if ( regs->spsr_fiq && !is_guest_psr(regs->spsr_fiq) ) - return -EINVAL; + if ( is_pv32_domain(v->domain) ) + { + if ( !is_guest_pv32_psr(regs->cpsr) ) + return -EINVAL; + + if ( regs->spsr_svc && !is_guest_pv32_psr(regs->spsr_svc) ) + return -EINVAL; + if ( regs->spsr_abt && !is_guest_pv32_psr(regs->spsr_abt) ) + return -EINVAL; + if ( regs->spsr_und && !is_guest_pv32_psr(regs->spsr_und) ) + return -EINVAL; + if ( regs->spsr_irq && !is_guest_pv32_psr(regs->spsr_irq) ) + return -EINVAL; + if ( regs->spsr_fiq && !is_guest_pv32_psr(regs->spsr_fiq) ) + return -EINVAL; + } +#ifdef CONFIG_ARM_64 + else + { + if ( !is_guest_pv64_psr(regs->cpsr) ) + return -EINVAL; + + if ( regs->spsr_el1 && !is_guest_pv64_psr(regs->spsr_el1) ) + return -EINVAL; + } +#endif vcpu_regs_user_to_hyp(v, regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:37:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPV-0000B9-Ak; Fri, 22 Nov 2013 21:37:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPT-0000At-RY for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:08 +0000 Received: from [193.109.254.147:12132] by server-12.bemta-14.messagelabs.com id 02/6D-25062-38ECF825; Fri, 22 Nov 2013 21:37:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156225!212380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19844 invoked from network); 22 Nov 2013 21:37:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPR-0004Gb-CW for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPR-0004I9-9v for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:05 +0000 Date: Fri, 22 Nov 2013 21:37:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: implement arch_set_info_guest for 64-bit vcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27ac7f3bab482f860b6191f3bb6848a468987d2c Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:16 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 xen: arm: implement arch_set_info_guest for 64-bit vcpus This all seems too easy... Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 64 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index cb0424d..5ff7adf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -550,7 +550,7 @@ void arch_domain_destroy(struct domain *d) free_xenheap_page(d->shared_info); } -static int is_guest_psr(uint32_t psr) +static int is_guest_pv32_psr(uint32_t psr) { switch (psr & PSR_MODE_MASK) { @@ -569,6 +569,29 @@ static int is_guest_psr(uint32_t psr) } } + +#ifdef CONFIG_ARM_64 +static int is_guest_pv64_psr(uint32_t psr) +{ + if ( psr & PSR_MODE_BIT ) + return 0; + + switch (psr & PSR_MODE_MASK) + { + case PSR_MODE_EL1h: + case PSR_MODE_EL1t: + case PSR_MODE_EL0t: + return 1; + case PSR_MODE_EL3h: + case PSR_MODE_EL3t: + case PSR_MODE_EL2h: + case PSR_MODE_EL2t: + default: + return 0; + } +} +#endif + /* * Initialise VCPU state. The context can be supplied by either the * toolstack (XEN_DOMCTL_setvcpucontext) or the guest @@ -580,19 +603,32 @@ int arch_set_info_guest( struct vcpu_guest_context *ctxt = c.nat; struct vcpu_guest_core_regs *regs = &c.nat->user_regs; - if ( !is_guest_psr(regs->cpsr) ) - return -EINVAL; - - if ( regs->spsr_svc && !is_guest_psr(regs->spsr_svc) ) - return -EINVAL; - if ( regs->spsr_abt && !is_guest_psr(regs->spsr_abt) ) - return -EINVAL; - if ( regs->spsr_und && !is_guest_psr(regs->spsr_und) ) - return -EINVAL; - if ( regs->spsr_irq && !is_guest_psr(regs->spsr_irq) ) - return -EINVAL; - if ( regs->spsr_fiq && !is_guest_psr(regs->spsr_fiq) ) - return -EINVAL; + if ( is_pv32_domain(v->domain) ) + { + if ( !is_guest_pv32_psr(regs->cpsr) ) + return -EINVAL; + + if ( regs->spsr_svc && !is_guest_pv32_psr(regs->spsr_svc) ) + return -EINVAL; + if ( regs->spsr_abt && !is_guest_pv32_psr(regs->spsr_abt) ) + return -EINVAL; + if ( regs->spsr_und && !is_guest_pv32_psr(regs->spsr_und) ) + return -EINVAL; + if ( regs->spsr_irq && !is_guest_pv32_psr(regs->spsr_irq) ) + return -EINVAL; + if ( regs->spsr_fiq && !is_guest_pv32_psr(regs->spsr_fiq) ) + return -EINVAL; + } +#ifdef CONFIG_ARM_64 + else + { + if ( !is_guest_pv64_psr(regs->cpsr) ) + return -EINVAL; + + if ( regs->spsr_el1 && !is_guest_pv64_psr(regs->spsr_el1) ) + return -EINVAL; + } +#endif vcpu_regs_user_to_hyp(v, regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:37:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPg-0000Cu-DW; Fri, 22 Nov 2013 21:37:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPe-0000Cd-6n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:18 +0000 Received: from [85.158.137.68:35637] by server-15.bemta-3.messagelabs.com id 43/58-11556-D8ECF825; Fri, 22 Nov 2013 21:37:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1385156235!3267212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19908 invoked from network); 22 Nov 2013 21:37:16 -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; 22 Nov 2013 21:37:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPb-0004Gh-IV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPb-0004J4-G7 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:15 +0000 Date: Fri, 22 Nov 2013 21:37:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: check for libfdt when building for 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 512bfe693e2189d6fc233b99cb07bfb1b4a093a4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:17 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 tools: check for libfdt when building for ARM libxl is going to want this to aid in the creation of guest device tree blobs. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/config.h.in | 3 +++ tools/configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 6 ++++++ 3 files changed, 61 insertions(+), 0 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index b1c9531..015f2a1 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -9,6 +9,9 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO +/* Define to 1 if you have the `fdt' library (-lfdt). */ +#undef HAVE_LIBFDT + /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff --git a/tools/configure b/tools/configure index ff82b32..afc3000 100755 --- a/tools/configure +++ b/tools/configure @@ -7959,6 +7959,58 @@ fi +# FDT is needed only on ARM +case "$host_cpu" in +arm*|aarch64) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdt_create in -lfdt" >&5 +$as_echo_n "checking for fdt_create in -lfdt... " >&6; } +if ${ac_cv_lib_fdt_fdt_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfdt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fdt_create (); +int +main () +{ +return fdt_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fdt_fdt_create=yes +else + ac_cv_lib_fdt_fdt_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fdt_fdt_create" >&5 +$as_echo "$ac_cv_lib_fdt_fdt_create" >&6; } +if test "x$ac_cv_lib_fdt_fdt_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBFDT 1 +_ACEOF + + LIBS="-lfdt $LIBS" + +else + as_fn_error $? "Could not find libfdt" "$LINENO" 5 +fi + +esac + # Checks for header files. for ac_header in yajl/yajl_version.h sys/eventfd.h do : diff --git a/tools/configure.ac b/tools/configure.ac index b2941a4..0754f0e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -227,6 +227,12 @@ AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) AC_CHECK_LIB([iconv], [libiconv_open], [libiconv="y"], [libiconv="n"]) AC_SUBST(libiconv) +# FDT is needed only on ARM +case "$host_cpu" in +arm*|aarch64) +AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) +esac + # Checks for header files. AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.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 Nov 22 21:37:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPg-0000Cu-DW; Fri, 22 Nov 2013 21:37:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPe-0000Cd-6n for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:18 +0000 Received: from [85.158.137.68:35637] by server-15.bemta-3.messagelabs.com id 43/58-11556-D8ECF825; Fri, 22 Nov 2013 21:37:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1385156235!3267212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19908 invoked from network); 22 Nov 2013 21:37:16 -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; 22 Nov 2013 21:37:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPb-0004Gh-IV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPb-0004J4-G7 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:15 +0000 Date: Fri, 22 Nov 2013 21:37:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: check for libfdt when building for 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 512bfe693e2189d6fc233b99cb07bfb1b4a093a4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:17 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:05 2013 +0000 tools: check for libfdt when building for ARM libxl is going to want this to aid in the creation of guest device tree blobs. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/config.h.in | 3 +++ tools/configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 6 ++++++ 3 files changed, 61 insertions(+), 0 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index b1c9531..015f2a1 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -9,6 +9,9 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO +/* Define to 1 if you have the `fdt' library (-lfdt). */ +#undef HAVE_LIBFDT + /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff --git a/tools/configure b/tools/configure index ff82b32..afc3000 100755 --- a/tools/configure +++ b/tools/configure @@ -7959,6 +7959,58 @@ fi +# FDT is needed only on ARM +case "$host_cpu" in +arm*|aarch64) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdt_create in -lfdt" >&5 +$as_echo_n "checking for fdt_create in -lfdt... " >&6; } +if ${ac_cv_lib_fdt_fdt_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfdt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fdt_create (); +int +main () +{ +return fdt_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fdt_fdt_create=yes +else + ac_cv_lib_fdt_fdt_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fdt_fdt_create" >&5 +$as_echo "$ac_cv_lib_fdt_fdt_create" >&6; } +if test "x$ac_cv_lib_fdt_fdt_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBFDT 1 +_ACEOF + + LIBS="-lfdt $LIBS" + +else + as_fn_error $? "Could not find libfdt" "$LINENO" 5 +fi + +esac + # Checks for header files. for ac_header in yajl/yajl_version.h sys/eventfd.h do : diff --git a/tools/configure.ac b/tools/configure.ac index b2941a4..0754f0e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -227,6 +227,12 @@ AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])]) AC_CHECK_LIB([iconv], [libiconv_open], [libiconv="y"], [libiconv="n"]) AC_SUBST(libiconv) +# FDT is needed only on ARM +case "$host_cpu" in +arm*|aarch64) +AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) +esac + # Checks for header files. AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.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 Nov 22 21:37:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPq-0000EU-GH; Fri, 22 Nov 2013 21:37:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPp-0000EL-5m for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:29 +0000 Received: from [85.158.143.35:38008] by server-1.bemta-4.messagelabs.com id 7E/58-02132-89ECF825; Fri, 22 Nov 2013 21:37:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385156245!523745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25256 invoked from network); 22 Nov 2013 21:37:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPl-0004Gn-Pp for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPl-0004JT-MQ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:25 +0000 Date: Fri, 22 Nov 2013 21:37:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: define guest virtual platform in API headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99bf30a5d13e5319019c74d24c883b2e2c7e3479 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:18 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 xen: arm: define guest virtual platform in API headers The tools and the hypervisor need to agree on various aspects of the guest environment, such as interrupt numbers, memory layout, initial register values for registers which are implementation defined etc. Therefore move the associated defines into the public interface headers, or create them as necessary. This just exposes the current de-facto standard guest layout, which may be subject to change in the future. This deliberately does not make the guest layout dynamic since there is currently no need. These values should not be exposed to guests, they should find these things out via device tree or should not be relying on implementation defined defaults. Various bits of the hypervisor needed to change to configure dom0 with the real platform values while using the virtual platform configuration for guests. Arrange for this where appropriate and plumb through as needed. We also need to expose some 64-bit values (e.g. PSR_GUEST64_INIT) for the benefit of 32 bit toolstacks building 64 bit guests. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 4 +- xen/arch/arm/domain.c | 8 ++++- xen/arch/arm/domain_build.c | 13 +++++---- xen/arch/arm/gic.c | 21 +++++++++----- xen/arch/arm/psci.c | 2 +- xen/arch/arm/traps.c | 2 +- xen/arch/arm/vtimer.c | 13 ++++++--- xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/event.h | 3 +- xen/include/asm-arm/gic.h | 3 -- xen/include/asm-arm/processor.h | 7 ----- xen/include/asm-arm/psci.h | 5 --- xen/include/public/arch-arm.h | 58 +++++++++++++++++++++++++++++++------- 13 files changed, 90 insertions(+), 50 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index df59ffb..9f3fdd3 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -126,13 +126,13 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) */ ctxt->user_regs.r2_usr = 0xffffffff; - ctxt->sctlr = /* #define SCTLR_BASE */0x00c50078; + ctxt->sctlr = SCTLR_GUEST_INIT; ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ - ctxt->user_regs.cpsr = PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC; + ctxt->user_regs.cpsr = PSR_GUEST32_INIT; ctxt->flags = VGCF_online; diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 5ff7adf..2f57d01 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -461,7 +461,8 @@ int vcpu_initialise(struct vcpu *v) if ( is_idle_vcpu(v) ) return rc; - v->arch.sctlr = SCTLR_BASE; + v->arch.sctlr = SCTLR_GUEST_INIT; + /* * By default exposes an SMP system with AFF0 set to the VCPU ID * TODO: Handle multi-threading processor and cluster @@ -525,6 +526,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = vcpu_domain_init(d)) != 0 ) goto fail; + /* XXX dom0 needs more intelligent selection of PPI */ + d->arch.evtchn_irq = GUEST_EVTCHN_PPI; + /* * Virtual UART is only used by linux early printk and decompress code. * Only use it for dom0 because the linux kernel may not support @@ -740,7 +744,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - vgic_vcpu_inject_irq(v, VGIC_IRQ_EVTCHN_CALLBACK, 1); + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq, 1); } /* diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4014b0a..aa7e3d2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -333,7 +333,8 @@ static int make_memory_node(const struct domain *d, return res; } -static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) +static int make_hypervisor_node(struct domain *d, + void *fdt, const struct dt_device_node *parent) { const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" @@ -381,8 +382,8 @@ static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) * * TODO: Handle correctly the cpumask */ - DPRINT(" Event channel interrupt to %u\n", VGIC_IRQ_EVTCHN_CALLBACK); - set_interrupt_ppi(intr, VGIC_IRQ_EVTCHN_CALLBACK, 0xf, + DPRINT(" Event channel interrupt to %u\n", d->arch.evtchn_irq); + set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(fdt, &intr, 1); @@ -413,11 +414,11 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) if ( res ) return res; - res = fdt_property_cell(fdt, "cpu_off", __PSCI_cpu_off); + res = fdt_property_cell(fdt, "cpu_off", PSCI_cpu_off); if ( res ) return res; - res = fdt_property_cell(fdt, "cpu_on", __PSCI_cpu_on); + res = fdt_property_cell(fdt, "cpu_on", PSCI_cpu_on); if ( res ) return res; @@ -855,7 +856,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( np == dt_host ) { - res = make_hypervisor_node(kinfo->fdt, np); + res = make_hypervisor_node(d, kinfo->fdt, np); if ( res ) return res; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 74575cd..33c6b8d 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -717,7 +717,7 @@ int gic_events_need_delivery(void) void gic_inject(void) { if ( vcpu_info(current, evtchn_upcall_pending) ) - vgic_vcpu_inject_irq(current, VGIC_IRQ_EVTCHN_CALLBACK, 1); + vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq, 1); gic_restore_pending_irqs(current); if (!gic_events_need_delivery()) @@ -823,13 +823,20 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) int gicv_setup(struct domain *d) { - /* TODO: Retrieve distributor and CPU guest base address from the - * guest DTS - * For the moment we use dom0 DTS + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. */ - d->arch.vgic.dbase = gic.dbase; - d->arch.vgic.cbase = gic.cbase; - + if ( d == dom0 ) + { + d->arch.vgic.dbase = gic.dbase; + d->arch.vgic.cbase = gic.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } d->arch.vgic.nr_lines = 0; diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 6c3be47..c82884f 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -43,7 +43,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) memset(ctxt, 0, sizeof(*ctxt)); ctxt->user_regs.pc64 = (u64) entry_point; - ctxt->sctlr = SCTLR_BASE; + ctxt->sctlr = SCTLR_GUEST_INIT; ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 10ee498..d39e2d4 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -867,7 +867,7 @@ typedef struct { } arm_psci_t; #define PSCI(_name, _nr_args) \ - [ __PSCI_ ## _name ] = { \ + [ PSCI_ ## _name ] = { \ .fn = (arm_psci_fn_t) &do_psci_ ## _name, \ .nr_args = _nr_args, \ } diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index d58a630..f323453 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -54,21 +54,26 @@ int vcpu_domain_init(struct domain *d) int vcpu_vtimer_init(struct vcpu *v) { struct vtimer *t = &v->arch.phys_timer; + bool_t d0 = (v->domain == dom0); - /* TODO: Retrieve physical and virtual timer IRQ from the guest - * DT. For the moment we use dom0 DT + /* + * Domain 0 uses the hardware interrupts, guests get the virtual platform. */ init_timer(&t->timer, phys_timer_expired, t, v->processor); t->ctl = 0; t->cval = NOW(); - t->irq = timer_dt_irq(TIMER_PHYS_NONSECURE_PPI)->irq; + t->irq = d0 + ? timer_dt_irq(TIMER_PHYS_NONSECURE_PPI)->irq + : GUEST_TIMER_PHYS_NS_PPI; t->v = v; t = &v->arch.virt_timer; init_timer(&t->timer, virt_timer_expired, t, v->processor); t->ctl = 0; - t->irq = timer_dt_irq(TIMER_VIRT_PPI)->irq; + t->irq = d0 + ? timer_dt_irq(TIMER_VIRT_PPI)->irq + : GUEST_TIMER_VIRT_PPI; t->v = v; return 0; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 67bfbbc..d5cae2e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -112,6 +112,7 @@ struct arch_domain spinlock_t lock; } vuart; + unsigned int evtchn_irq; } __cacheline_aligned; struct arch_vcpu diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index 04d854f..dd3ad13 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -15,7 +15,8 @@ static inline int vcpu_event_delivery_is_enabled(struct vcpu *v) static inline int local_events_need_delivery_nomask(void) { - struct pending_irq *p = irq_to_pending(current, VGIC_IRQ_EVTCHN_CALLBACK); + struct pending_irq *p = irq_to_pending(current, + current->domain->arch.evtchn_irq); /* XXX: if the first interrupt has already been delivered, we should * check whether any other interrupts with priority higher than the diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 0a890be..41f0b3b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -129,9 +129,6 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f -/* XXX: write this into the DT */ -#define VGIC_IRQ_EVTCHN_CALLBACK 31 - #ifndef __ASSEMBLY__ #include diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 5294421..3da3a3d 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -48,15 +48,8 @@ #define SCTLR_A (1<<1) #define SCTLR_M (1<<0) -#define SCTLR_BASE 0x00c50078 #define HSCTLR_BASE 0x30c51878 -#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) - -#ifdef CONFIG_ARM_64 -#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) -#endif - /* HCR Hyp Configuration Register */ #define HCR_RW (1<<31) /* Register Width, ARM64 only */ #define HCR_TGE (1<<27) /* Trap General Exceptions */ diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index fdba636..67d4c35 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -6,11 +6,6 @@ #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); diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 1e8aeda..cb41ddc 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -302,8 +302,19 @@ typedef uint64_t xen_callback_t; #endif +#if defined(__XEN__) || defined(__XEN_TOOLS__) + /* PSR bits (CPSR, SPSR)*/ +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* arm32: Big Endian Mode */ +#define PSR_DBG_MASK (1<<9) /* arm64: Debug Exception mask */ +#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ + /* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 @@ -316,7 +327,6 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_SYS 0x1f /* 64 bit modes */ -#ifdef __aarch64__ #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ #define PSR_MODE_EL3h 0x0d #define PSR_MODE_EL3t 0x0c @@ -325,18 +335,44 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_EL1h 0x05 #define PSR_MODE_EL1t 0x04 #define PSR_MODE_EL0t 0x00 -#endif -#define PSR_THUMB (1<<5) /* Thumb Mode enable */ -#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ -#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ -#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ -#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ -#ifdef __aarch64__ /* For Aarch64 bit 9 is repurposed. */ -#define PSR_DBG_MASK (1<<9) +#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) +#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) + +#define SCTLR_GUEST_INIT 0x00c50078 + +/* + * Virtual machine platform (memory layout, interrupts) + * + * These are defined for consistency between the tools and the + * hypervisor. Guests must not rely on these hardcoded values but + * should instead use the FDT. + */ + +/* Physical Address Space */ +#define GUEST_GICD_BASE 0x2c001000ULL +#define GUEST_GICD_SIZE 0x1000ULL +#define GUEST_GICC_BASE 0x2c002000ULL +#define GUEST_GICC_SIZE 0x100ULL + +#define GUEST_RAM_BASE 0x80000000ULL + +#define GUEST_GNTTAB_BASE 0xb0000000ULL +#define GUEST_GNTTAB_SIZE 0x00020000ULL + +/* Interrupts */ +#define GUEST_TIMER_VIRT_PPI 27 +#define GUEST_TIMER_PHYS_S_PPI 29 +#define GUEST_TIMER_PHYS_NS_PPI 30 +#define GUEST_EVTCHN_PPI 31 + +/* PSCI functions */ +#define PSCI_cpu_suspend 0 +#define PSCI_cpu_off 1 +#define PSCI_cpu_on 2 +#define PSCI_migrate 3 + #endif -#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ -#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ #endif /* __XEN_PUBLIC_ARCH_ARM_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 Nov 22 21:37:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPq-0000EU-GH; Fri, 22 Nov 2013 21:37:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPp-0000EL-5m for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:29 +0000 Received: from [85.158.143.35:38008] by server-1.bemta-4.messagelabs.com id 7E/58-02132-89ECF825; Fri, 22 Nov 2013 21:37:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385156245!523745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25256 invoked from network); 22 Nov 2013 21:37:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPl-0004Gn-Pp for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPl-0004JT-MQ for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:25 +0000 Date: Fri, 22 Nov 2013 21:37:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: define guest virtual platform in API headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99bf30a5d13e5319019c74d24c883b2e2c7e3479 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:18 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 xen: arm: define guest virtual platform in API headers The tools and the hypervisor need to agree on various aspects of the guest environment, such as interrupt numbers, memory layout, initial register values for registers which are implementation defined etc. Therefore move the associated defines into the public interface headers, or create them as necessary. This just exposes the current de-facto standard guest layout, which may be subject to change in the future. This deliberately does not make the guest layout dynamic since there is currently no need. These values should not be exposed to guests, they should find these things out via device tree or should not be relying on implementation defined defaults. Various bits of the hypervisor needed to change to configure dom0 with the real platform values while using the virtual platform configuration for guests. Arrange for this where appropriate and plumb through as needed. We also need to expose some 64-bit values (e.g. PSR_GUEST64_INIT) for the benefit of 32 bit toolstacks building 64 bit guests. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 4 +- xen/arch/arm/domain.c | 8 ++++- xen/arch/arm/domain_build.c | 13 +++++---- xen/arch/arm/gic.c | 21 +++++++++----- xen/arch/arm/psci.c | 2 +- xen/arch/arm/traps.c | 2 +- xen/arch/arm/vtimer.c | 13 ++++++--- xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/event.h | 3 +- xen/include/asm-arm/gic.h | 3 -- xen/include/asm-arm/processor.h | 7 ----- xen/include/asm-arm/psci.h | 5 --- xen/include/public/arch-arm.h | 58 +++++++++++++++++++++++++++++++------- 13 files changed, 90 insertions(+), 50 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index df59ffb..9f3fdd3 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -126,13 +126,13 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) */ ctxt->user_regs.r2_usr = 0xffffffff; - ctxt->sctlr = /* #define SCTLR_BASE */0x00c50078; + ctxt->sctlr = SCTLR_GUEST_INIT; ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ - ctxt->user_regs.cpsr = PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC; + ctxt->user_regs.cpsr = PSR_GUEST32_INIT; ctxt->flags = VGCF_online; diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 5ff7adf..2f57d01 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -461,7 +461,8 @@ int vcpu_initialise(struct vcpu *v) if ( is_idle_vcpu(v) ) return rc; - v->arch.sctlr = SCTLR_BASE; + v->arch.sctlr = SCTLR_GUEST_INIT; + /* * By default exposes an SMP system with AFF0 set to the VCPU ID * TODO: Handle multi-threading processor and cluster @@ -525,6 +526,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) if ( (rc = vcpu_domain_init(d)) != 0 ) goto fail; + /* XXX dom0 needs more intelligent selection of PPI */ + d->arch.evtchn_irq = GUEST_EVTCHN_PPI; + /* * Virtual UART is only used by linux early printk and decompress code. * Only use it for dom0 because the linux kernel may not support @@ -740,7 +744,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - vgic_vcpu_inject_irq(v, VGIC_IRQ_EVTCHN_CALLBACK, 1); + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq, 1); } /* diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4014b0a..aa7e3d2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -333,7 +333,8 @@ static int make_memory_node(const struct domain *d, return res; } -static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) +static int make_hypervisor_node(struct domain *d, + void *fdt, const struct dt_device_node *parent) { const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" @@ -381,8 +382,8 @@ static int make_hypervisor_node(void *fdt, const struct dt_device_node *parent) * * TODO: Handle correctly the cpumask */ - DPRINT(" Event channel interrupt to %u\n", VGIC_IRQ_EVTCHN_CALLBACK); - set_interrupt_ppi(intr, VGIC_IRQ_EVTCHN_CALLBACK, 0xf, + DPRINT(" Event channel interrupt to %u\n", d->arch.evtchn_irq); + set_interrupt_ppi(intr, d->arch.evtchn_irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW); res = fdt_property_interrupts(fdt, &intr, 1); @@ -413,11 +414,11 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) if ( res ) return res; - res = fdt_property_cell(fdt, "cpu_off", __PSCI_cpu_off); + res = fdt_property_cell(fdt, "cpu_off", PSCI_cpu_off); if ( res ) return res; - res = fdt_property_cell(fdt, "cpu_on", __PSCI_cpu_on); + res = fdt_property_cell(fdt, "cpu_on", PSCI_cpu_on); if ( res ) return res; @@ -855,7 +856,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( np == dt_host ) { - res = make_hypervisor_node(kinfo->fdt, np); + res = make_hypervisor_node(d, kinfo->fdt, np); if ( res ) return res; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 74575cd..33c6b8d 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -717,7 +717,7 @@ int gic_events_need_delivery(void) void gic_inject(void) { if ( vcpu_info(current, evtchn_upcall_pending) ) - vgic_vcpu_inject_irq(current, VGIC_IRQ_EVTCHN_CALLBACK, 1); + vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq, 1); gic_restore_pending_irqs(current); if (!gic_events_need_delivery()) @@ -823,13 +823,20 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) int gicv_setup(struct domain *d) { - /* TODO: Retrieve distributor and CPU guest base address from the - * guest DTS - * For the moment we use dom0 DTS + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. */ - d->arch.vgic.dbase = gic.dbase; - d->arch.vgic.cbase = gic.cbase; - + if ( d == dom0 ) + { + d->arch.vgic.dbase = gic.dbase; + d->arch.vgic.cbase = gic.cbase; + } + else + { + d->arch.vgic.dbase = GUEST_GICD_BASE; + d->arch.vgic.cbase = GUEST_GICC_BASE; + } d->arch.vgic.nr_lines = 0; diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c index 6c3be47..c82884f 100644 --- a/xen/arch/arm/psci.c +++ b/xen/arch/arm/psci.c @@ -43,7 +43,7 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) memset(ctxt, 0, sizeof(*ctxt)); ctxt->user_regs.pc64 = (u64) entry_point; - ctxt->sctlr = SCTLR_BASE; + ctxt->sctlr = SCTLR_GUEST_INIT; ctxt->ttbr0 = 0; ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 10ee498..d39e2d4 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -867,7 +867,7 @@ typedef struct { } arm_psci_t; #define PSCI(_name, _nr_args) \ - [ __PSCI_ ## _name ] = { \ + [ PSCI_ ## _name ] = { \ .fn = (arm_psci_fn_t) &do_psci_ ## _name, \ .nr_args = _nr_args, \ } diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index d58a630..f323453 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -54,21 +54,26 @@ int vcpu_domain_init(struct domain *d) int vcpu_vtimer_init(struct vcpu *v) { struct vtimer *t = &v->arch.phys_timer; + bool_t d0 = (v->domain == dom0); - /* TODO: Retrieve physical and virtual timer IRQ from the guest - * DT. For the moment we use dom0 DT + /* + * Domain 0 uses the hardware interrupts, guests get the virtual platform. */ init_timer(&t->timer, phys_timer_expired, t, v->processor); t->ctl = 0; t->cval = NOW(); - t->irq = timer_dt_irq(TIMER_PHYS_NONSECURE_PPI)->irq; + t->irq = d0 + ? timer_dt_irq(TIMER_PHYS_NONSECURE_PPI)->irq + : GUEST_TIMER_PHYS_NS_PPI; t->v = v; t = &v->arch.virt_timer; init_timer(&t->timer, virt_timer_expired, t, v->processor); t->ctl = 0; - t->irq = timer_dt_irq(TIMER_VIRT_PPI)->irq; + t->irq = d0 + ? timer_dt_irq(TIMER_VIRT_PPI)->irq + : GUEST_TIMER_VIRT_PPI; t->v = v; return 0; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 67bfbbc..d5cae2e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -112,6 +112,7 @@ struct arch_domain spinlock_t lock; } vuart; + unsigned int evtchn_irq; } __cacheline_aligned; struct arch_vcpu diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index 04d854f..dd3ad13 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -15,7 +15,8 @@ static inline int vcpu_event_delivery_is_enabled(struct vcpu *v) static inline int local_events_need_delivery_nomask(void) { - struct pending_irq *p = irq_to_pending(current, VGIC_IRQ_EVTCHN_CALLBACK); + struct pending_irq *p = irq_to_pending(current, + current->domain->arch.evtchn_irq); /* XXX: if the first interrupt has already been delivered, we should * check whether any other interrupts with priority higher than the diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 0a890be..41f0b3b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -129,9 +129,6 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f -/* XXX: write this into the DT */ -#define VGIC_IRQ_EVTCHN_CALLBACK 31 - #ifndef __ASSEMBLY__ #include diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 5294421..3da3a3d 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -48,15 +48,8 @@ #define SCTLR_A (1<<1) #define SCTLR_M (1<<0) -#define SCTLR_BASE 0x00c50078 #define HSCTLR_BASE 0x30c51878 -#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) - -#ifdef CONFIG_ARM_64 -#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) -#endif - /* HCR Hyp Configuration Register */ #define HCR_RW (1<<31) /* Register Width, ARM64 only */ #define HCR_TGE (1<<27) /* Trap General Exceptions */ diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index fdba636..67d4c35 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -6,11 +6,6 @@ #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); diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 1e8aeda..cb41ddc 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -302,8 +302,19 @@ typedef uint64_t xen_callback_t; #endif +#if defined(__XEN__) || defined(__XEN_TOOLS__) + /* PSR bits (CPSR, SPSR)*/ +#define PSR_THUMB (1<<5) /* Thumb Mode enable */ +#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ +#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ +#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ +#define PSR_BIG_ENDIAN (1<<9) /* arm32: Big Endian Mode */ +#define PSR_DBG_MASK (1<<9) /* arm64: Debug Exception mask */ +#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ +#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ + /* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 @@ -316,7 +327,6 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_SYS 0x1f /* 64 bit modes */ -#ifdef __aarch64__ #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ #define PSR_MODE_EL3h 0x0d #define PSR_MODE_EL3t 0x0c @@ -325,18 +335,44 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_EL1h 0x05 #define PSR_MODE_EL1t 0x04 #define PSR_MODE_EL0t 0x00 -#endif -#define PSR_THUMB (1<<5) /* Thumb Mode enable */ -#define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ -#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ -#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */ -#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */ -#ifdef __aarch64__ /* For Aarch64 bit 9 is repurposed. */ -#define PSR_DBG_MASK (1<<9) +#define PSR_GUEST32_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC) +#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h) + +#define SCTLR_GUEST_INIT 0x00c50078 + +/* + * Virtual machine platform (memory layout, interrupts) + * + * These are defined for consistency between the tools and the + * hypervisor. Guests must not rely on these hardcoded values but + * should instead use the FDT. + */ + +/* Physical Address Space */ +#define GUEST_GICD_BASE 0x2c001000ULL +#define GUEST_GICD_SIZE 0x1000ULL +#define GUEST_GICC_BASE 0x2c002000ULL +#define GUEST_GICC_SIZE 0x100ULL + +#define GUEST_RAM_BASE 0x80000000ULL + +#define GUEST_GNTTAB_BASE 0xb0000000ULL +#define GUEST_GNTTAB_SIZE 0x00020000ULL + +/* Interrupts */ +#define GUEST_TIMER_VIRT_PPI 27 +#define GUEST_TIMER_PHYS_S_PPI 29 +#define GUEST_TIMER_PHYS_NS_PPI 30 +#define GUEST_EVTCHN_PPI 31 + +/* PSCI functions */ +#define PSCI_cpu_suspend 0 +#define PSCI_cpu_off 1 +#define PSCI_cpu_on 2 +#define PSCI_migrate 3 + #endif -#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */ -#define PSR_JAZELLE (1<<24) /* Jazelle Mode */ #endif /* __XEN_PUBLIC_ARCH_ARM_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 Nov 22 21:37:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPz-0000G5-L6; Fri, 22 Nov 2013 21:37:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPy-0000Fv-VR for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:39 +0000 Received: from [85.158.139.211:7852] by server-4.bemta-5.messagelabs.com id 7E/EE-26791-2AECF825; Fri, 22 Nov 2013 21:37:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156256!698444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30465 invoked from network); 22 Nov 2013 21:37:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPv-0004Gv-Vy for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPv-0004Ju-U3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:35 +0000 Date: Fri, 22 Nov 2013 21:37:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: rename various bits of zimage load with 32 suffix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6619bdfa455076db3be71e17bb7fecef5928539 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:19 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: arm: rename various bits of zimage load with 32 suffix Making room for a 64 bit implementation. Also fix a typo and stop refering to it as a bzImage, which is an x86-ism. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_armzimageloader.c | 44 ++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index 54728b8..b693390 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -36,12 +36,6 @@ */ #define GUEST_RAM_BASE 0x80000000 -#define ZIMAGE_MAGIC_OFFSET 0x24 -#define ZIMAGE_START_OFFSET 0x28 -#define ZIMAGE_END_OFFSET 0x2c - -#define ZIMAGE_MAGIC 0x016f2818 - struct minimal_dtb_header { uint32_t magic; uint32_t total_size; @@ -50,7 +44,17 @@ struct minimal_dtb_header { #define DTB_MAGIC 0xd00dfeed -static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) +/* ------------------------------------------------------------ */ +/* 32-bit zImage Support */ +/* ------------------------------------------------------------ */ + +#define ZIMAGE32_MAGIC_OFFSET 0x24 +#define ZIMAGE32_START_OFFSET 0x28 +#define ZIMAGE32_END_OFFSET 0x2c + +#define ZIMAGE32_MAGIC 0x016f2818 + +static int xc_dom_probe_zimage32_kernel(struct xc_dom_image *dom) { uint32_t *zimage; uint32_t end; @@ -69,13 +73,13 @@ static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) } zimage = (uint32_t *)dom->kernel_blob; - if ( zimage[ZIMAGE_MAGIC_OFFSET/4] != ZIMAGE_MAGIC ) + if ( zimage[ZIMAGE32_MAGIC_OFFSET/4] != ZIMAGE32_MAGIC ) { - xc_dom_printf(dom->xch, "%s: kernel is not a bzImage", __FUNCTION__); + xc_dom_printf(dom->xch, "%s: kernel is not an arm32 zImage", __FUNCTION__); return -EINVAL; } - end = zimage[ZIMAGE_END_OFFSET/4]; + end = zimage[ZIMAGE32_END_OFFSET/4]; /* * Check for an appended DTB. @@ -94,7 +98,7 @@ static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) return 0; } -static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) +static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) { uint32_t *zimage; uint32_t start, entry_addr; @@ -111,7 +115,7 @@ static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) v_start = rambase + 0x8000; v_end = v_start + dom->kernel_size; - start = zimage[ZIMAGE_START_OFFSET/4]; + start = zimage[ZIMAGE32_START_OFFSET/4]; if (start == 0) entry_addr = v_start; @@ -134,6 +138,10 @@ static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) return 0; } +/* ------------------------------------------------------------ */ +/* Common zImage Support */ +/* ------------------------------------------------------------ */ + static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) { void *dst; @@ -148,7 +156,7 @@ static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) return -1; } - DOMPRINTF("%s: kernel sed %#"PRIx64"-%#"PRIx64, + DOMPRINTF("%s: kernel seg %#"PRIx64"-%#"PRIx64, __func__, dom->kernel_seg.vstart, dom->kernel_seg.vend); DOMPRINTF("%s: copy %zd bytes from blob %p to dst %p", __func__, dom->kernel_size, dom->kernel_blob, dst); @@ -158,16 +166,16 @@ static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) return 0; } -static struct xc_dom_loader zimage_loader = { - .name = "Linux zImage (ARM)", - .probe = xc_dom_probe_zimage_kernel, - .parser = xc_dom_parse_zimage_kernel, +static struct xc_dom_loader zimage32_loader = { + .name = "Linux zImage (ARM32)", + .probe = xc_dom_probe_zimage32_kernel, + .parser = xc_dom_parse_zimage32_kernel, .loader = xc_dom_load_zimage_kernel, }; static void __init register_loader(void) { - xc_dom_register_loader(&zimage_loader); + xc_dom_register_loader(&zimage32_loader); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:37:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyPz-0000G5-L6; Fri, 22 Nov 2013 21:37:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPy-0000Fv-VR for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:39 +0000 Received: from [85.158.139.211:7852] by server-4.bemta-5.messagelabs.com id 7E/EE-26791-2AECF825; Fri, 22 Nov 2013 21:37:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156256!698444!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30465 invoked from network); 22 Nov 2013 21:37:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyPv-0004Gv-Vy for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyPv-0004Ju-U3 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:35 +0000 Date: Fri, 22 Nov 2013 21:37:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: rename various bits of zimage load with 32 suffix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6619bdfa455076db3be71e17bb7fecef5928539 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:19 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: arm: rename various bits of zimage load with 32 suffix Making room for a 64 bit implementation. Also fix a typo and stop refering to it as a bzImage, which is an x86-ism. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_armzimageloader.c | 44 ++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index 54728b8..b693390 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -36,12 +36,6 @@ */ #define GUEST_RAM_BASE 0x80000000 -#define ZIMAGE_MAGIC_OFFSET 0x24 -#define ZIMAGE_START_OFFSET 0x28 -#define ZIMAGE_END_OFFSET 0x2c - -#define ZIMAGE_MAGIC 0x016f2818 - struct minimal_dtb_header { uint32_t magic; uint32_t total_size; @@ -50,7 +44,17 @@ struct minimal_dtb_header { #define DTB_MAGIC 0xd00dfeed -static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) +/* ------------------------------------------------------------ */ +/* 32-bit zImage Support */ +/* ------------------------------------------------------------ */ + +#define ZIMAGE32_MAGIC_OFFSET 0x24 +#define ZIMAGE32_START_OFFSET 0x28 +#define ZIMAGE32_END_OFFSET 0x2c + +#define ZIMAGE32_MAGIC 0x016f2818 + +static int xc_dom_probe_zimage32_kernel(struct xc_dom_image *dom) { uint32_t *zimage; uint32_t end; @@ -69,13 +73,13 @@ static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) } zimage = (uint32_t *)dom->kernel_blob; - if ( zimage[ZIMAGE_MAGIC_OFFSET/4] != ZIMAGE_MAGIC ) + if ( zimage[ZIMAGE32_MAGIC_OFFSET/4] != ZIMAGE32_MAGIC ) { - xc_dom_printf(dom->xch, "%s: kernel is not a bzImage", __FUNCTION__); + xc_dom_printf(dom->xch, "%s: kernel is not an arm32 zImage", __FUNCTION__); return -EINVAL; } - end = zimage[ZIMAGE_END_OFFSET/4]; + end = zimage[ZIMAGE32_END_OFFSET/4]; /* * Check for an appended DTB. @@ -94,7 +98,7 @@ static int xc_dom_probe_zimage_kernel(struct xc_dom_image *dom) return 0; } -static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) +static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) { uint32_t *zimage; uint32_t start, entry_addr; @@ -111,7 +115,7 @@ static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) v_start = rambase + 0x8000; v_end = v_start + dom->kernel_size; - start = zimage[ZIMAGE_START_OFFSET/4]; + start = zimage[ZIMAGE32_START_OFFSET/4]; if (start == 0) entry_addr = v_start; @@ -134,6 +138,10 @@ static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) return 0; } +/* ------------------------------------------------------------ */ +/* Common zImage Support */ +/* ------------------------------------------------------------ */ + static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) { void *dst; @@ -148,7 +156,7 @@ static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) return -1; } - DOMPRINTF("%s: kernel sed %#"PRIx64"-%#"PRIx64, + DOMPRINTF("%s: kernel seg %#"PRIx64"-%#"PRIx64, __func__, dom->kernel_seg.vstart, dom->kernel_seg.vend); DOMPRINTF("%s: copy %zd bytes from blob %p to dst %p", __func__, dom->kernel_size, dom->kernel_blob, dst); @@ -158,16 +166,16 @@ static int xc_dom_load_zimage_kernel(struct xc_dom_image *dom) return 0; } -static struct xc_dom_loader zimage_loader = { - .name = "Linux zImage (ARM)", - .probe = xc_dom_probe_zimage_kernel, - .parser = xc_dom_parse_zimage_kernel, +static struct xc_dom_loader zimage32_loader = { + .name = "Linux zImage (ARM32)", + .probe = xc_dom_probe_zimage32_kernel, + .parser = xc_dom_parse_zimage32_kernel, .loader = xc_dom_load_zimage_kernel, }; static void __init register_loader(void) { - xc_dom_register_loader(&zimage_loader); + xc_dom_register_loader(&zimage32_loader); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:37:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyQ9-0000HV-Nm; Fri, 22 Nov 2013 21:37:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQ8-0000HM-JR for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:48 +0000 Received: from [193.109.254.147:13424] by server-8.bemta-14.messagelabs.com id 6C/42-03701-BAECF825; Fri, 22 Nov 2013 21:37:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385156266!208485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4420 invoked from network); 22 Nov 2013 21:37:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQ6-0004H1-5d for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQ6-0004KJ-3C for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:46 +0000 Date: Fri, 22 Nov 2013 21:37:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow caller to specify guest rambase rather than hardcoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6813dbe9bb0df9f75a1ffff8d2dd3a551ae023f4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:20 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: allow caller to specify guest rambase rather than hardcoding It's still hardcoded but it could now be plausibly be made variable. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxc/xc_dom.h | 1 + tools/libxc/xc_dom_armzimageloader.c | 12 +----------- tools/libxc/xc_dom_core.c | 8 ++++++++ tools/libxl/libxl_dom.c | 6 ++++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 90679da..0bc58c2 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -195,6 +195,7 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, const char *cmdline, const char *features); void xc_dom_release_phys(struct xc_dom_image *dom); void xc_dom_release(struct xc_dom_image *dom); +int xc_dom_rambase_init(struct xc_dom_image *dom, uint64_t rambase); int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb); /* Set this larger if you have enormous ramdisks/kernels. Note that diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index b693390..4e3f7ae 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -30,12 +30,6 @@ #include /* XXX ntohl is not the right function... */ -/* - * Guest virtual RAM starts here. This must be consistent with the DTB - * appended to the guest kernel. - */ -#define GUEST_RAM_BASE 0x80000000 - struct minimal_dtb_header { uint32_t magic; uint32_t total_size; @@ -103,14 +97,12 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) uint32_t *zimage; uint32_t start, entry_addr; uint64_t v_start, v_end; - uint64_t rambase = GUEST_RAM_BASE; + uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; DOMPRINTF_CALLED(dom->xch); zimage = (uint32_t *)dom->kernel_blob; - dom->rambase_pfn = rambase >> XC_PAGE_SHIFT; - /* Do not load kernel at the very first RAM address */ v_start = rambase + 0x8000; v_end = v_start + dom->kernel_size; @@ -130,8 +122,6 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) dom->parms.virt_base = rambase; dom->guest_type = "xen-3.0-armv7l"; - DOMPRINTF("%s: %s: RAM starts at %"PRI_xen_pfn, - __FUNCTION__, dom->guest_type, dom->rambase_pfn); DOMPRINTF("%s: %s: 0x%" PRIx64 " -> 0x%" PRIx64 "", __FUNCTION__, dom->guest_type, dom->kernel_seg.vstart, dom->kernel_seg.vend); diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 9355fe8..5a22fd0c 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -794,6 +794,14 @@ int xc_dom_parse_image(struct xc_dom_image *dom) return -1; } +int xc_dom_rambase_init(struct xc_dom_image *dom, uint64_t rambase) +{ + dom->rambase_pfn = rambase >> XC_PAGE_SHIFT; + DOMPRINTF("%s: RAM starts at %"PRI_xen_pfn, + __FUNCTION__, dom->rambase_pfn); + return 0; +} + int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb) { unsigned int page_shift; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a1c16b0..521329e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -393,6 +393,12 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, LOGE(ERROR, "xc_dom_boot_xen_init failed"); goto out; } +#ifdef GUEST_RAM_BASE + if ( (ret = xc_dom_rambase_init(dom, GUEST_RAM_BASE)) != 0 ) { + LOGE(ERROR, "xc_dom_rambase failed"); + goto out; + } +#endif if ( (ret = xc_dom_parse_image(dom)) != 0 ) { LOGE(ERROR, "xc_dom_parse_image failed"); 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 Nov 22 21:37:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:37: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 1VjyQ9-0000HV-Nm; Fri, 22 Nov 2013 21:37:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQ8-0000HM-JR for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:48 +0000 Received: from [193.109.254.147:13424] by server-8.bemta-14.messagelabs.com id 6C/42-03701-BAECF825; Fri, 22 Nov 2013 21:37:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385156266!208485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4420 invoked from network); 22 Nov 2013 21:37:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQ6-0004H1-5d for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQ6-0004KJ-3C for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:46 +0000 Date: Fri, 22 Nov 2013 21:37:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow caller to specify guest rambase rather than hardcoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6813dbe9bb0df9f75a1ffff8d2dd3a551ae023f4 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:20 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: allow caller to specify guest rambase rather than hardcoding It's still hardcoded but it could now be plausibly be made variable. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxc/xc_dom.h | 1 + tools/libxc/xc_dom_armzimageloader.c | 12 +----------- tools/libxc/xc_dom_core.c | 8 ++++++++ tools/libxl/libxl_dom.c | 6 ++++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 90679da..0bc58c2 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -195,6 +195,7 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, const char *cmdline, const char *features); void xc_dom_release_phys(struct xc_dom_image *dom); void xc_dom_release(struct xc_dom_image *dom); +int xc_dom_rambase_init(struct xc_dom_image *dom, uint64_t rambase); int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb); /* Set this larger if you have enormous ramdisks/kernels. Note that diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index b693390..4e3f7ae 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -30,12 +30,6 @@ #include /* XXX ntohl is not the right function... */ -/* - * Guest virtual RAM starts here. This must be consistent with the DTB - * appended to the guest kernel. - */ -#define GUEST_RAM_BASE 0x80000000 - struct minimal_dtb_header { uint32_t magic; uint32_t total_size; @@ -103,14 +97,12 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) uint32_t *zimage; uint32_t start, entry_addr; uint64_t v_start, v_end; - uint64_t rambase = GUEST_RAM_BASE; + uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; DOMPRINTF_CALLED(dom->xch); zimage = (uint32_t *)dom->kernel_blob; - dom->rambase_pfn = rambase >> XC_PAGE_SHIFT; - /* Do not load kernel at the very first RAM address */ v_start = rambase + 0x8000; v_end = v_start + dom->kernel_size; @@ -130,8 +122,6 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) dom->parms.virt_base = rambase; dom->guest_type = "xen-3.0-armv7l"; - DOMPRINTF("%s: %s: RAM starts at %"PRI_xen_pfn, - __FUNCTION__, dom->guest_type, dom->rambase_pfn); DOMPRINTF("%s: %s: 0x%" PRIx64 " -> 0x%" PRIx64 "", __FUNCTION__, dom->guest_type, dom->kernel_seg.vstart, dom->kernel_seg.vend); diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 9355fe8..5a22fd0c 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -794,6 +794,14 @@ int xc_dom_parse_image(struct xc_dom_image *dom) return -1; } +int xc_dom_rambase_init(struct xc_dom_image *dom, uint64_t rambase) +{ + dom->rambase_pfn = rambase >> XC_PAGE_SHIFT; + DOMPRINTF("%s: RAM starts at %"PRI_xen_pfn, + __FUNCTION__, dom->rambase_pfn); + return 0; +} + int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb) { unsigned int page_shift; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a1c16b0..521329e 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -393,6 +393,12 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, LOGE(ERROR, "xc_dom_boot_xen_init failed"); goto out; } +#ifdef GUEST_RAM_BASE + if ( (ret = xc_dom_rambase_init(dom, GUEST_RAM_BASE)) != 0 ) { + LOGE(ERROR, "xc_dom_rambase failed"); + goto out; + } +#endif if ( (ret = xc_dom_parse_image(dom)) != 0 ) { LOGE(ERROR, "xc_dom_parse_image failed"); 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 Nov 22 21:38:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQK-0000JB-QX; Fri, 22 Nov 2013 21:38:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQJ-0000Iy-6L for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:59 +0000 Received: from [85.158.139.211:12368] by server-16.bemta-5.messagelabs.com id 4C/D5-11843-6BECF825; Fri, 22 Nov 2013 21:37:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1385156276!3701455!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19903 invoked from network); 22 Nov 2013 21:37:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQG-0004HA-Au for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQG-0004Kg-9R for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:56 +0000 Date: Fri, 22 Nov 2013 21:37:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: allow passing a device tree blob to the 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 cb99a64029c9d1f145a72e8c5ed39135da178f2f Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:21 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: arm: allow passing a device tree blob to the guest Placement of the blob in guest RAM is simplistic but will do for now. This operation is only supported on ARM. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxc/xc_dom.h | 8 ++++++ tools/libxc/xc_dom_arm.c | 22 +++++++++++++++++- tools/libxc/xc_dom_core.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 0bc58c2..a183e62 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -51,9 +51,12 @@ struct xc_dom_image { size_t kernel_size; void *ramdisk_blob; size_t ramdisk_size; + void *devicetree_blob; + size_t devicetree_size; size_t max_kernel_size; size_t max_ramdisk_size; + size_t max_devicetree_size; /* arguments and parameters */ char *cmdline; @@ -215,6 +218,8 @@ int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz); int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz); int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz); +int xc_dom_devicetree_max_size(struct xc_dom_image *dom, size_t sz); + size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen); int xc_dom_do_gunzip(xc_interface *xch, @@ -227,6 +232,9 @@ int xc_dom_kernel_mem(struct xc_dom_image *dom, const void *mem, size_t memsize); int xc_dom_ramdisk_mem(struct xc_dom_image *dom, const void *mem, size_t memsize); +int xc_dom_devicetree_file(struct xc_dom_image *dom, const char *filename); +int xc_dom_devicetree_mem(struct xc_dom_image *dom, const void *mem, + size_t memsize); int xc_dom_parse_image(struct xc_dom_image *dom); struct xc_dom_arch *xc_dom_find_arch_hooks(xc_interface *xch, char *guest_type); diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 9f3fdd3..71138f3 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -124,7 +124,8 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) * using CONFIG_ARM_APPENDED_DTB. Ensure that r2 does not look * like a valid pointer to a set of ATAGS or a DTB. */ - ctxt->user_regs.r2_usr = 0xffffffff; + ctxt->user_regs.r2_usr = dom->devicetree_blob ? + dom->devicetree_seg.vstart : 0xffffffff; ctxt->sctlr = SCTLR_GUEST_INIT; @@ -191,6 +192,25 @@ int arch_setup_meminit(struct xc_dom_image *dom) 0, 0, &dom->p2m_host[i]); } + if ( dom->devicetree_blob ) + { + const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; + const uint64_t ramend = rambase + ( dom->total_pages << XC_PAGE_SHIFT ); + const uint64_t dtbsize = ( dom->devicetree_size + 3 ) & ~0x3; + + /* Place at 128MB if there is sufficient RAM */ + if ( ramend >= rambase + 128*1024*1024 + dtbsize ) + dom->devicetree_seg.vstart = rambase + 128*1024*1024; + else /* otherwise at top of RAM */ + dom->devicetree_seg.vstart = ramend - dtbsize; + + dom->devicetree_seg.vend = + dom->devicetree_seg.vstart + dom->devicetree_size; + DOMPRINTF("%s: devicetree: 0x%" PRIx64 " -> 0x%" PRIx64 "", + __FUNCTION__, + dom->devicetree_seg.vstart, dom->devicetree_seg.vend); + } + return 0; } diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 5a22fd0c..705694a 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -671,6 +671,7 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, dom->max_kernel_size = XC_DOM_DECOMPRESS_MAX; dom->max_ramdisk_size = XC_DOM_DECOMPRESS_MAX; + dom->max_devicetree_size = XC_DOM_DECOMPRESS_MAX; if ( cmdline ) dom->cmdline = xc_dom_strdup(dom, cmdline); @@ -706,6 +707,13 @@ int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz) return 0; } +int xc_dom_devicetree_max_size(struct xc_dom_image *dom, size_t sz) +{ + DOMPRINTF("%s: devicetree_max_size=%zx", __FUNCTION__, sz); + dom->max_devicetree_size = sz; + return 0; +} + int xc_dom_kernel_file(struct xc_dom_image *dom, const char *filename) { DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename); @@ -729,6 +737,23 @@ int xc_dom_ramdisk_file(struct xc_dom_image *dom, const char *filename) return 0; } +int xc_dom_devicetree_file(struct xc_dom_image *dom, const char *filename) +{ +#if defined (__arm__) || defined(__aarch64__) + DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename); + dom->devicetree_blob = + xc_dom_malloc_filemap(dom, filename, &dom->devicetree_size, + dom->max_devicetree_size); + + if ( dom->devicetree_blob == NULL ) + return -1; + return 0; +#else + errno = -EINVAL; + return -1; +#endif +} + int xc_dom_kernel_mem(struct xc_dom_image *dom, const void *mem, size_t memsize) { DOMPRINTF_CALLED(dom->xch); @@ -747,6 +772,15 @@ int xc_dom_ramdisk_mem(struct xc_dom_image *dom, const void *mem, return 0; } +int xc_dom_devicetree_mem(struct xc_dom_image *dom, const void *mem, + size_t memsize) +{ + DOMPRINTF_CALLED(dom->xch); + dom->devicetree_blob = (void *)mem; + dom->devicetree_size = memsize; + return 0; +} + int xc_dom_parse_image(struct xc_dom_image *dom) { int i; @@ -925,6 +959,25 @@ int xc_dom_build_image(struct xc_dom_image *dom) memcpy(ramdiskmap, dom->ramdisk_blob, dom->ramdisk_size); } + /* load devicetree */ + if ( dom->devicetree_blob ) + { + void *devicetreemap; + + if ( xc_dom_alloc_segment(dom, &dom->devicetree_seg, "devicetree", + dom->devicetree_seg.vstart, + dom->devicetree_size) != 0 ) + goto err; + devicetreemap = xc_dom_seg_to_ptr(dom, &dom->devicetree_seg); + if ( devicetreemap == NULL ) + { + DOMPRINTF("%s: xc_dom_seg_to_ptr(dom, &dom->devicetree_seg) => NULL", + __FUNCTION__); + goto err; + } + memcpy(devicetreemap, dom->devicetree_blob, dom->devicetree_size); + } + /* allocate other pages */ if ( dom->arch_hooks->alloc_magic_pages(dom) != 0 ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQK-0000JB-QX; Fri, 22 Nov 2013 21:38:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQJ-0000Iy-6L for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:59 +0000 Received: from [85.158.139.211:12368] by server-16.bemta-5.messagelabs.com id 4C/D5-11843-6BECF825; Fri, 22 Nov 2013 21:37:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1385156276!3701455!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19903 invoked from network); 22 Nov 2013 21:37:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:37:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQG-0004HA-Au for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQG-0004Kg-9R for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:37:56 +0000 Date: Fri, 22 Nov 2013 21:37:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm: allow passing a device tree blob to the 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 cb99a64029c9d1f145a72e8c5ed39135da178f2f Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:21 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:06 2013 +0000 libxc: arm: allow passing a device tree blob to the guest Placement of the blob in guest RAM is simplistic but will do for now. This operation is only supported on ARM. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxc/xc_dom.h | 8 ++++++ tools/libxc/xc_dom_arm.c | 22 +++++++++++++++++- tools/libxc/xc_dom_core.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 0bc58c2..a183e62 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -51,9 +51,12 @@ struct xc_dom_image { size_t kernel_size; void *ramdisk_blob; size_t ramdisk_size; + void *devicetree_blob; + size_t devicetree_size; size_t max_kernel_size; size_t max_ramdisk_size; + size_t max_devicetree_size; /* arguments and parameters */ char *cmdline; @@ -215,6 +218,8 @@ int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz); int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz); int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz); +int xc_dom_devicetree_max_size(struct xc_dom_image *dom, size_t sz); + size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen); int xc_dom_do_gunzip(xc_interface *xch, @@ -227,6 +232,9 @@ int xc_dom_kernel_mem(struct xc_dom_image *dom, const void *mem, size_t memsize); int xc_dom_ramdisk_mem(struct xc_dom_image *dom, const void *mem, size_t memsize); +int xc_dom_devicetree_file(struct xc_dom_image *dom, const char *filename); +int xc_dom_devicetree_mem(struct xc_dom_image *dom, const void *mem, + size_t memsize); int xc_dom_parse_image(struct xc_dom_image *dom); struct xc_dom_arch *xc_dom_find_arch_hooks(xc_interface *xch, char *guest_type); diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 9f3fdd3..71138f3 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -124,7 +124,8 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) * using CONFIG_ARM_APPENDED_DTB. Ensure that r2 does not look * like a valid pointer to a set of ATAGS or a DTB. */ - ctxt->user_regs.r2_usr = 0xffffffff; + ctxt->user_regs.r2_usr = dom->devicetree_blob ? + dom->devicetree_seg.vstart : 0xffffffff; ctxt->sctlr = SCTLR_GUEST_INIT; @@ -191,6 +192,25 @@ int arch_setup_meminit(struct xc_dom_image *dom) 0, 0, &dom->p2m_host[i]); } + if ( dom->devicetree_blob ) + { + const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; + const uint64_t ramend = rambase + ( dom->total_pages << XC_PAGE_SHIFT ); + const uint64_t dtbsize = ( dom->devicetree_size + 3 ) & ~0x3; + + /* Place at 128MB if there is sufficient RAM */ + if ( ramend >= rambase + 128*1024*1024 + dtbsize ) + dom->devicetree_seg.vstart = rambase + 128*1024*1024; + else /* otherwise at top of RAM */ + dom->devicetree_seg.vstart = ramend - dtbsize; + + dom->devicetree_seg.vend = + dom->devicetree_seg.vstart + dom->devicetree_size; + DOMPRINTF("%s: devicetree: 0x%" PRIx64 " -> 0x%" PRIx64 "", + __FUNCTION__, + dom->devicetree_seg.vstart, dom->devicetree_seg.vend); + } + return 0; } diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 5a22fd0c..705694a 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -671,6 +671,7 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, dom->max_kernel_size = XC_DOM_DECOMPRESS_MAX; dom->max_ramdisk_size = XC_DOM_DECOMPRESS_MAX; + dom->max_devicetree_size = XC_DOM_DECOMPRESS_MAX; if ( cmdline ) dom->cmdline = xc_dom_strdup(dom, cmdline); @@ -706,6 +707,13 @@ int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz) return 0; } +int xc_dom_devicetree_max_size(struct xc_dom_image *dom, size_t sz) +{ + DOMPRINTF("%s: devicetree_max_size=%zx", __FUNCTION__, sz); + dom->max_devicetree_size = sz; + return 0; +} + int xc_dom_kernel_file(struct xc_dom_image *dom, const char *filename) { DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename); @@ -729,6 +737,23 @@ int xc_dom_ramdisk_file(struct xc_dom_image *dom, const char *filename) return 0; } +int xc_dom_devicetree_file(struct xc_dom_image *dom, const char *filename) +{ +#if defined (__arm__) || defined(__aarch64__) + DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename); + dom->devicetree_blob = + xc_dom_malloc_filemap(dom, filename, &dom->devicetree_size, + dom->max_devicetree_size); + + if ( dom->devicetree_blob == NULL ) + return -1; + return 0; +#else + errno = -EINVAL; + return -1; +#endif +} + int xc_dom_kernel_mem(struct xc_dom_image *dom, const void *mem, size_t memsize) { DOMPRINTF_CALLED(dom->xch); @@ -747,6 +772,15 @@ int xc_dom_ramdisk_mem(struct xc_dom_image *dom, const void *mem, return 0; } +int xc_dom_devicetree_mem(struct xc_dom_image *dom, const void *mem, + size_t memsize) +{ + DOMPRINTF_CALLED(dom->xch); + dom->devicetree_blob = (void *)mem; + dom->devicetree_size = memsize; + return 0; +} + int xc_dom_parse_image(struct xc_dom_image *dom) { int i; @@ -925,6 +959,25 @@ int xc_dom_build_image(struct xc_dom_image *dom) memcpy(ramdiskmap, dom->ramdisk_blob, dom->ramdisk_size); } + /* load devicetree */ + if ( dom->devicetree_blob ) + { + void *devicetreemap; + + if ( xc_dom_alloc_segment(dom, &dom->devicetree_seg, "devicetree", + dom->devicetree_seg.vstart, + dom->devicetree_size) != 0 ) + goto err; + devicetreemap = xc_dom_seg_to_ptr(dom, &dom->devicetree_seg); + if ( devicetreemap == NULL ) + { + DOMPRINTF("%s: xc_dom_seg_to_ptr(dom, &dom->devicetree_seg) => NULL", + __FUNCTION__); + goto err; + } + memcpy(devicetreemap, dom->devicetree_blob, dom->devicetree_size); + } + /* allocate other pages */ if ( dom->arch_hooks->alloc_magic_pages(dom) != 0 ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQU-0000Ko-TR; Fri, 22 Nov 2013 21:38:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQT-0000Kc-7X for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:09 +0000 Received: from [85.158.137.68:42777] by server-9.bemta-3.messagelabs.com id F0/69-13104-0CECF825; Fri, 22 Nov 2013 21:38:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156286!3273194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10081 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQQ-0004Hj-FS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQQ-0004LC-Do for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:06 +0000 Date: Fri, 22 Nov 2013 21:38:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: support for arm64 Image format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b647286ad8eec1bfb0c74d49c42ca139a902a413 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:22 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxc: support for arm64 Image format Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_armzimageloader.c | 85 ++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index 4e3f7ae..e6516a1 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -129,6 +129,83 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) } /* ------------------------------------------------------------ */ +/* 64-bit zImage Support */ +/* ------------------------------------------------------------ */ + +#define ZIMAGE64_MAGIC_V0 0x14000008 +#define ZIMAGE64_MAGIC_V1 0x644d5241 /* "ARM\x64" */ + +/* linux/Documentation/arm64/booting.txt */ +struct zimage64_hdr { + uint32_t magic0; + uint32_t res0; + uint64_t text_offset; /* Image load offset */ + uint64_t res1; + uint64_t res2; + /* zImage V1 only from here */ + uint64_t res3; + uint64_t res4; + uint64_t res5; + uint32_t magic1; + uint32_t res6; +}; +static int xc_dom_probe_zimage64_kernel(struct xc_dom_image *dom) +{ + struct zimage64_hdr *zimage; + + if ( dom->kernel_blob == NULL ) + { + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: no kernel image loaded", __FUNCTION__); + return -EINVAL; + } + + if ( dom->kernel_size < sizeof(*zimage) ) + { + xc_dom_printf(dom->xch, "%s: kernel image too small", __FUNCTION__); + return -EINVAL; + } + + zimage = dom->kernel_blob; + if ( zimage->magic0 != ZIMAGE64_MAGIC_V0 && + zimage->magic1 != ZIMAGE64_MAGIC_V1 ) + { + xc_dom_printf(dom->xch, "%s: kernel is not an arm64 Image", __FUNCTION__); + return -EINVAL; + } + + return 0; +} + +static int xc_dom_parse_zimage64_kernel(struct xc_dom_image *dom) +{ + struct zimage64_hdr *zimage; + uint64_t v_start, v_end; + uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; + + DOMPRINTF_CALLED(dom->xch); + + zimage = dom->kernel_blob; + + v_start = rambase + zimage->text_offset; + v_end = v_start + dom->kernel_size; + + dom->kernel_seg.vstart = v_start; + dom->kernel_seg.vend = v_end; + + /* Call the kernel at offset 0 */ + dom->parms.virt_entry = v_start; + dom->parms.virt_base = rambase; + + dom->guest_type = "xen-3.0-aarch64"; + DOMPRINTF("%s: %s: 0x%" PRIx64 " -> 0x%" PRIx64 "", + __FUNCTION__, dom->guest_type, + dom->kernel_seg.vstart, dom->kernel_seg.vend); + + return 0; +} + +/* ------------------------------------------------------------ */ /* Common zImage Support */ /* ------------------------------------------------------------ */ @@ -163,9 +240,17 @@ static struct xc_dom_loader zimage32_loader = { .loader = xc_dom_load_zimage_kernel, }; +static struct xc_dom_loader zimage64_loader = { + .name = "Linux zImage (ARM64)", + .probe = xc_dom_probe_zimage64_kernel, + .parser = xc_dom_parse_zimage64_kernel, + .loader = xc_dom_load_zimage_kernel, +}; + static void __init register_loader(void) { xc_dom_register_loader(&zimage32_loader); + xc_dom_register_loader(&zimage64_loader); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQU-0000Ko-TR; Fri, 22 Nov 2013 21:38:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQT-0000Kc-7X for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:09 +0000 Received: from [85.158.137.68:42777] by server-9.bemta-3.messagelabs.com id F0/69-13104-0CECF825; Fri, 22 Nov 2013 21:38:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156286!3273194!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10081 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQQ-0004Hj-FS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQQ-0004LC-Do for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:06 +0000 Date: Fri, 22 Nov 2013 21:38:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: support for arm64 Image format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b647286ad8eec1bfb0c74d49c42ca139a902a413 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:22 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxc: support for arm64 Image format Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_armzimageloader.c | 85 ++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index 4e3f7ae..e6516a1 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -129,6 +129,83 @@ static int xc_dom_parse_zimage32_kernel(struct xc_dom_image *dom) } /* ------------------------------------------------------------ */ +/* 64-bit zImage Support */ +/* ------------------------------------------------------------ */ + +#define ZIMAGE64_MAGIC_V0 0x14000008 +#define ZIMAGE64_MAGIC_V1 0x644d5241 /* "ARM\x64" */ + +/* linux/Documentation/arm64/booting.txt */ +struct zimage64_hdr { + uint32_t magic0; + uint32_t res0; + uint64_t text_offset; /* Image load offset */ + uint64_t res1; + uint64_t res2; + /* zImage V1 only from here */ + uint64_t res3; + uint64_t res4; + uint64_t res5; + uint32_t magic1; + uint32_t res6; +}; +static int xc_dom_probe_zimage64_kernel(struct xc_dom_image *dom) +{ + struct zimage64_hdr *zimage; + + if ( dom->kernel_blob == NULL ) + { + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: no kernel image loaded", __FUNCTION__); + return -EINVAL; + } + + if ( dom->kernel_size < sizeof(*zimage) ) + { + xc_dom_printf(dom->xch, "%s: kernel image too small", __FUNCTION__); + return -EINVAL; + } + + zimage = dom->kernel_blob; + if ( zimage->magic0 != ZIMAGE64_MAGIC_V0 && + zimage->magic1 != ZIMAGE64_MAGIC_V1 ) + { + xc_dom_printf(dom->xch, "%s: kernel is not an arm64 Image", __FUNCTION__); + return -EINVAL; + } + + return 0; +} + +static int xc_dom_parse_zimage64_kernel(struct xc_dom_image *dom) +{ + struct zimage64_hdr *zimage; + uint64_t v_start, v_end; + uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; + + DOMPRINTF_CALLED(dom->xch); + + zimage = dom->kernel_blob; + + v_start = rambase + zimage->text_offset; + v_end = v_start + dom->kernel_size; + + dom->kernel_seg.vstart = v_start; + dom->kernel_seg.vend = v_end; + + /* Call the kernel at offset 0 */ + dom->parms.virt_entry = v_start; + dom->parms.virt_base = rambase; + + dom->guest_type = "xen-3.0-aarch64"; + DOMPRINTF("%s: %s: 0x%" PRIx64 " -> 0x%" PRIx64 "", + __FUNCTION__, dom->guest_type, + dom->kernel_seg.vstart, dom->kernel_seg.vend); + + return 0; +} + +/* ------------------------------------------------------------ */ /* Common zImage Support */ /* ------------------------------------------------------------ */ @@ -163,9 +240,17 @@ static struct xc_dom_loader zimage32_loader = { .loader = xc_dom_load_zimage_kernel, }; +static struct xc_dom_loader zimage64_loader = { + .name = "Linux zImage (ARM64)", + .probe = xc_dom_probe_zimage64_kernel, + .parser = xc_dom_parse_zimage64_kernel, + .loader = xc_dom_load_zimage_kernel, +}; + static void __init register_loader(void) { xc_dom_register_loader(&zimage32_loader); + xc_dom_register_loader(&zimage64_loader); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQe-0000NU-WC; Fri, 22 Nov 2013 21:38:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQd-0000N1-Jl for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:19 +0000 Received: from [85.158.137.68:60476] by server-8.bemta-3.messagelabs.com id 87/B9-31081-ACECF825; Fri, 22 Nov 2013 21:38:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156296!3273208!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10341 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQa-0004Hp-Lg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQa-0004MP-JB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:16 +0000 Date: Fri, 22 Nov 2013 21:38:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm64 vcpu initialisation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0ba32a3cdf676ddc0238935575ce9c9a55e9218 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:23 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxc: arm64 vcpu initialisation Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 88 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 71138f3..ffe575b 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -105,7 +105,7 @@ static int shared_info_arm(struct xc_dom_image *dom, void *ptr) /* ------------------------------------------------------------------------ */ -static int vcpu_arm(struct xc_dom_image *dom, void *ptr) +static int vcpu_arm32(struct xc_dom_image *dom, void *ptr) { vcpu_guest_context_t *ctxt = ptr; @@ -143,6 +143,41 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) return 0; } +static int vcpu_arm64(struct xc_dom_image *dom, void *ptr) +{ + vcpu_guest_context_t *ctxt = ptr; + + DOMPRINTF_CALLED(dom->xch); + /* clear everything */ + memset(ctxt, 0, sizeof(*ctxt)); + + ctxt->user_regs.pc64 = dom->parms.virt_entry; + + /* Linux boot protocol. See linux.Documentation/arm64/booting.txt. */ + ctxt->user_regs.x0 = dom->devicetree_blob ? + dom->devicetree_seg.vstart : 0xffffffff; + ctxt->user_regs.x1 = 0; + ctxt->user_regs.x2 = 0; + ctxt->user_regs.x3 = 0; + + DOMPRINTF("DTB %"PRIx64, ctxt->user_regs.x0); + + ctxt->sctlr = SCTLR_GUEST_INIT; + + ctxt->ttbr0 = 0; + ctxt->ttbr1 = 0; + ctxt->ttbcr = 0; /* Defined Reset Value */ + + ctxt->user_regs.cpsr = PSR_GUEST64_INIT; + + ctxt->flags = VGCF_online; + + DOMPRINTF("Initial state CPSR %#"PRIx32" PC %#"PRIx64, + ctxt->user_regs.cpsr, ctxt->user_regs.pc64); + + return 0; +} + /* ------------------------------------------------------------------------ */ static struct xc_dom_arch xc_dom_32 = { @@ -155,12 +190,59 @@ static struct xc_dom_arch xc_dom_32 = { .setup_pgtables = setup_pgtables_arm, .start_info = start_info_arm, .shared_info = shared_info_arm, - .vcpu = vcpu_arm, + .vcpu = vcpu_arm32, +}; + +static struct xc_dom_arch xc_dom_64 = { + .guest_type = "xen-3.0-aarch64", + .native_protocol = XEN_IO_PROTO_ABI_ARM, + .page_shift = PAGE_SHIFT_ARM, + .sizeof_pfn = 8, + .alloc_magic_pages = alloc_magic_pages, + .count_pgtables = count_pgtables_arm, + .setup_pgtables = setup_pgtables_arm, + .start_info = start_info_arm, + .shared_info = shared_info_arm, + .vcpu = vcpu_arm64, }; static void __init register_arch_hooks(void) { xc_dom_register_arch_hooks(&xc_dom_32); + xc_dom_register_arch_hooks(&xc_dom_64); +} + +static int set_mode(xc_interface *xch, domid_t domid, char *guest_type) +{ + static const struct { + char *guest; + uint32_t size; + } types[] = { + { "xen-3.0-aarch64", 64 }, + { "xen-3.0-armv7l", 32 }, + }; + DECLARE_DOMCTL; + int i,rc; + + domctl.domain = domid; + domctl.cmd = XEN_DOMCTL_set_address_size; + for ( i = 0; i < sizeof(types)/sizeof(types[0]); i++ ) + if ( !strcmp(types[i].guest, guest_type) ) + domctl.u.address_size.size = types[i].size; + if ( domctl.u.address_size.size == 0 ) + { + xc_dom_printf(xch, "%s: warning: unknown guest type %s", + __FUNCTION__, guest_type); + return -EINVAL; + } + + xc_dom_printf(xch, "%s: guest %s, address size %" PRId32 "", __FUNCTION__, + guest_type, domctl.u.address_size.size); + rc = do_domctl(xch, &domctl); + if ( rc != 0 ) + xc_dom_printf(xch, "%s: warning: failed (rc=%d)", + __FUNCTION__, rc); + return rc; } int arch_setup_meminit(struct xc_dom_image *dom) @@ -168,6 +250,10 @@ int arch_setup_meminit(struct xc_dom_image *dom) int rc; xen_pfn_t pfn, allocsz, i; + rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type); + if ( rc ) + return rc; + dom->shadow_enabled = 1; dom->p2m_host = xc_dom_malloc(dom, sizeof(xen_pfn_t) * dom->total_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 Nov 22 21:38:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQe-0000NU-WC; Fri, 22 Nov 2013 21:38:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQd-0000N1-Jl for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:19 +0000 Received: from [85.158.137.68:60476] by server-8.bemta-3.messagelabs.com id 87/B9-31081-ACECF825; Fri, 22 Nov 2013 21:38:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385156296!3273208!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10341 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQa-0004Hp-Lg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQa-0004MP-JB for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:16 +0000 Date: Fri, 22 Nov 2013 21:38:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: arm64 vcpu initialisation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0ba32a3cdf676ddc0238935575ce9c9a55e9218 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:23 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxc: arm64 vcpu initialisation Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 88 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 71138f3..ffe575b 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -105,7 +105,7 @@ static int shared_info_arm(struct xc_dom_image *dom, void *ptr) /* ------------------------------------------------------------------------ */ -static int vcpu_arm(struct xc_dom_image *dom, void *ptr) +static int vcpu_arm32(struct xc_dom_image *dom, void *ptr) { vcpu_guest_context_t *ctxt = ptr; @@ -143,6 +143,41 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) return 0; } +static int vcpu_arm64(struct xc_dom_image *dom, void *ptr) +{ + vcpu_guest_context_t *ctxt = ptr; + + DOMPRINTF_CALLED(dom->xch); + /* clear everything */ + memset(ctxt, 0, sizeof(*ctxt)); + + ctxt->user_regs.pc64 = dom->parms.virt_entry; + + /* Linux boot protocol. See linux.Documentation/arm64/booting.txt. */ + ctxt->user_regs.x0 = dom->devicetree_blob ? + dom->devicetree_seg.vstart : 0xffffffff; + ctxt->user_regs.x1 = 0; + ctxt->user_regs.x2 = 0; + ctxt->user_regs.x3 = 0; + + DOMPRINTF("DTB %"PRIx64, ctxt->user_regs.x0); + + ctxt->sctlr = SCTLR_GUEST_INIT; + + ctxt->ttbr0 = 0; + ctxt->ttbr1 = 0; + ctxt->ttbcr = 0; /* Defined Reset Value */ + + ctxt->user_regs.cpsr = PSR_GUEST64_INIT; + + ctxt->flags = VGCF_online; + + DOMPRINTF("Initial state CPSR %#"PRIx32" PC %#"PRIx64, + ctxt->user_regs.cpsr, ctxt->user_regs.pc64); + + return 0; +} + /* ------------------------------------------------------------------------ */ static struct xc_dom_arch xc_dom_32 = { @@ -155,12 +190,59 @@ static struct xc_dom_arch xc_dom_32 = { .setup_pgtables = setup_pgtables_arm, .start_info = start_info_arm, .shared_info = shared_info_arm, - .vcpu = vcpu_arm, + .vcpu = vcpu_arm32, +}; + +static struct xc_dom_arch xc_dom_64 = { + .guest_type = "xen-3.0-aarch64", + .native_protocol = XEN_IO_PROTO_ABI_ARM, + .page_shift = PAGE_SHIFT_ARM, + .sizeof_pfn = 8, + .alloc_magic_pages = alloc_magic_pages, + .count_pgtables = count_pgtables_arm, + .setup_pgtables = setup_pgtables_arm, + .start_info = start_info_arm, + .shared_info = shared_info_arm, + .vcpu = vcpu_arm64, }; static void __init register_arch_hooks(void) { xc_dom_register_arch_hooks(&xc_dom_32); + xc_dom_register_arch_hooks(&xc_dom_64); +} + +static int set_mode(xc_interface *xch, domid_t domid, char *guest_type) +{ + static const struct { + char *guest; + uint32_t size; + } types[] = { + { "xen-3.0-aarch64", 64 }, + { "xen-3.0-armv7l", 32 }, + }; + DECLARE_DOMCTL; + int i,rc; + + domctl.domain = domid; + domctl.cmd = XEN_DOMCTL_set_address_size; + for ( i = 0; i < sizeof(types)/sizeof(types[0]); i++ ) + if ( !strcmp(types[i].guest, guest_type) ) + domctl.u.address_size.size = types[i].size; + if ( domctl.u.address_size.size == 0 ) + { + xc_dom_printf(xch, "%s: warning: unknown guest type %s", + __FUNCTION__, guest_type); + return -EINVAL; + } + + xc_dom_printf(xch, "%s: guest %s, address size %" PRId32 "", __FUNCTION__, + guest_type, domctl.u.address_size.size); + rc = do_domctl(xch, &domctl); + if ( rc != 0 ) + xc_dom_printf(xch, "%s: warning: failed (rc=%d)", + __FUNCTION__, rc); + return rc; } int arch_setup_meminit(struct xc_dom_image *dom) @@ -168,6 +250,10 @@ int arch_setup_meminit(struct xc_dom_image *dom) int rc; xen_pfn_t pfn, allocsz, i; + rc = set_mode(dom->xch, dom->guest_domid, dom->guest_type); + if ( rc ) + return rc; + dom->shadow_enabled = 1; dom->p2m_host = xc_dom_malloc(dom, sizeof(xen_pfn_t) * dom->total_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 Nov 22 21:38:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQq-0000Sw-4Y; Fri, 22 Nov 2013 21:38:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQo-0000Qq-Ov for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:31 +0000 Received: from [85.158.137.68:43261] by server-10.bemta-3.messagelabs.com id B3/1D-23989-5DECF825; Fri, 22 Nov 2013 21:38:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1385156307!3248001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24267 invoked from network); 22 Nov 2013 21:38:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:38:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQk-0004Hv-TC for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQk-0004Mo-PP for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:26 +0000 Date: Fri, 22 Nov 2013 21:38:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: build a device tree for ARM 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 0c64527e7fc961372a398eb68e307c2b103f1a28 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:24 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxl: build a device tree for ARM guests Uses xc_dom_devicetree_mem which was just added. The call to this needs to be carefully sequenced to be after xc_dom_parse_image (so we can tell which kind of guest we are building, although we don't use this yet) and before xc_dom_mem_init which tries to decide where to place the FDT in guest RAM. Removes libxl_noarch which would only have been used by IA64 after this change. Remove IA64 as part of this patch. There is no attempt to expose this as a configuration setting for the user. Includes a debug hook to dump the dtb to a file for inspection. On v7 the CPU compat is currently hardcoded to cortex-a15. This likely wants to change at some point. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxl/Makefile | 6 +- tools/libxl/libxl_arch.h | 3 + tools/libxl/libxl_arm.c | 512 ++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_dom.c | 4 + tools/libxl/libxl_noarch.c | 8 - tools/libxl/libxl_x86.c | 7 + 6 files changed, 530 insertions(+), 10 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index cf214bb..d8495bb 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -28,9 +28,12 @@ CFLAGS_LIBXL += $(CFLAGS_libxenstore) CFLAGS_LIBXL += $(CFLAGS_libblktapctl) CFLAGS_LIBXL += -Wshadow +LIBXL_LIBS-$(CONFIG_ARM) += -lfdt + CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) +LIBXL_LIBS += $(LIBXL_LIBS-y) LIBXLU_LIBS = @@ -41,8 +44,7 @@ else LIBXL_OBJS-y += libxl_noblktap2.o endif LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o -LIBXL_OBJS-$(CONFIG_IA64) += libxl_nocpuid.o libxl_noarch.o -LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_noarch.o +LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o ifeq ($(CONFIG_NetBSD),y) LIBXL_OBJS-y += libxl_netbsd.o diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index abe6685..aee0a91 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -19,4 +19,7 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid); +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom); #endif diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c new file mode 100644 index 0000000..0a1c8c5 --- /dev/null +++ b/tools/libxl/libxl_arm.c @@ -0,0 +1,512 @@ +#include "libxl_internal.h" +#include "libxl_arch.h" + +#include +#include +#include + +int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, + uint32_t domid) +{ + return 0; +} + +static struct arch_info { + const char *guest_type; + const char *timer_compat; + const char *cpu_compat; +} arch_info[] = { + {"xen-3.0-armv7l", "arm,armv7-timer", "arm,cortex-a15" }, + {"xen-3.0-aarch64", "arm,armv8-timer", "arm,armv8" }, +}; + +enum { + PHANDLE_NONE = 0, + PHANDLE_GIC, +}; + +typedef uint32_t be32; +typedef be32 gic_interrupt[3]; + +#define ROOT_ADDRESS_CELLS 2 +#define ROOT_SIZE_CELLS 2 + +static void set_cell(be32 **cellp, int size, uint64_t val) +{ + int cells = size; + + while (size--) { + (*cellp)[size] = cpu_to_fdt32(val); + val >>= 32; + } + + (*cellp) += cells; +} + +static void set_interrupt_ppi(gic_interrupt interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) +{ + be32 *cells = interrupt; + + /* See linux Documentation/devictree/bindings/arm/gic.txt */ + set_cell(&cells, 1, 1); /* is a PPI */ + set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + set_cell(&cells, 1, (cpumask << 8) | level); +} + +static void set_range(be32 **cellp, + int address_cells, int size_cells, + uint64_t address, uint64_t size) +{ + set_cell(cellp, address_cells, address); + set_cell(cellp, size_cells, size); +} + +static int fdt_property_compat(libxl__gc *gc, void *fdt, unsigned nr_compat, ...) +{ + const char *compats[nr_compat]; + int i; + size_t sz; + va_list ap; + char *compat, *p; + + va_start(ap, nr_compat); + sz = 0; + for (i = 0; i < nr_compat; i++) { + const char *c = va_arg(ap, const char *); + compats[i] = c; + sz += strlen(compats[i]) + 1; + } + va_end(ap); + + p = compat = libxl__zalloc(gc, sz); + for (i = 0; i < nr_compat; i++) { + strcpy(p, compats[i]); + p += strlen(compats[i]) + 1; + } + + return fdt_property(fdt, "compatible", compat, sz); +} + +static int fdt_property_interrupts(libxl__gc *gc, void *fdt, + gic_interrupt *intr, + unsigned num_irq) +{ + int res; + + res = fdt_property(fdt, "interrupts", intr, sizeof (intr[0]) * num_irq); + if (res) return res; + + res = fdt_property_cell(fdt, "interrupt-parent", PHANDLE_GIC); + if (res) return res; + + return 0; +} + +static int fdt_property_regs(libxl__gc *gc, void *fdt, + unsigned addr_cells, + unsigned size_cells, + unsigned num_regs, ...) +{ + uint32_t regs[num_regs*(addr_cells+size_cells)]; + be32 *cells = ®s[0]; + int i; + va_list ap; + uint64_t base, size; + + va_start(ap, num_regs); + for (i = 0 ; i < num_regs; i++) { + base = addr_cells ? va_arg(ap, uint64_t) : 0; + size = size_cells ? va_arg(ap, uint64_t) : 0; + set_range(&cells, addr_cells, size_cells, base, size); + } + va_end(ap); + + return fdt_property(fdt, "reg", regs, sizeof(regs)); +} + +static int make_root_properties(libxl__gc *gc, + const libxl_version_info *vers, + void *fdt) +{ + int res; + + res = fdt_property_string(fdt, "model", GCSPRINTF("XENVM-%d.%d", + vers->xen_version_major, + vers->xen_version_minor)); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + GCSPRINTF("xen,xenvm-%d.%d", + vers->xen_version_major, + vers->xen_version_minor), + "xen,xenvm"); + if (res) return res; + + res = fdt_property_cell(fdt, "interrupt-parent", PHANDLE_GIC); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", ROOT_ADDRESS_CELLS); + if (res) return res; + + res = fdt_property_cell(fdt, "#size-cells", ROOT_SIZE_CELLS); + if (res) return res; + + return 0; +} + +static int make_chosen_node(libxl__gc *gc, void *fdt, + const libxl_domain_build_info *info) +{ + int res; + + /* See linux Documentation/devicetree/... */ + res = fdt_begin_node(fdt, "chosen"); + if (res) return res; + + res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_cpus_node(libxl__gc *gc, void *fdt, int nr_cpus, + const struct arch_info *ainfo) +{ + int res, i; + + 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 (i = 0; i < nr_cpus; i++) { + const char *name = GCSPRINTF("cpu@%d", i); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "cpu"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, ainfo->cpu_compat); + if (res) return res; + + res = fdt_property_string(fdt, "enable-method", "psci"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, 1, 0, 1, (uint64_t)i); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + } + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_psci_node(libxl__gc *gc, void *fdt) +{ + int res; + + res = fdt_begin_node(fdt, "psci"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "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); + if (res) return res; + + return 0; +} + +static int make_memory_node(libxl__gc *gc, void *fdt, + unsigned long long base, + unsigned long long size) +{ + int res; + const char *name = GCSPRINTF("memory@%08llx", base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "memory"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 1, (uint64_t)base, (uint64_t)size); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_intc_node(libxl__gc *gc, void *fdt, + unsigned long long gicd_base, + unsigned long long gicd_size, + unsigned long long gicc_base, + unsigned long long gicc_size) +{ + int res; + const char *name = GCSPRINTF("interrupt-controller@%08llx", gicd_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + "arm,cortex-a15-gic", + "arm,cortex-a9-gic"); + if (res) return res; + + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", 0); + if (res) return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 2, + (uint64_t)gicd_base, (uint64_t)gicd_size, + (uint64_t)gicc_base, (uint64_t)gicc_size); + if (res) return res; + + res = fdt_property_cell(fdt, "linux,phandle", PHANDLE_GIC); + if (res) return res; + + res = fdt_property_cell(fdt, "phandle", PHANDLE_GIC); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ainfo) +{ + int res; + gic_interrupt ints[3]; + + res = fdt_begin_node(fdt, "timer"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); + if (res) return res; + + set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, 0x8); + + res = fdt_property_interrupts(gc, fdt, ints, 3); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_hypervisor_node(libxl__gc *gc, void *fdt, + const libxl_version_info *vers) +{ + int res; + gic_interrupt intr; + + /* See linux Documentation/devicetree/bindings/arm/xen.txt */ + res = fdt_begin_node(fdt, "hypervisor"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + GCSPRINTF("xen,xen-%d.%d", + vers->xen_version_major, + vers->xen_version_minor), + "xen,xen"); + if (res) return res; + + /* reg 0 is grant table space */ + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 1,GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + if (res) return res; + + /* + * interrupts is evtchn upcall: + * - Active-low level-sensitive + * - All cpus + */ + set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, 0x8); + + res = fdt_property_interrupts(gc, fdt, &intr, 1); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static const struct arch_info *get_arch_info(libxl__gc *gc, + const struct xc_dom_image *dom) +{ + int i; + + for (i=0; i < ARRAY_SIZE(arch_info); i++) { + const struct arch_info *info = &arch_info[i]; + if (!strcmp(dom->guest_type, info->guest_type)) + return info; + } + LOG(ERROR, "Unable to find arch FDT info for %s\n", dom->guest_type); + return NULL; +} + +static void debug_dump_fdt(libxl__gc *gc, void *fdt) +{ + int fd = -1, rc, r; + + const char *dtb = getenv("LIBXL_DEBUG_DUMP_DTB"); + + if (!dtb) goto out; + + fd = open(dtb, O_CREAT|O_TRUNC|O_WRONLY, 0666); + if (fd < 0) { + LOGE(DEBUG, "cannot open %s for LIBXL_DEBUG_DUMP_DTB", dtb); + goto out; + } + + rc = libxl_write_exactly(CTX, fd, fdt, fdt_totalsize(fdt), dtb, "dtb"); + if (rc < 0) goto out; + +out: + if (fd >= 0) { + r = close(fd); + if (r < 0) LOGE(DEBUG, "failed to close DTB debug dump output"); + } +} + +#define FDT_MAX_SIZE (1<<20) + +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom) +{ + void *fdt = NULL; + int rc, res; + size_t fdt_size = 0; + + const libxl_version_info *vers; + const struct arch_info *ainfo; + + assert(info->type == LIBXL_DOMAIN_TYPE_PV); + + vers = libxl_get_version_info(CTX); + if (vers == NULL) return ERROR_FAIL; + + ainfo = get_arch_info(gc, dom); + if (ainfo == NULL) return ERROR_FAIL; + + LOG(DEBUG, "constructing DTB for Xen version %d.%d guest", + vers->xen_version_major, vers->xen_version_minor); + +/* + * Call "call" handling FDR_ERR_*. Will either: + * - loop back to retry_resize + * - set rc and goto out + * - fall through successfully + * + * On FDT_ERR_NOSPACE we start again from scratch rather than + * realloc+libfdt_open_into because "call" may have failed half way + * through a series of steps leaving the partial tree in an + * inconsistent state, e.g. leaving a node open. + */ +#define FDT( call ) do { \ + int fdt_res = (call); \ + if (fdt_res == -FDT_ERR_NOSPACE && fdt_size < FDT_MAX_SIZE) \ + goto next_resize; \ + else if (fdt_res < 0) { \ + LOG(ERROR, "FDT: %s failed: %d = %s", \ + #call, fdt_res, fdt_strerror(fdt_res)); \ + rc = ERROR_FAIL; \ + goto out; \ + } \ +} while(0) + + for (;;) { +next_resize: + if (fdt_size) { + fdt_size <<= 1; + LOG(DEBUG, "Increasing FDT size to %zd and retrying", fdt_size); + } else { + fdt_size = 4096; + } + + fdt = libxl__realloc(gc, fdt, fdt_size); + + FDT( fdt_create(fdt, fdt_size) ); + + FDT( fdt_finish_reservemap(fdt) ); + + FDT( fdt_begin_node(fdt, "") ); + + FDT( make_root_properties(gc, vers, fdt) ); + FDT( make_chosen_node(gc, fdt, info) ); + FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) ); + FDT( make_psci_node(gc, fdt) ); + + FDT( make_memory_node(gc, fdt, + dom->rambase_pfn << XC_PAGE_SHIFT, + info->target_memkb * 1024) ); + FDT( make_intc_node(gc, fdt, + GUEST_GICD_BASE, GUEST_GICD_SIZE, + GUEST_GICC_BASE, GUEST_GICD_SIZE) ); + + FDT( make_timer_node(gc, fdt, ainfo) ); + FDT( make_hypervisor_node(gc, fdt, vers) ); + + FDT( fdt_end_node(fdt) ); + + FDT( fdt_finish(fdt) ); + break; + } +#undef FDT + + LOG(DEBUG, "fdt total size %d", fdt_totalsize(fdt)); + + res = xc_dom_devicetree_mem(dom, fdt, fdt_totalsize(fdt)); + if (res) { + LOGE(ERROR, "xc_dom_devicetree_file failed"); + rc = ERROR_FAIL; + goto out; + } + + debug_dump_fdt(gc, fdt); + + rc = 0; + +out: + return rc; +} diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 521329e..72489f8 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -403,6 +403,10 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, LOGE(ERROR, "xc_dom_parse_image failed"); goto out; } + if ( (ret = libxl__arch_domain_configure(gc, info, dom)) != 0 ) { + LOGE(ERROR, "libxl__arch_domain_configure failed"); + goto out; + } if ( (ret = xc_dom_mem_init(dom, info->target_memkb / 1024)) != 0 ) { LOGE(ERROR, "xc_dom_mem_init failed"); goto out; diff --git a/tools/libxl/libxl_noarch.c b/tools/libxl/libxl_noarch.c deleted file mode 100644 index 7893535..0000000 --- a/tools/libxl/libxl_noarch.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "libxl_internal.h" -#include "libxl_arch.h" - -int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - uint32_t domid) -{ - return 0; -} diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 87a8110..e1c183f 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -310,3 +310,10 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, return ret; } + +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom) +{ + 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 Nov 22 21:38:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyQq-0000Sw-4Y; Fri, 22 Nov 2013 21:38:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQo-0000Qq-Ov for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:31 +0000 Received: from [85.158.137.68:43261] by server-10.bemta-3.messagelabs.com id B3/1D-23989-5DECF825; Fri, 22 Nov 2013 21:38:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1385156307!3248001!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24267 invoked from network); 22 Nov 2013 21:38:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:38:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQk-0004Hv-TC for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQk-0004Mo-PP for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:26 +0000 Date: Fri, 22 Nov 2013 21:38:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: build a device tree for ARM 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 0c64527e7fc961372a398eb68e307c2b103f1a28 Author: Ian Campbell AuthorDate: Tue Nov 19 13:00:24 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:14 2013 +0000 libxl: build a device tree for ARM guests Uses xc_dom_devicetree_mem which was just added. The call to this needs to be carefully sequenced to be after xc_dom_parse_image (so we can tell which kind of guest we are building, although we don't use this yet) and before xc_dom_mem_init which tries to decide where to place the FDT in guest RAM. Removes libxl_noarch which would only have been used by IA64 after this change. Remove IA64 as part of this patch. There is no attempt to expose this as a configuration setting for the user. Includes a debug hook to dump the dtb to a file for inspection. On v7 the CPU compat is currently hardcoded to cortex-a15. This likely wants to change at some point. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall --- tools/libxl/Makefile | 6 +- tools/libxl/libxl_arch.h | 3 + tools/libxl/libxl_arm.c | 512 ++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_dom.c | 4 + tools/libxl/libxl_noarch.c | 8 - tools/libxl/libxl_x86.c | 7 + 6 files changed, 530 insertions(+), 10 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index cf214bb..d8495bb 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -28,9 +28,12 @@ CFLAGS_LIBXL += $(CFLAGS_libxenstore) CFLAGS_LIBXL += $(CFLAGS_libblktapctl) CFLAGS_LIBXL += -Wshadow +LIBXL_LIBS-$(CONFIG_ARM) += -lfdt + CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) +LIBXL_LIBS += $(LIBXL_LIBS-y) LIBXLU_LIBS = @@ -41,8 +44,7 @@ else LIBXL_OBJS-y += libxl_noblktap2.o endif LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o -LIBXL_OBJS-$(CONFIG_IA64) += libxl_nocpuid.o libxl_noarch.o -LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_noarch.o +LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o ifeq ($(CONFIG_NetBSD),y) LIBXL_OBJS-y += libxl_netbsd.o diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index abe6685..aee0a91 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -19,4 +19,7 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid); +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom); #endif diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c new file mode 100644 index 0000000..0a1c8c5 --- /dev/null +++ b/tools/libxl/libxl_arm.c @@ -0,0 +1,512 @@ +#include "libxl_internal.h" +#include "libxl_arch.h" + +#include +#include +#include + +int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, + uint32_t domid) +{ + return 0; +} + +static struct arch_info { + const char *guest_type; + const char *timer_compat; + const char *cpu_compat; +} arch_info[] = { + {"xen-3.0-armv7l", "arm,armv7-timer", "arm,cortex-a15" }, + {"xen-3.0-aarch64", "arm,armv8-timer", "arm,armv8" }, +}; + +enum { + PHANDLE_NONE = 0, + PHANDLE_GIC, +}; + +typedef uint32_t be32; +typedef be32 gic_interrupt[3]; + +#define ROOT_ADDRESS_CELLS 2 +#define ROOT_SIZE_CELLS 2 + +static void set_cell(be32 **cellp, int size, uint64_t val) +{ + int cells = size; + + while (size--) { + (*cellp)[size] = cpu_to_fdt32(val); + val >>= 32; + } + + (*cellp) += cells; +} + +static void set_interrupt_ppi(gic_interrupt interrupt, unsigned int irq, + unsigned int cpumask, unsigned int level) +{ + be32 *cells = interrupt; + + /* See linux Documentation/devictree/bindings/arm/gic.txt */ + set_cell(&cells, 1, 1); /* is a PPI */ + set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ + set_cell(&cells, 1, (cpumask << 8) | level); +} + +static void set_range(be32 **cellp, + int address_cells, int size_cells, + uint64_t address, uint64_t size) +{ + set_cell(cellp, address_cells, address); + set_cell(cellp, size_cells, size); +} + +static int fdt_property_compat(libxl__gc *gc, void *fdt, unsigned nr_compat, ...) +{ + const char *compats[nr_compat]; + int i; + size_t sz; + va_list ap; + char *compat, *p; + + va_start(ap, nr_compat); + sz = 0; + for (i = 0; i < nr_compat; i++) { + const char *c = va_arg(ap, const char *); + compats[i] = c; + sz += strlen(compats[i]) + 1; + } + va_end(ap); + + p = compat = libxl__zalloc(gc, sz); + for (i = 0; i < nr_compat; i++) { + strcpy(p, compats[i]); + p += strlen(compats[i]) + 1; + } + + return fdt_property(fdt, "compatible", compat, sz); +} + +static int fdt_property_interrupts(libxl__gc *gc, void *fdt, + gic_interrupt *intr, + unsigned num_irq) +{ + int res; + + res = fdt_property(fdt, "interrupts", intr, sizeof (intr[0]) * num_irq); + if (res) return res; + + res = fdt_property_cell(fdt, "interrupt-parent", PHANDLE_GIC); + if (res) return res; + + return 0; +} + +static int fdt_property_regs(libxl__gc *gc, void *fdt, + unsigned addr_cells, + unsigned size_cells, + unsigned num_regs, ...) +{ + uint32_t regs[num_regs*(addr_cells+size_cells)]; + be32 *cells = ®s[0]; + int i; + va_list ap; + uint64_t base, size; + + va_start(ap, num_regs); + for (i = 0 ; i < num_regs; i++) { + base = addr_cells ? va_arg(ap, uint64_t) : 0; + size = size_cells ? va_arg(ap, uint64_t) : 0; + set_range(&cells, addr_cells, size_cells, base, size); + } + va_end(ap); + + return fdt_property(fdt, "reg", regs, sizeof(regs)); +} + +static int make_root_properties(libxl__gc *gc, + const libxl_version_info *vers, + void *fdt) +{ + int res; + + res = fdt_property_string(fdt, "model", GCSPRINTF("XENVM-%d.%d", + vers->xen_version_major, + vers->xen_version_minor)); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + GCSPRINTF("xen,xenvm-%d.%d", + vers->xen_version_major, + vers->xen_version_minor), + "xen,xenvm"); + if (res) return res; + + res = fdt_property_cell(fdt, "interrupt-parent", PHANDLE_GIC); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", ROOT_ADDRESS_CELLS); + if (res) return res; + + res = fdt_property_cell(fdt, "#size-cells", ROOT_SIZE_CELLS); + if (res) return res; + + return 0; +} + +static int make_chosen_node(libxl__gc *gc, void *fdt, + const libxl_domain_build_info *info) +{ + int res; + + /* See linux Documentation/devicetree/... */ + res = fdt_begin_node(fdt, "chosen"); + if (res) return res; + + res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_cpus_node(libxl__gc *gc, void *fdt, int nr_cpus, + const struct arch_info *ainfo) +{ + int res, i; + + 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 (i = 0; i < nr_cpus; i++) { + const char *name = GCSPRINTF("cpu@%d", i); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "cpu"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, ainfo->cpu_compat); + if (res) return res; + + res = fdt_property_string(fdt, "enable-method", "psci"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, 1, 0, 1, (uint64_t)i); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + } + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_psci_node(libxl__gc *gc, void *fdt) +{ + int res; + + res = fdt_begin_node(fdt, "psci"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "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); + if (res) return res; + + return 0; +} + +static int make_memory_node(libxl__gc *gc, void *fdt, + unsigned long long base, + unsigned long long size) +{ + int res; + const char *name = GCSPRINTF("memory@%08llx", base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "memory"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 1, (uint64_t)base, (uint64_t)size); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_intc_node(libxl__gc *gc, void *fdt, + unsigned long long gicd_base, + unsigned long long gicd_size, + unsigned long long gicc_base, + unsigned long long gicc_size) +{ + int res; + const char *name = GCSPRINTF("interrupt-controller@%08llx", gicd_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + "arm,cortex-a15-gic", + "arm,cortex-a9-gic"); + if (res) return res; + + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", 0); + if (res) return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 2, + (uint64_t)gicd_base, (uint64_t)gicd_size, + (uint64_t)gicc_base, (uint64_t)gicc_size); + if (res) return res; + + res = fdt_property_cell(fdt, "linux,phandle", PHANDLE_GIC); + if (res) return res; + + res = fdt_property_cell(fdt, "phandle", PHANDLE_GIC); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_timer_node(libxl__gc *gc, void *fdt, const struct arch_info *ainfo) +{ + int res; + gic_interrupt ints[3]; + + res = fdt_begin_node(fdt, "timer"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, ainfo->timer_compat); + if (res) return res; + + set_interrupt_ppi(ints[0], GUEST_TIMER_PHYS_S_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[1], GUEST_TIMER_PHYS_NS_PPI, 0xf, 0x8); + set_interrupt_ppi(ints[2], GUEST_TIMER_VIRT_PPI, 0xf, 0x8); + + res = fdt_property_interrupts(gc, fdt, ints, 3); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static int make_hypervisor_node(libxl__gc *gc, void *fdt, + const libxl_version_info *vers) +{ + int res; + gic_interrupt intr; + + /* See linux Documentation/devicetree/bindings/arm/xen.txt */ + res = fdt_begin_node(fdt, "hypervisor"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 2, + GCSPRINTF("xen,xen-%d.%d", + vers->xen_version_major, + vers->xen_version_minor), + "xen,xen"); + if (res) return res; + + /* reg 0 is grant table space */ + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 1,GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + if (res) return res; + + /* + * interrupts is evtchn upcall: + * - Active-low level-sensitive + * - All cpus + */ + set_interrupt_ppi(intr, GUEST_EVTCHN_PPI, 0xf, 0x8); + + res = fdt_property_interrupts(gc, fdt, &intr, 1); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + +static const struct arch_info *get_arch_info(libxl__gc *gc, + const struct xc_dom_image *dom) +{ + int i; + + for (i=0; i < ARRAY_SIZE(arch_info); i++) { + const struct arch_info *info = &arch_info[i]; + if (!strcmp(dom->guest_type, info->guest_type)) + return info; + } + LOG(ERROR, "Unable to find arch FDT info for %s\n", dom->guest_type); + return NULL; +} + +static void debug_dump_fdt(libxl__gc *gc, void *fdt) +{ + int fd = -1, rc, r; + + const char *dtb = getenv("LIBXL_DEBUG_DUMP_DTB"); + + if (!dtb) goto out; + + fd = open(dtb, O_CREAT|O_TRUNC|O_WRONLY, 0666); + if (fd < 0) { + LOGE(DEBUG, "cannot open %s for LIBXL_DEBUG_DUMP_DTB", dtb); + goto out; + } + + rc = libxl_write_exactly(CTX, fd, fdt, fdt_totalsize(fdt), dtb, "dtb"); + if (rc < 0) goto out; + +out: + if (fd >= 0) { + r = close(fd); + if (r < 0) LOGE(DEBUG, "failed to close DTB debug dump output"); + } +} + +#define FDT_MAX_SIZE (1<<20) + +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom) +{ + void *fdt = NULL; + int rc, res; + size_t fdt_size = 0; + + const libxl_version_info *vers; + const struct arch_info *ainfo; + + assert(info->type == LIBXL_DOMAIN_TYPE_PV); + + vers = libxl_get_version_info(CTX); + if (vers == NULL) return ERROR_FAIL; + + ainfo = get_arch_info(gc, dom); + if (ainfo == NULL) return ERROR_FAIL; + + LOG(DEBUG, "constructing DTB for Xen version %d.%d guest", + vers->xen_version_major, vers->xen_version_minor); + +/* + * Call "call" handling FDR_ERR_*. Will either: + * - loop back to retry_resize + * - set rc and goto out + * - fall through successfully + * + * On FDT_ERR_NOSPACE we start again from scratch rather than + * realloc+libfdt_open_into because "call" may have failed half way + * through a series of steps leaving the partial tree in an + * inconsistent state, e.g. leaving a node open. + */ +#define FDT( call ) do { \ + int fdt_res = (call); \ + if (fdt_res == -FDT_ERR_NOSPACE && fdt_size < FDT_MAX_SIZE) \ + goto next_resize; \ + else if (fdt_res < 0) { \ + LOG(ERROR, "FDT: %s failed: %d = %s", \ + #call, fdt_res, fdt_strerror(fdt_res)); \ + rc = ERROR_FAIL; \ + goto out; \ + } \ +} while(0) + + for (;;) { +next_resize: + if (fdt_size) { + fdt_size <<= 1; + LOG(DEBUG, "Increasing FDT size to %zd and retrying", fdt_size); + } else { + fdt_size = 4096; + } + + fdt = libxl__realloc(gc, fdt, fdt_size); + + FDT( fdt_create(fdt, fdt_size) ); + + FDT( fdt_finish_reservemap(fdt) ); + + FDT( fdt_begin_node(fdt, "") ); + + FDT( make_root_properties(gc, vers, fdt) ); + FDT( make_chosen_node(gc, fdt, info) ); + FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) ); + FDT( make_psci_node(gc, fdt) ); + + FDT( make_memory_node(gc, fdt, + dom->rambase_pfn << XC_PAGE_SHIFT, + info->target_memkb * 1024) ); + FDT( make_intc_node(gc, fdt, + GUEST_GICD_BASE, GUEST_GICD_SIZE, + GUEST_GICC_BASE, GUEST_GICD_SIZE) ); + + FDT( make_timer_node(gc, fdt, ainfo) ); + FDT( make_hypervisor_node(gc, fdt, vers) ); + + FDT( fdt_end_node(fdt) ); + + FDT( fdt_finish(fdt) ); + break; + } +#undef FDT + + LOG(DEBUG, "fdt total size %d", fdt_totalsize(fdt)); + + res = xc_dom_devicetree_mem(dom, fdt, fdt_totalsize(fdt)); + if (res) { + LOGE(ERROR, "xc_dom_devicetree_file failed"); + rc = ERROR_FAIL; + goto out; + } + + debug_dump_fdt(gc, fdt); + + rc = 0; + +out: + return rc; +} diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 521329e..72489f8 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -403,6 +403,10 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, LOGE(ERROR, "xc_dom_parse_image failed"); goto out; } + if ( (ret = libxl__arch_domain_configure(gc, info, dom)) != 0 ) { + LOGE(ERROR, "libxl__arch_domain_configure failed"); + goto out; + } if ( (ret = xc_dom_mem_init(dom, info->target_memkb / 1024)) != 0 ) { LOGE(ERROR, "xc_dom_mem_init failed"); goto out; diff --git a/tools/libxl/libxl_noarch.c b/tools/libxl/libxl_noarch.c deleted file mode 100644 index 7893535..0000000 --- a/tools/libxl/libxl_noarch.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "libxl_internal.h" -#include "libxl_arch.h" - -int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, - uint32_t domid) -{ - return 0; -} diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 87a8110..e1c183f 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -310,3 +310,10 @@ int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, return ret; } + +int libxl__arch_domain_configure(libxl__gc *gc, + libxl_domain_build_info *info, + struct xc_dom_image *dom) +{ + 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 Nov 22 21:38:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyR0-0000c7-7S; Fri, 22 Nov 2013 21:38:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQy-0000bZ-JD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:40 +0000 Received: from [85.158.139.211:18721] by server-1.bemta-5.messagelabs.com id 5F/F0-21065-FDECF825; Fri, 22 Nov 2013 21:38:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385156317!1840600!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9839 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQv-0004I3-BX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQv-0004NY-9D for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:37 +0000 Date: Fri, 22 Nov 2013 21:38:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arinc: whitespace and formatting 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 1039c6772c7cb84e968e1cd535a4cdafe731fa50 Author: Nathan Studer AuthorDate: Tue Nov 19 16:58:32 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 19 16:58:32 2013 +0100 arinc: whitespace and formatting fixes Remove the excessive amount of trailing whitespace in the arinc653 scheduler file and add a local variables block. Suggested-by: Andrew Cooper Signed-off-by: Nathan Studer Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/common/sched_arinc653.c | 96 +++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 43 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 7b7b387..f4eb943 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -40,9 +40,9 @@ * Private Macros * **************************************************************************/ -/** - * Retrieve the idle VCPU for a given physical CPU - */ +/** + * Retrieve the idle VCPU for a given physical CPU + */ #define IDLETASK(cpu) (idle_vcpu[cpu]) /** @@ -76,7 +76,7 @@ typedef struct arinc653_vcpu_s struct list_head list; } arinc653_vcpu_t; -/** +/** * The sched_entry_t structure holds a single entry of the * ARINC 653 schedule. */ @@ -101,8 +101,8 @@ typedef struct sched_entry_s typedef struct a653sched_priv_s { /** - * This array holds the active ARINC 653 schedule. - * + * This array holds the active ARINC 653 schedule. + * * When the system tries to start a new VCPU, this schedule is scanned * to look for a matching (handle, VCPU #) pair. If both the handle (UUID) * and VCPU number match, then the VCPU is allowed to run. Its run time @@ -112,12 +112,12 @@ typedef struct a653sched_priv_s /** * This variable holds the number of entries that are valid in - * the arinc653_schedule table. - * + * the arinc653_schedule table. + * * This is not necessarily the same as the number of domains in the * schedule. A domain could be listed multiple times within the schedule, * or a domain with multiple VCPUs could have a different - * schedule entry for each VCPU. + * schedule entry for each VCPU. */ int num_schedule_entries; @@ -131,9 +131,9 @@ typedef struct a653sched_priv_s */ s_time_t next_major_frame; - /** - * pointers to all Xen VCPU structures for iterating through - */ + /** + * pointers to all Xen VCPU structures for iterating through + */ struct list_head vcpu_list; } a653sched_priv_t; @@ -143,14 +143,14 @@ typedef struct a653sched_priv_s /** * This function compares two domain handles. - * + * * @param h1 Pointer to handle 1 * @param h2 Pointer to handle 2 - * + * * @return
    - *
  • <0: handle 1 is less than handle 2 - *
  • 0: handle 1 is equal to handle 2 - *
  • >0: handle 1 is greater than handle 2 + *
  • <0: handle 1 is less than handle 2 + *
  • 0: handle 1 is equal to handle 2 + *
  • >0: handle 1 is greater than handle 2 *
*/ static int dom_handle_cmp(const xen_domain_handle_t h1, @@ -162,11 +162,11 @@ static int dom_handle_cmp(const xen_domain_handle_t h1, /** * This function searches the vcpu list to find a VCPU that matches * the domain handle and VCPU ID specified. - * + * * @param ops Pointer to this instance of the scheduler structure * @param handle Pointer to handler * @param vcpu_id VCPU ID - * + * * @return
    *
  • Pointer to the matching VCPU if one is found *
  • NULL otherwise @@ -191,7 +191,7 @@ static struct vcpu *find_vcpu( /** * This function updates the pointer to the Xen VCPU structure for each entry * in the ARINC 653 schedule. - * + * * @param ops Pointer to this instance of the scheduler structure * @return */ @@ -211,7 +211,7 @@ static void update_schedule_vcpus(const struct scheduler *ops) * in place a new ARINC653 schedule. * * @param ops Pointer to this instance of the scheduler structure - * + * * @return
      *
    • 0 = success *
    • !0 = error @@ -253,10 +253,10 @@ arinc653_sched_set( if ( !found_dom0 ) goto fail; - /* + /* * Error if the major frame is not large enough to run all entries as * indicated by comparing the total run time to the major frame length. - */ + */ if ( total_runtime > schedule->major_frame ) goto fail; @@ -276,10 +276,10 @@ arinc653_sched_set( update_schedule_vcpus(ops); /* - * The newly-installed schedule takes effect immediately. We do not even + * The newly-installed schedule takes effect immediately. We do not even * wait for the current major frame to expire. * - * Signal a new major frame to begin. The next major frame is set up by + * Signal a new major frame to begin. The next major frame is set up by * the do_schedule callback function when it is next invoked. */ sched_priv->next_major_frame = NOW(); @@ -392,8 +392,8 @@ a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) /* * Initialize our ARINC 653 scheduler-specific information for the VCPU. - * The VCPU starts "asleep." When Xen is ready for the VCPU to run, it - * will call the vcpu_wake scheduler callback function and our scheduler + * The VCPU starts "asleep." When Xen is ready for the VCPU to run, it + * will call the vcpu_wake scheduler callback function and our scheduler * will mark the VCPU awake. */ svc->vc = vc; @@ -483,7 +483,7 @@ a653sched_free_domdata(const struct scheduler *ops, void *data) /** * Xen scheduler callback function to sleep a VCPU - * + * * @param ops Pointer to this instance of the scheduler structure * @param vc Pointer to the VCPU structure for the current domain */ @@ -503,7 +503,7 @@ a653sched_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) /** * Xen scheduler callback function to wake up a VCPU - * + * * @param ops Pointer to this instance of the scheduler structure * @param vc Pointer to the VCPU structure for the current domain */ @@ -519,10 +519,10 @@ a653sched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) /** * Xen scheduler callback function to select a VCPU to run. * This is the main scheduler routine. - * + * * @param ops Pointer to this instance of the scheduler structure * @param now Current time - * + * * @return Address of the VCPU structure scheduled to be run next * Amount of time to execute the returned VCPU * Flag for whether the VCPU was migrated @@ -559,7 +559,7 @@ a653sched_do_schedule( } } - /* + /* * If we exhausted the domains in the schedule and still have time left * in the major frame then switch next at the next major frame. */ @@ -567,10 +567,10 @@ a653sched_do_schedule( next_switch_time = sched_priv->next_major_frame; /* - * If there are more domains to run in the current major frame, set - * new_task equal to the address of next domain's VCPU structure. - * Otherwise, set new_task equal to the address of the idle task's VCPU - * structure. + * If there are more domains to run in the current major frame, set + * new_task equal to the address of next domain's VCPU structure. + * Otherwise, set new_task equal to the address of the idle task's VCPU + * structure. */ new_task = (sched_index < sched_priv->num_schedule_entries) ? sched_priv->schedule[sched_index].vc @@ -584,10 +584,10 @@ a653sched_do_schedule( new_task = IDLETASK(0); BUG_ON(new_task == NULL); - /* + /* * Check to make sure we did not miss a major frame. - * This is a good test for robust partitioning. - */ + * This is a good test for robust partitioning. + */ BUG_ON(now >= sched_priv->next_major_frame); /* Tasklet work (which runs in idle VCPU context) overrides all else. */ @@ -595,8 +595,8 @@ a653sched_do_schedule( new_task = IDLETASK(0); /* - * Return the amount of time the next domain has to run and the address - * of the selected task's VCPU structure. + * Return the amount of time the next domain has to run and the address + * of the selected task's VCPU structure. */ ret.time = next_switch_time - now; ret.task = new_task; @@ -609,10 +609,10 @@ a653sched_do_schedule( /** * Xen scheduler callback function to select a CPU for the VCPU to run on - * + * * @param ops Pointer to this instance of the scheduler structure * @param v Pointer to the VCPU structure for the current domain - * + * * @return Number of selected physical CPU */ static int @@ -709,3 +709,13 @@ const struct scheduler sched_arinc653_def = { .tick_suspend = NULL, .tick_resume = NULL, }; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyR0-0000c7-7S; Fri, 22 Nov 2013 21:38:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQy-0000bZ-JD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:40 +0000 Received: from [85.158.139.211:18721] by server-1.bemta-5.messagelabs.com id 5F/F0-21065-FDECF825; Fri, 22 Nov 2013 21:38:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385156317!1840600!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9839 invoked from network); 22 Nov 2013 21:38: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; 22 Nov 2013 21:38:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyQv-0004I3-BX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyQv-0004NY-9D for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:37 +0000 Date: Fri, 22 Nov 2013 21:38:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arinc: whitespace and formatting 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 1039c6772c7cb84e968e1cd535a4cdafe731fa50 Author: Nathan Studer AuthorDate: Tue Nov 19 16:58:32 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 19 16:58:32 2013 +0100 arinc: whitespace and formatting fixes Remove the excessive amount of trailing whitespace in the arinc653 scheduler file and add a local variables block. Suggested-by: Andrew Cooper Signed-off-by: Nathan Studer Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/common/sched_arinc653.c | 96 +++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 43 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 7b7b387..f4eb943 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -40,9 +40,9 @@ * Private Macros * **************************************************************************/ -/** - * Retrieve the idle VCPU for a given physical CPU - */ +/** + * Retrieve the idle VCPU for a given physical CPU + */ #define IDLETASK(cpu) (idle_vcpu[cpu]) /** @@ -76,7 +76,7 @@ typedef struct arinc653_vcpu_s struct list_head list; } arinc653_vcpu_t; -/** +/** * The sched_entry_t structure holds a single entry of the * ARINC 653 schedule. */ @@ -101,8 +101,8 @@ typedef struct sched_entry_s typedef struct a653sched_priv_s { /** - * This array holds the active ARINC 653 schedule. - * + * This array holds the active ARINC 653 schedule. + * * When the system tries to start a new VCPU, this schedule is scanned * to look for a matching (handle, VCPU #) pair. If both the handle (UUID) * and VCPU number match, then the VCPU is allowed to run. Its run time @@ -112,12 +112,12 @@ typedef struct a653sched_priv_s /** * This variable holds the number of entries that are valid in - * the arinc653_schedule table. - * + * the arinc653_schedule table. + * * This is not necessarily the same as the number of domains in the * schedule. A domain could be listed multiple times within the schedule, * or a domain with multiple VCPUs could have a different - * schedule entry for each VCPU. + * schedule entry for each VCPU. */ int num_schedule_entries; @@ -131,9 +131,9 @@ typedef struct a653sched_priv_s */ s_time_t next_major_frame; - /** - * pointers to all Xen VCPU structures for iterating through - */ + /** + * pointers to all Xen VCPU structures for iterating through + */ struct list_head vcpu_list; } a653sched_priv_t; @@ -143,14 +143,14 @@ typedef struct a653sched_priv_s /** * This function compares two domain handles. - * + * * @param h1 Pointer to handle 1 * @param h2 Pointer to handle 2 - * + * * @return
        - *
      • <0: handle 1 is less than handle 2 - *
      • 0: handle 1 is equal to handle 2 - *
      • >0: handle 1 is greater than handle 2 + *
      • <0: handle 1 is less than handle 2 + *
      • 0: handle 1 is equal to handle 2 + *
      • >0: handle 1 is greater than handle 2 *
      */ static int dom_handle_cmp(const xen_domain_handle_t h1, @@ -162,11 +162,11 @@ static int dom_handle_cmp(const xen_domain_handle_t h1, /** * This function searches the vcpu list to find a VCPU that matches * the domain handle and VCPU ID specified. - * + * * @param ops Pointer to this instance of the scheduler structure * @param handle Pointer to handler * @param vcpu_id VCPU ID - * + * * @return
        *
      • Pointer to the matching VCPU if one is found *
      • NULL otherwise @@ -191,7 +191,7 @@ static struct vcpu *find_vcpu( /** * This function updates the pointer to the Xen VCPU structure for each entry * in the ARINC 653 schedule. - * + * * @param ops Pointer to this instance of the scheduler structure * @return */ @@ -211,7 +211,7 @@ static void update_schedule_vcpus(const struct scheduler *ops) * in place a new ARINC653 schedule. * * @param ops Pointer to this instance of the scheduler structure - * + * * @return
          *
        • 0 = success *
        • !0 = error @@ -253,10 +253,10 @@ arinc653_sched_set( if ( !found_dom0 ) goto fail; - /* + /* * Error if the major frame is not large enough to run all entries as * indicated by comparing the total run time to the major frame length. - */ + */ if ( total_runtime > schedule->major_frame ) goto fail; @@ -276,10 +276,10 @@ arinc653_sched_set( update_schedule_vcpus(ops); /* - * The newly-installed schedule takes effect immediately. We do not even + * The newly-installed schedule takes effect immediately. We do not even * wait for the current major frame to expire. * - * Signal a new major frame to begin. The next major frame is set up by + * Signal a new major frame to begin. The next major frame is set up by * the do_schedule callback function when it is next invoked. */ sched_priv->next_major_frame = NOW(); @@ -392,8 +392,8 @@ a653sched_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) /* * Initialize our ARINC 653 scheduler-specific information for the VCPU. - * The VCPU starts "asleep." When Xen is ready for the VCPU to run, it - * will call the vcpu_wake scheduler callback function and our scheduler + * The VCPU starts "asleep." When Xen is ready for the VCPU to run, it + * will call the vcpu_wake scheduler callback function and our scheduler * will mark the VCPU awake. */ svc->vc = vc; @@ -483,7 +483,7 @@ a653sched_free_domdata(const struct scheduler *ops, void *data) /** * Xen scheduler callback function to sleep a VCPU - * + * * @param ops Pointer to this instance of the scheduler structure * @param vc Pointer to the VCPU structure for the current domain */ @@ -503,7 +503,7 @@ a653sched_vcpu_sleep(const struct scheduler *ops, struct vcpu *vc) /** * Xen scheduler callback function to wake up a VCPU - * + * * @param ops Pointer to this instance of the scheduler structure * @param vc Pointer to the VCPU structure for the current domain */ @@ -519,10 +519,10 @@ a653sched_vcpu_wake(const struct scheduler *ops, struct vcpu *vc) /** * Xen scheduler callback function to select a VCPU to run. * This is the main scheduler routine. - * + * * @param ops Pointer to this instance of the scheduler structure * @param now Current time - * + * * @return Address of the VCPU structure scheduled to be run next * Amount of time to execute the returned VCPU * Flag for whether the VCPU was migrated @@ -559,7 +559,7 @@ a653sched_do_schedule( } } - /* + /* * If we exhausted the domains in the schedule and still have time left * in the major frame then switch next at the next major frame. */ @@ -567,10 +567,10 @@ a653sched_do_schedule( next_switch_time = sched_priv->next_major_frame; /* - * If there are more domains to run in the current major frame, set - * new_task equal to the address of next domain's VCPU structure. - * Otherwise, set new_task equal to the address of the idle task's VCPU - * structure. + * If there are more domains to run in the current major frame, set + * new_task equal to the address of next domain's VCPU structure. + * Otherwise, set new_task equal to the address of the idle task's VCPU + * structure. */ new_task = (sched_index < sched_priv->num_schedule_entries) ? sched_priv->schedule[sched_index].vc @@ -584,10 +584,10 @@ a653sched_do_schedule( new_task = IDLETASK(0); BUG_ON(new_task == NULL); - /* + /* * Check to make sure we did not miss a major frame. - * This is a good test for robust partitioning. - */ + * This is a good test for robust partitioning. + */ BUG_ON(now >= sched_priv->next_major_frame); /* Tasklet work (which runs in idle VCPU context) overrides all else. */ @@ -595,8 +595,8 @@ a653sched_do_schedule( new_task = IDLETASK(0); /* - * Return the amount of time the next domain has to run and the address - * of the selected task's VCPU structure. + * Return the amount of time the next domain has to run and the address + * of the selected task's VCPU structure. */ ret.time = next_switch_time - now; ret.task = new_task; @@ -609,10 +609,10 @@ a653sched_do_schedule( /** * Xen scheduler callback function to select a CPU for the VCPU to run on - * + * * @param ops Pointer to this instance of the scheduler structure * @param v Pointer to the VCPU structure for the current domain - * + * * @return Number of selected physical CPU */ static int @@ -709,3 +709,13 @@ const struct scheduler sched_arinc653_def = { .tick_suspend = NULL, .tick_resume = NULL, }; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyR9-0000fO-Cj; Fri, 22 Nov 2013 21:38:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyR8-0000eK-4X for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:50 +0000 Received: from [85.158.143.35:17662] by server-2.bemta-4.messagelabs.com id D0/5E-11386-9EECF825; Fri, 22 Nov 2013 21:38:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385156327!523548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32670 invoked from network); 22 Nov 2013 21:38:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:38:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyR5-0004I9-IS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyR5-0004O5-F9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:47 +0000 Date: Fri, 22 Nov 2013 21:38:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix emulation of indirect far calls and jumps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5225a95577f71be633e490b729b2e157d4fa3208 Author: Jan Beulich AuthorDate: Tue Nov 19 16:59:49 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 19 16:59:49 2013 +0100 x86: fix emulation of indirect far calls and jumps Commit 86781624 ("x86_emulate: PUSH must read source operand just once") corrected the operands of those of the operations of opcode extension group 5 that only read memory from SrcMem to DstMem, but failed to also switch the use of "dst" here to "src". Reported-by: Anthony Perard Signed-off-by: Jan Beulich Tested-by: Anthony Perard Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e89035b..e833cdf 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3571,7 +3571,6 @@ x86_emulate( _regs.eip = src.val; src.val = dst.val; goto push; - break; case 4: /* jmp (near) */ _regs.eip = src.val; dst.type = OP_NONE; @@ -3580,9 +3579,9 @@ x86_emulate( case 5: /* jmp (far, absolute indirect) */ { unsigned long sel; - generate_exception_if(dst.type != OP_MEM, EXC_UD, -1); + generate_exception_if(src.type != OP_MEM, EXC_UD, -1); - if ( (rc = read_ulong(dst.mem.seg, dst.mem.off+dst.bytes, + if ( (rc = read_ulong(src.mem.seg, src.mem.off + op_bytes, &sel, 2, ctxt, ops)) ) goto done; @@ -3600,7 +3599,7 @@ x86_emulate( if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) goto done; - _regs.eip = dst.val; + _regs.eip = src.val; dst.type = OP_NONE; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:38:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:38: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 1VjyR9-0000fO-Cj; Fri, 22 Nov 2013 21:38:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyR8-0000eK-4X for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:50 +0000 Received: from [85.158.143.35:17662] by server-2.bemta-4.messagelabs.com id D0/5E-11386-9EECF825; Fri, 22 Nov 2013 21:38:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385156327!523548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32670 invoked from network); 22 Nov 2013 21:38:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:38:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyR5-0004I9-IS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyR5-0004O5-F9 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:47 +0000 Date: Fri, 22 Nov 2013 21:38:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix emulation of indirect far calls and jumps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5225a95577f71be633e490b729b2e157d4fa3208 Author: Jan Beulich AuthorDate: Tue Nov 19 16:59:49 2013 +0100 Commit: Jan Beulich CommitDate: Tue Nov 19 16:59:49 2013 +0100 x86: fix emulation of indirect far calls and jumps Commit 86781624 ("x86_emulate: PUSH must read source operand just once") corrected the operands of those of the operations of opcode extension group 5 that only read memory from SrcMem to DstMem, but failed to also switch the use of "dst" here to "src". Reported-by: Anthony Perard Signed-off-by: Jan Beulich Tested-by: Anthony Perard Acked-by: Keir Fraser --- xen/arch/x86/x86_emulate/x86_emulate.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e89035b..e833cdf 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3571,7 +3571,6 @@ x86_emulate( _regs.eip = src.val; src.val = dst.val; goto push; - break; case 4: /* jmp (near) */ _regs.eip = src.val; dst.type = OP_NONE; @@ -3580,9 +3579,9 @@ x86_emulate( case 5: /* jmp (far, absolute indirect) */ { unsigned long sel; - generate_exception_if(dst.type != OP_MEM, EXC_UD, -1); + generate_exception_if(src.type != OP_MEM, EXC_UD, -1); - if ( (rc = read_ulong(dst.mem.seg, dst.mem.off+dst.bytes, + if ( (rc = read_ulong(src.mem.seg, src.mem.off + op_bytes, &sel, 2, ctxt, ops)) ) goto done; @@ -3600,7 +3599,7 @@ x86_emulate( if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) goto done; - _regs.eip = dst.val; + _regs.eip = src.val; dst.type = OP_NONE; break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRL-0000jg-Fg; Fri, 22 Nov 2013 21:39:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRI-0000jT-J0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:00 +0000 Received: from [85.158.139.211:31982] by server-17.bemta-5.messagelabs.com id C3/AB-19152-3FECF825; Fri, 22 Nov 2013 21:38:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156338!698549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1900 invoked from network); 22 Nov 2013 21:38:58 -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 Nov 2013 21:38:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRF-0004II-QD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRF-0004OS-N7 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:57 +0000 Date: Fri, 22 Nov 2013 21:38:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaa3b94abc256729091b9d5c575439e48e951ba7 Merge: 0c64527e7fc961372a398eb68e307c2b103f1a28 5225a95577f71be633e490b729b2e157d4fa3208 Author: Ian Campbell AuthorDate: Tue Nov 19 16:41:28 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:28 2013 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/x86_emulate/x86_emulate.c | 7 +- xen/common/sched_arinc653.c | 96 +++++++++++++++++-------------- 2 files changed, 56 insertions(+), 47 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRL-0000jg-Fg; Fri, 22 Nov 2013 21:39:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRI-0000jT-J0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:00 +0000 Received: from [85.158.139.211:31982] by server-17.bemta-5.messagelabs.com id C3/AB-19152-3FECF825; Fri, 22 Nov 2013 21:38:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385156338!698549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1900 invoked from network); 22 Nov 2013 21:38:58 -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 Nov 2013 21:38:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRF-0004II-QD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRF-0004OS-N7 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:38:57 +0000 Date: Fri, 22 Nov 2013 21:38:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaa3b94abc256729091b9d5c575439e48e951ba7 Merge: 0c64527e7fc961372a398eb68e307c2b103f1a28 5225a95577f71be633e490b729b2e157d4fa3208 Author: Ian Campbell AuthorDate: Tue Nov 19 16:41:28 2013 +0000 Commit: Ian Campbell CommitDate: Tue Nov 19 16:41:28 2013 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/x86_emulate/x86_emulate.c | 7 +- xen/common/sched_arinc653.c | 96 +++++++++++++++++-------------- 2 files changed, 56 insertions(+), 47 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRU-0000lJ-K5; Fri, 22 Nov 2013 21:39:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRT-0000l0-Ej for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:11 +0000 Received: from [85.158.139.211:14348] by server-15.bemta-5.messagelabs.com id F1/42-08490-DFECF825; Fri, 22 Nov 2013 21:39:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1385156348!3699597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14698 invoked from network); 22 Nov 2013 21:39:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:39:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRP-0004Iu-Ud for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRP-0004Oy-TS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:07 +0000 Date: Fri, 22 Nov 2013 21:39:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: don't use dom0 variable in gicv_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 d77044ccf1fd8dd0adc87cf2c0d77ac26958a7e8 Author: Julien Grall AuthorDate: Tue Nov 19 17:55:45 2013 +0000 Commit: Ian Campbell CommitDate: Wed Nov 20 09:32:19 2013 +0000 xen/arm: gic: don't use dom0 variable in gicv_setup The commit 99bf30a "xen: arm: define guest virtual platform in API headers" modifies gicv_setup to either use harcoded addresses for guest or hardware addresses for dom0. In the latter case, the variable dom0 is not yet initialized. dom0 receives assignment by the return of domain_create which calls gicv_setup. Use the ID to know whether the domain is dom0 or not. 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 33c6b8d..ab49106 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -827,7 +827,7 @@ int gicv_setup(struct domain *d) * Domain 0 gets the hardware address. * Guests get the virtual platform layout. */ - if ( d == dom0 ) + if ( d->domain_id == 0 ) { d->arch.vgic.dbase = gic.dbase; d->arch.vgic.cbase = gic.cbase; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRU-0000lJ-K5; Fri, 22 Nov 2013 21:39:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRT-0000l0-Ej for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:11 +0000 Received: from [85.158.139.211:14348] by server-15.bemta-5.messagelabs.com id F1/42-08490-DFECF825; Fri, 22 Nov 2013 21:39:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1385156348!3699597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14698 invoked from network); 22 Nov 2013 21:39:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:39:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRP-0004Iu-Ud for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRP-0004Oy-TS for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:07 +0000 Date: Fri, 22 Nov 2013 21:39:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: don't use dom0 variable in gicv_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 d77044ccf1fd8dd0adc87cf2c0d77ac26958a7e8 Author: Julien Grall AuthorDate: Tue Nov 19 17:55:45 2013 +0000 Commit: Ian Campbell CommitDate: Wed Nov 20 09:32:19 2013 +0000 xen/arm: gic: don't use dom0 variable in gicv_setup The commit 99bf30a "xen: arm: define guest virtual platform in API headers" modifies gicv_setup to either use harcoded addresses for guest or hardware addresses for dom0. In the latter case, the variable dom0 is not yet initialized. dom0 receives assignment by the return of domain_create which calls gicv_setup. Use the ID to know whether the domain is dom0 or not. 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 33c6b8d..ab49106 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -827,7 +827,7 @@ int gicv_setup(struct domain *d) * Domain 0 gets the hardware address. * Guests get the virtual platform layout. */ - if ( d == dom0 ) + if ( d->domain_id == 0 ) { d->arch.vgic.dbase = gic.dbase; d->arch.vgic.cbase = gic.cbase; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRe-0000pR-Nb; Fri, 22 Nov 2013 21:39:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRd-0000oo-10 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:21 +0000 Received: from [85.158.137.68:4539] by server-8.bemta-3.messagelabs.com id 3D/1A-31081-80FCF825; Fri, 22 Nov 2013 21:39:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1385156358!3273897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21039 invoked from network); 22 Nov 2013 21:39:19 -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; 22 Nov 2013 21:39:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRa-0004J0-4m for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRa-0004Ps-2J for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:18 +0000 Date: Fri, 22 Nov 2013 21:39:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Check if the range is valid in init_domheap_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45ffa79447954e68892322d985e72620d32ac16d Author: Julien Grall AuthorDate: Wed Nov 13 13:37:50 2013 +0000 Commit: Ian Campbell CommitDate: Thu Nov 21 10:43:01 2013 +0000 xen: Check if the range is valid in init_domheap_pages On ARM, when an initrd is given to xen by U-boot, it will reserve the memory in the device tree. In this case, when xen decides to free unused memory, dt_unreserved_regions will call init_domheap_pages with the start and the end of range equals. But the latter assumes that (start > end), if not Xen will hang because the number of pages is equals to (unsigned)-1. Signed-off-by: Julien Grall Acked-by: Keir Fraser Acked-by: Ian Campbell CC: Jan Beulich --- xen/common/page_alloc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 4c17fbd..0701333 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1429,6 +1429,9 @@ void init_domheap_pages(paddr_t ps, paddr_t pe) smfn = round_pgup(ps) >> PAGE_SHIFT; emfn = round_pgdown(pe) >> PAGE_SHIFT; + if ( emfn <= smfn ) + return; + init_heap_pages(mfn_to_page(smfn), emfn - smfn); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRe-0000pR-Nb; Fri, 22 Nov 2013 21:39:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRd-0000oo-10 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:21 +0000 Received: from [85.158.137.68:4539] by server-8.bemta-3.messagelabs.com id 3D/1A-31081-80FCF825; Fri, 22 Nov 2013 21:39:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1385156358!3273897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21039 invoked from network); 22 Nov 2013 21:39:19 -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; 22 Nov 2013 21:39:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRa-0004J0-4m for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRa-0004Ps-2J for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:18 +0000 Date: Fri, 22 Nov 2013 21:39:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Check if the range is valid in init_domheap_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45ffa79447954e68892322d985e72620d32ac16d Author: Julien Grall AuthorDate: Wed Nov 13 13:37:50 2013 +0000 Commit: Ian Campbell CommitDate: Thu Nov 21 10:43:01 2013 +0000 xen: Check if the range is valid in init_domheap_pages On ARM, when an initrd is given to xen by U-boot, it will reserve the memory in the device tree. In this case, when xen decides to free unused memory, dt_unreserved_regions will call init_domheap_pages with the start and the end of range equals. But the latter assumes that (start > end), if not Xen will hang because the number of pages is equals to (unsigned)-1. Signed-off-by: Julien Grall Acked-by: Keir Fraser Acked-by: Ian Campbell CC: Jan Beulich --- xen/common/page_alloc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 4c17fbd..0701333 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1429,6 +1429,9 @@ void init_domheap_pages(paddr_t ps, paddr_t pe) smfn = round_pgup(ps) >> PAGE_SHIFT; emfn = round_pgdown(pe) >> PAGE_SHIFT; + if ( emfn <= smfn ) + return; + init_heap_pages(mfn_to_page(smfn), emfn - smfn); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRo-0000uJ-Qv; Fri, 22 Nov 2013 21:39:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRm-0000sO-UO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:31 +0000 Received: from [85.158.139.211:32790] by server-17.bemta-5.messagelabs.com id EF/DB-19152-21FCF825; Fri, 22 Nov 2013 21:39:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1385156368!3759218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1726 invoked from network); 22 Nov 2013 21:39:29 -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; 22 Nov 2013 21:39:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRk-0004JE-C0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRk-0004QE-80 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:28 +0000 Date: Fri, 22 Nov 2013 21:39:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: arm: ensure DTB is page 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 d239c0a68fb32716da8d2585cc2470ea4e8df3bd Author: Ian Campbell AuthorDate: Wed Nov 20 09:45:32 2013 +0000 Commit: Ian Campbell CommitDate: Thu Nov 21 10:45:29 2013 +0000 libxl: arm: ensure DTB is page aligned xc_dom_alloc_segment requires this. Since rambase and ramend are both page aligned, rounding up the DTB is sufficient. Reported-by: Julien Grall Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index ffe575b..a40e04d 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -282,7 +282,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) { const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; const uint64_t ramend = rambase + ( dom->total_pages << XC_PAGE_SHIFT ); - const uint64_t dtbsize = ( dom->devicetree_size + 3 ) & ~0x3; + const uint64_t dtbsize = ROUNDUP(dom->devicetree_size, XC_PAGE_SHIFT); /* Place at 128MB if there is sufficient RAM */ if ( ramend >= rambase + 128*1024*1024 + dtbsize ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRo-0000uJ-Qv; Fri, 22 Nov 2013 21:39:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRm-0000sO-UO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:31 +0000 Received: from [85.158.139.211:32790] by server-17.bemta-5.messagelabs.com id EF/DB-19152-21FCF825; Fri, 22 Nov 2013 21:39:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1385156368!3759218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1726 invoked from network); 22 Nov 2013 21:39:29 -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; 22 Nov 2013 21:39:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRk-0004JE-C0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRk-0004QE-80 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:28 +0000 Date: Fri, 22 Nov 2013 21:39:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: arm: ensure DTB is page 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 d239c0a68fb32716da8d2585cc2470ea4e8df3bd Author: Ian Campbell AuthorDate: Wed Nov 20 09:45:32 2013 +0000 Commit: Ian Campbell CommitDate: Thu Nov 21 10:45:29 2013 +0000 libxl: arm: ensure DTB is page aligned xc_dom_alloc_segment requires this. Since rambase and ramend are both page aligned, rounding up the DTB is sufficient. Reported-by: Julien Grall Signed-off-by: Ian Campbell Acked-by: Julien Grall --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index ffe575b..a40e04d 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -282,7 +282,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) { const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT; const uint64_t ramend = rambase + ( dom->total_pages << XC_PAGE_SHIFT ); - const uint64_t dtbsize = ( dom->devicetree_size + 3 ) & ~0x3; + const uint64_t dtbsize = ROUNDUP(dom->devicetree_size, XC_PAGE_SHIFT); /* Place at 128MB if there is sufficient RAM */ if ( ramend >= rambase + 128*1024*1024 + dtbsize ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRy-00012R-Tw; Fri, 22 Nov 2013 21:39:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRx-000127-9f for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:41 +0000 Received: from [85.158.137.68:17658] by server-5.bemta-3.messagelabs.com id C1/06-00571-C1FCF825; Fri, 22 Nov 2013 21:39:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385156378!3286903!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29998 invoked from network); 22 Nov 2013 21:39:39 -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; 22 Nov 2013 21:39:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRu-0004JK-JE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRu-0004Qe-GX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:38 +0000 Date: Fri, 22 Nov 2013 21:39:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix use of aodev->dev after free X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1824682665369815163==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1824682665369815163== Content-Type: text/plain commit 5280b7bd26cc93e4a46f0ac6d7706d96e9222154 Author: Roger Pau Monne AuthorDate: Thu Nov 21 17:18:00 2013 +0100 Commit: Ian Jackson CommitDate: Thu Nov 21 18:33:07 2013 +0000 libxl: fix use of aodev->dev after free Coverity-ID: 1130521 Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4292c78..ed32931 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3596,14 +3596,14 @@ static void device_complete(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) - free(aodev->dev); - LOG(DEBUG, "device %s %s %s", libxl__device_backend_path(gc, aodev->dev), libxl__device_action_to_string(aodev->action), aodev->rc ? "failed" : "succeed"); + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) + free(aodev->dev); + libxl__nested_ao_free(aodev->ao); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1824682665369815163== 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 --===============1824682665369815163==-- From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyRy-00012R-Tw; Fri, 22 Nov 2013 21:39:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRx-000127-9f for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:41 +0000 Received: from [85.158.137.68:17658] by server-5.bemta-3.messagelabs.com id C1/06-00571-C1FCF825; Fri, 22 Nov 2013 21:39:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385156378!3286903!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29998 invoked from network); 22 Nov 2013 21:39:39 -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; 22 Nov 2013 21:39:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyRu-0004JK-JE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyRu-0004Qe-GX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:38 +0000 Date: Fri, 22 Nov 2013 21:39:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix use of aodev->dev after free X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============1824682665369815163==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1824682665369815163== Content-Type: text/plain commit 5280b7bd26cc93e4a46f0ac6d7706d96e9222154 Author: Roger Pau Monne AuthorDate: Thu Nov 21 17:18:00 2013 +0100 Commit: Ian Jackson CommitDate: Thu Nov 21 18:33:07 2013 +0000 libxl: fix use of aodev->dev after free Coverity-ID: 1130521 Signed-off-by: Roger Pau Monné Cc: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4292c78..ed32931 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3596,14 +3596,14 @@ static void device_complete(libxl__egc *egc, libxl__ao_device *aodev) { STATE_AO_GC(aodev->ao); - if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) - free(aodev->dev); - LOG(DEBUG, "device %s %s %s", libxl__device_backend_path(gc, aodev->dev), libxl__device_action_to_string(aodev->action), aodev->rc ? "failed" : "succeed"); + if (aodev->action == LIBXL__DEVICE_ACTION_REMOVE) + free(aodev->dev); + libxl__nested_ao_free(aodev->ao); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1824682665369815163== 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 --===============1824682665369815163==-- From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:39:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyS9-00015X-15; Fri, 22 Nov 2013 21:39:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyS7-00015J-K0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:51 +0000 Received: from [85.158.137.68:5239] by server-4.bemta-3.messagelabs.com id C5/04-10414-62FCF825; Fri, 22 Nov 2013 21:39:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385156388!3267230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14847 invoked from network); 22 Nov 2013 21:39:50 -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; 22 Nov 2013 21:39:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyS4-0004JQ-Os for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyS4-0004RP-Mp for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:48 +0000 Date: Fri, 22 Nov 2013 21:39:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hotplug/Linux: update to new ip command syntax. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f400f2993b52e820d0da24a2e49a8fdfab0d2827 Author: Mike AuthorDate: Fri Aug 16 15:31:43 2013 +0100 Commit: Ian Jackson CommitDate: Thu Nov 21 18:43:42 2013 +0000 hotplug/Linux: update to new ip command syntax. The current usage prevents naming a vif "dev". Although the current syntax is documented in Squeeze's ip(8) it appears that this was a documentation bug. Newer versions of the man page describe the new syntax used here and Squeeze's implementation accepts it as well. This is Debian bug #705659. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705659 Mike provided the initial patch to tools/hotplug/Linux/xen-network-common.sh and Ian extended it to catch some cases in vif-* too. Signed-off-by: Ian Campbell Signed-off-by: Mike Acked-by: Ian Jackson Release-acked-by: George Dunlap --- tools/hotplug/Linux/vif-bridge | 2 +- tools/hotplug/Linux/vif-nat | 2 +- tools/hotplug/Linux/xen-network-common.sh | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 678262d..b7dcbd6 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -72,7 +72,7 @@ else fi RET=0 -ip link show $bridge 1>/dev/null 2>&1 || RET=1 +ip link show dev $bridge 1>/dev/null 2>&1 || RET=1 if [ "$RET" -eq 1 ] then fatal "Could not find bridge device $bridge" diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat index 8d29fb6..0b900d5 100644 --- a/tools/hotplug/Linux/vif-nat +++ b/tools/hotplug/Linux/vif-nat @@ -170,7 +170,7 @@ case "$command" in exit 0 fi - do_or_die ip link set "${dev}" up arp on + do_or_die ip link set dev "${dev}" up arp on do_or_die ip addr add "$router_ip" dev "${dev}" do_or_die ip route add "$vif_ip" dev "${dev}" src "$router_ip" echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 50b8711..3c63c55 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -85,18 +85,18 @@ _setup_bridge_port() { local virtual="$2" # take interface down ... - ip link set ${dev} down + ip link set dev ${dev} down if [ $virtual -ne 0 ] ; then # Initialise a dummy MAC address. We choose the numerically # largest non-broadcast address to prevent the address getting # stolen by an Ethernet bridge for STP purposes. # (FE:FF:FF:FF:FF:FF) - ip link set ${dev} address fe:ff:ff:ff:ff:ff || true + ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true fi # ... and configure it - ip addr flush ${dev} + ip address flush dev ${dev} } setup_physical_bridge_port() { @@ -125,20 +125,20 @@ add_to_bridge () { # Don't add $dev to $bridge if it's already on a bridge. if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then - ip link set ${dev} up || true + ip link set dev ${dev} up || true return fi brctl addif ${bridge} ${dev} - ip link set ${dev} up + ip link set dev ${dev} up } # Usage: set_mtu bridge dev set_mtu () { local bridge=$1 local dev=$2 - mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] then - ip link set ${dev} mtu $mtu || : + ip link set dev ${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 Fri Nov 22 21:39:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:39: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 1VjyS9-00015X-15; Fri, 22 Nov 2013 21:39:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyS7-00015J-K0 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:51 +0000 Received: from [85.158.137.68:5239] by server-4.bemta-3.messagelabs.com id C5/04-10414-62FCF825; Fri, 22 Nov 2013 21:39:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385156388!3267230!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14847 invoked from network); 22 Nov 2013 21:39:50 -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; 22 Nov 2013 21:39:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjyS4-0004JQ-Os for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjyS4-0004RP-Mp for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:48 +0000 Date: Fri, 22 Nov 2013 21:39:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hotplug/Linux: update to new ip command syntax. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f400f2993b52e820d0da24a2e49a8fdfab0d2827 Author: Mike AuthorDate: Fri Aug 16 15:31:43 2013 +0100 Commit: Ian Jackson CommitDate: Thu Nov 21 18:43:42 2013 +0000 hotplug/Linux: update to new ip command syntax. The current usage prevents naming a vif "dev". Although the current syntax is documented in Squeeze's ip(8) it appears that this was a documentation bug. Newer versions of the man page describe the new syntax used here and Squeeze's implementation accepts it as well. This is Debian bug #705659. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705659 Mike provided the initial patch to tools/hotplug/Linux/xen-network-common.sh and Ian extended it to catch some cases in vif-* too. Signed-off-by: Ian Campbell Signed-off-by: Mike Acked-by: Ian Jackson Release-acked-by: George Dunlap --- tools/hotplug/Linux/vif-bridge | 2 +- tools/hotplug/Linux/vif-nat | 2 +- tools/hotplug/Linux/xen-network-common.sh | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 678262d..b7dcbd6 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -72,7 +72,7 @@ else fi RET=0 -ip link show $bridge 1>/dev/null 2>&1 || RET=1 +ip link show dev $bridge 1>/dev/null 2>&1 || RET=1 if [ "$RET" -eq 1 ] then fatal "Could not find bridge device $bridge" diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat index 8d29fb6..0b900d5 100644 --- a/tools/hotplug/Linux/vif-nat +++ b/tools/hotplug/Linux/vif-nat @@ -170,7 +170,7 @@ case "$command" in exit 0 fi - do_or_die ip link set "${dev}" up arp on + do_or_die ip link set dev "${dev}" up arp on do_or_die ip addr add "$router_ip" dev "${dev}" do_or_die ip route add "$vif_ip" dev "${dev}" src "$router_ip" echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 50b8711..3c63c55 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -85,18 +85,18 @@ _setup_bridge_port() { local virtual="$2" # take interface down ... - ip link set ${dev} down + ip link set dev ${dev} down if [ $virtual -ne 0 ] ; then # Initialise a dummy MAC address. We choose the numerically # largest non-broadcast address to prevent the address getting # stolen by an Ethernet bridge for STP purposes. # (FE:FF:FF:FF:FF:FF) - ip link set ${dev} address fe:ff:ff:ff:ff:ff || true + ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true fi # ... and configure it - ip addr flush ${dev} + ip address flush dev ${dev} } setup_physical_bridge_port() { @@ -125,20 +125,20 @@ add_to_bridge () { # Don't add $dev to $bridge if it's already on a bridge. if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then - ip link set ${dev} up || true + ip link set dev ${dev} up || true return fi brctl addif ${bridge} ${dev} - ip link set ${dev} up + ip link set dev ${dev} up } # Usage: set_mtu bridge dev set_mtu () { local bridge=$1 local dev=$2 - mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] then - ip link set ${dev} mtu $mtu || : + ip link set dev ${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 Fri Nov 22 21:40:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySK-000175-FF; Fri, 22 Nov 2013 21:40:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySH-00016n-Qg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:02 +0000 Received: from [85.158.143.35:50394] by server-1.bemta-4.messagelabs.com id 39/29-02132-13FCF825; Fri, 22 Nov 2013 21:40:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385156399!508430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21855 invoked from network); 22 Nov 2013 21:40:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySE-0004JZ-WE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySE-0004S4-U8 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:58 +0000 Date: Fri, 22 Nov 2013 21:39:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: pass gc, not just ctx, to internal sigchld manipulators X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d2f96adc8fd0ca99bcb6b83b2b557769b13fc26 Author: Ian Jackson AuthorDate: Tue Nov 5 16:17:42 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: pass gc, not just ctx, to internal sigchld manipulators We are going to want the gc for libxl__ev_fd_register. No functional change in this patch. Simply change the argument types, and the actual arguments from ctx to gc. Inside these functions, use CTX (the macro which uses gc) rather than the old formal parameter ctx. Signed-off-by: Ian Jackson Cc: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_fork.c | 36 ++++++++++++++++++------------------ tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ed32931..b72e3a7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -164,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) /* If we have outstanding children, then the application inherits * them; we wish the application good luck with understanding * this if and when it reaps them. */ - libxl__sigchld_removehandler(ctx); + libxl__sigchld_removehandler(gc); if (ctx->sigchld_selfpipe[0] >= 0) { close(ctx->sigchld_selfpipe[0]); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index b6f0b2d..ae6184c 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -175,23 +175,23 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } -void libxl__sigchld_removehandler(libxl_ctx *ctx) /* non-reentrant */ +void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ { atfork_lock(); - if (sigchld_owner == ctx) + if (sigchld_owner == CTX) sigchld_removehandler_core(); atfork_unlock(); } -int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ +int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ { int r, rc; - if (ctx->sigchld_selfpipe[0] < 0) { - r = pipe(ctx->sigchld_selfpipe); + if (CTX->sigchld_selfpipe[0] < 0) { + r = pipe(CTX->sigchld_selfpipe); if (r) { - ctx->sigchld_selfpipe[0] = -1; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + CTX->sigchld_selfpipe[0] = -1; + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "failed to create sigchld pipe"); rc = ERROR_FAIL; goto out; @@ -199,11 +199,11 @@ int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ } atfork_lock(); - if (sigchld_owner != ctx) { + if (sigchld_owner != CTX) { struct sigaction ours; assert(!sigchld_owner); - sigchld_owner = ctx; + sigchld_owner = CTX; memset(&ours,0,sizeof(ours)); ours.sa_handler = sigchld_handler; @@ -241,11 +241,11 @@ int libxl__fork_selfpipe_active(libxl_ctx *ctx) return ctx->sigchld_selfpipe[0]; } -static void perhaps_removehandler(libxl_ctx *ctx) +static void perhaps_removehandler(libxl__gc *gc) { - if (LIBXL_LIST_EMPTY(&ctx->children) && - ctx->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) - libxl__sigchld_removehandler(ctx); + if (LIBXL_LIST_EMPTY(&CTX->children) && + CTX->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + libxl__sigchld_removehandler(gc); } static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) @@ -265,7 +265,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) ch->pid = -1; ch->callback(egc, ch, pid, status); - perhaps_removehandler(CTX); + perhaps_removehandler(gc); return 0; } @@ -333,7 +333,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, int rc; if (chldmode_ours(CTX)) { - rc = libxl__sigchld_installhandler(CTX); + rc = libxl__sigchld_installhandler(gc); if (rc) goto out; } @@ -363,7 +363,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, rc = pid; out: - perhaps_removehandler(CTX); + perhaps_removehandler(gc); CTX_UNLOCK; return rc; } @@ -385,10 +385,10 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, switch (ctx->childproc_hooks->chldowner) { case libxl_sigchld_owner_mainloop: case libxl_sigchld_owner_libxl: - libxl__sigchld_removehandler(ctx); + libxl__sigchld_removehandler(gc); break; case libxl_sigchld_owner_libxl_always: - libxl__sigchld_installhandler(ctx); + libxl__sigchld_installhandler(gc); break; default: abort(); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 670234b..7310dc9 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -837,8 +837,8 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); /* Internal to fork and child reaping machinery */ extern const libxl_childproc_hooks libxl__childproc_default_hooks; -int libxl__sigchld_installhandler(libxl_ctx *ctx); /* non-reentrant;logs errs */ -void libxl__sigchld_removehandler(libxl_ctx *ctx); /* non-reentrant */ +int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ +void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ void libxl__fork_selfpipe_woken(libxl__egc *egc); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySK-000175-FF; Fri, 22 Nov 2013 21:40:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySH-00016n-Qg for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:02 +0000 Received: from [85.158.143.35:50394] by server-1.bemta-4.messagelabs.com id 39/29-02132-13FCF825; Fri, 22 Nov 2013 21:40:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385156399!508430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21855 invoked from network); 22 Nov 2013 21:40:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySE-0004JZ-WE for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySE-0004S4-U8 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:39:58 +0000 Date: Fri, 22 Nov 2013 21:39:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: pass gc, not just ctx, to internal sigchld manipulators X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d2f96adc8fd0ca99bcb6b83b2b557769b13fc26 Author: Ian Jackson AuthorDate: Tue Nov 5 16:17:42 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: pass gc, not just ctx, to internal sigchld manipulators We are going to want the gc for libxl__ev_fd_register. No functional change in this patch. Simply change the argument types, and the actual arguments from ctx to gc. Inside these functions, use CTX (the macro which uses gc) rather than the old formal parameter ctx. Signed-off-by: Ian Jackson Cc: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_fork.c | 36 ++++++++++++++++++------------------ tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ed32931..b72e3a7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -164,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) /* If we have outstanding children, then the application inherits * them; we wish the application good luck with understanding * this if and when it reaps them. */ - libxl__sigchld_removehandler(ctx); + libxl__sigchld_removehandler(gc); if (ctx->sigchld_selfpipe[0] >= 0) { close(ctx->sigchld_selfpipe[0]); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index b6f0b2d..ae6184c 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -175,23 +175,23 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } -void libxl__sigchld_removehandler(libxl_ctx *ctx) /* non-reentrant */ +void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ { atfork_lock(); - if (sigchld_owner == ctx) + if (sigchld_owner == CTX) sigchld_removehandler_core(); atfork_unlock(); } -int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ +int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ { int r, rc; - if (ctx->sigchld_selfpipe[0] < 0) { - r = pipe(ctx->sigchld_selfpipe); + if (CTX->sigchld_selfpipe[0] < 0) { + r = pipe(CTX->sigchld_selfpipe); if (r) { - ctx->sigchld_selfpipe[0] = -1; - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + CTX->sigchld_selfpipe[0] = -1; + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "failed to create sigchld pipe"); rc = ERROR_FAIL; goto out; @@ -199,11 +199,11 @@ int libxl__sigchld_installhandler(libxl_ctx *ctx) /* non-reentrant */ } atfork_lock(); - if (sigchld_owner != ctx) { + if (sigchld_owner != CTX) { struct sigaction ours; assert(!sigchld_owner); - sigchld_owner = ctx; + sigchld_owner = CTX; memset(&ours,0,sizeof(ours)); ours.sa_handler = sigchld_handler; @@ -241,11 +241,11 @@ int libxl__fork_selfpipe_active(libxl_ctx *ctx) return ctx->sigchld_selfpipe[0]; } -static void perhaps_removehandler(libxl_ctx *ctx) +static void perhaps_removehandler(libxl__gc *gc) { - if (LIBXL_LIST_EMPTY(&ctx->children) && - ctx->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) - libxl__sigchld_removehandler(ctx); + if (LIBXL_LIST_EMPTY(&CTX->children) && + CTX->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + libxl__sigchld_removehandler(gc); } static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) @@ -265,7 +265,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) ch->pid = -1; ch->callback(egc, ch, pid, status); - perhaps_removehandler(CTX); + perhaps_removehandler(gc); return 0; } @@ -333,7 +333,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, int rc; if (chldmode_ours(CTX)) { - rc = libxl__sigchld_installhandler(CTX); + rc = libxl__sigchld_installhandler(gc); if (rc) goto out; } @@ -363,7 +363,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, rc = pid; out: - perhaps_removehandler(CTX); + perhaps_removehandler(gc); CTX_UNLOCK; return rc; } @@ -385,10 +385,10 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, switch (ctx->childproc_hooks->chldowner) { case libxl_sigchld_owner_mainloop: case libxl_sigchld_owner_libxl: - libxl__sigchld_removehandler(ctx); + libxl__sigchld_removehandler(gc); break; case libxl_sigchld_owner_libxl_always: - libxl__sigchld_installhandler(ctx); + libxl__sigchld_installhandler(gc); break; default: abort(); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 670234b..7310dc9 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -837,8 +837,8 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); /* Internal to fork and child reaping machinery */ extern const libxl_childproc_hooks libxl__childproc_default_hooks; -int libxl__sigchld_installhandler(libxl_ctx *ctx); /* non-reentrant;logs errs */ -void libxl__sigchld_removehandler(libxl_ctx *ctx); /* non-reentrant */ +int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ +void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ void libxl__fork_selfpipe_woken(libxl__egc *egc); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjyST-00019M-As; Fri, 22 Nov 2013 21:40:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySS-000193-1q for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:12 +0000 Received: from [193.109.254.147:21256] by server-12.bemta-14.messagelabs.com id B8/7E-25062-B3FCF825; Fri, 22 Nov 2013 21:40:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385156409!207445!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3724 invoked from network); 22 Nov 2013 21:40:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySP-0004K6-99 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySP-0004Sl-3e for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:09 +0000 Date: Fri, 22 Nov 2013 21:40:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: Make libxl_sigchld_owner_libxl_always work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755aa9edb274f6f69a7afaffa399c70eb8205369 Author: Ian Jackson AuthorDate: Tue Nov 5 16:43:59 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: Make libxl_sigchld_owner_libxl_always work Previously, libxl_sigchld_owner_libxl_always was mishandled. It would result in libxl paying no attention to the sigchld self pipe. Fix this by fixing chldmode_ours so that it returns true iff we are supposed to be handling SIGCHLD. Additionally, we arrange to use chldmode_ours everywhere where we are installing/removing signal handlers and/or deciding whether to check the self pipe, etc. This means it needs a new "creating" flag argument for the benefit of libxl__ev_child_fork, which needs to install the signal handler in libxl_sigchld_owner_libxl even if there are not currently any children. ctx->childproc_hooks->chldowner is now interpreted only by chldmode_ours. Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Cc: Ian Campbell Cc: Jim Fehlig --- v2: Get sense of chldmode test right in perhaps_removehandler (!) --- tools/libxl/libxl_fork.c | 51 ++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index ae6184c..a581763 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -224,18 +224,23 @@ int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ return rc; } -static int chldmode_ours(libxl_ctx *ctx) +static bool chldmode_ours(libxl_ctx *ctx, bool creating) { - return ctx->childproc_hooks->chldowner == libxl_sigchld_owner_libxl; + switch (ctx->childproc_hooks->chldowner) { + case libxl_sigchld_owner_libxl: + return creating || !LIBXL_LIST_EMPTY(&ctx->children); + case libxl_sigchld_owner_mainloop: + return 0; + case libxl_sigchld_owner_libxl_always: + return 1; + } + abort(); } int libxl__fork_selfpipe_active(libxl_ctx *ctx) { /* Returns the fd to read, or -1 */ - if (!chldmode_ours(ctx)) - return -1; - - if (LIBXL_LIST_EMPTY(&ctx->children)) + if (!chldmode_ours(ctx, 0)) return -1; return ctx->sigchld_selfpipe[0]; @@ -243,11 +248,21 @@ int libxl__fork_selfpipe_active(libxl_ctx *ctx) static void perhaps_removehandler(libxl__gc *gc) { - if (LIBXL_LIST_EMPTY(&CTX->children) && - CTX->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + if (!chldmode_ours(CTX, 0)) libxl__sigchld_removehandler(gc); } +static int perhaps_installhandler(libxl__gc *gc, bool creating) +{ + int rc; + + if (chldmode_ours(CTX, creating)) { + rc = libxl__sigchld_installhandler(gc); + if (rc) return rc; + } + return 0; +} + static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) { EGC_GC; @@ -286,7 +301,7 @@ void libxl__fork_selfpipe_woken(libxl__egc *egc) * ctx must be locked EXACTLY ONCE */ EGC_GC; - while (chldmode_ours(CTX) /* in case the app changes the mode */) { + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = waitpid(-1, &status, WNOHANG); @@ -332,10 +347,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, CTX_LOCK; int rc; - if (chldmode_ours(CTX)) { - rc = libxl__sigchld_installhandler(gc); - if (rc) goto out; - } + perhaps_installhandler(gc, 1); pid_t pid = CTX->childproc_hooks->fork_replacement @@ -382,17 +394,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, ctx->childproc_hooks = hooks; ctx->childproc_user = user; - switch (ctx->childproc_hooks->chldowner) { - case libxl_sigchld_owner_mainloop: - case libxl_sigchld_owner_libxl: - libxl__sigchld_removehandler(gc); - break; - case libxl_sigchld_owner_libxl_always: - libxl__sigchld_installhandler(gc); - break; - default: - abort(); - } + perhaps_removehandler(gc); + perhaps_installhandler(gc, 0); /* idempotent, ok to ignore errors for now */ CTX_UNLOCK; GC_FREE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjyST-00019M-As; Fri, 22 Nov 2013 21:40:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySS-000193-1q for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:12 +0000 Received: from [193.109.254.147:21256] by server-12.bemta-14.messagelabs.com id B8/7E-25062-B3FCF825; Fri, 22 Nov 2013 21:40:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385156409!207445!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3724 invoked from network); 22 Nov 2013 21:40:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySP-0004K6-99 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySP-0004Sl-3e for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:09 +0000 Date: Fri, 22 Nov 2013 21:40:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: Make libxl_sigchld_owner_libxl_always work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755aa9edb274f6f69a7afaffa399c70eb8205369 Author: Ian Jackson AuthorDate: Tue Nov 5 16:43:59 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: Make libxl_sigchld_owner_libxl_always work Previously, libxl_sigchld_owner_libxl_always was mishandled. It would result in libxl paying no attention to the sigchld self pipe. Fix this by fixing chldmode_ours so that it returns true iff we are supposed to be handling SIGCHLD. Additionally, we arrange to use chldmode_ours everywhere where we are installing/removing signal handlers and/or deciding whether to check the self pipe, etc. This means it needs a new "creating" flag argument for the benefit of libxl__ev_child_fork, which needs to install the signal handler in libxl_sigchld_owner_libxl even if there are not currently any children. ctx->childproc_hooks->chldowner is now interpreted only by chldmode_ours. Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Cc: Ian Campbell Cc: Jim Fehlig --- v2: Get sense of chldmode test right in perhaps_removehandler (!) --- tools/libxl/libxl_fork.c | 51 ++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index ae6184c..a581763 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -224,18 +224,23 @@ int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ return rc; } -static int chldmode_ours(libxl_ctx *ctx) +static bool chldmode_ours(libxl_ctx *ctx, bool creating) { - return ctx->childproc_hooks->chldowner == libxl_sigchld_owner_libxl; + switch (ctx->childproc_hooks->chldowner) { + case libxl_sigchld_owner_libxl: + return creating || !LIBXL_LIST_EMPTY(&ctx->children); + case libxl_sigchld_owner_mainloop: + return 0; + case libxl_sigchld_owner_libxl_always: + return 1; + } + abort(); } int libxl__fork_selfpipe_active(libxl_ctx *ctx) { /* Returns the fd to read, or -1 */ - if (!chldmode_ours(ctx)) - return -1; - - if (LIBXL_LIST_EMPTY(&ctx->children)) + if (!chldmode_ours(ctx, 0)) return -1; return ctx->sigchld_selfpipe[0]; @@ -243,11 +248,21 @@ int libxl__fork_selfpipe_active(libxl_ctx *ctx) static void perhaps_removehandler(libxl__gc *gc) { - if (LIBXL_LIST_EMPTY(&CTX->children) && - CTX->childproc_hooks->chldowner != libxl_sigchld_owner_libxl_always) + if (!chldmode_ours(CTX, 0)) libxl__sigchld_removehandler(gc); } +static int perhaps_installhandler(libxl__gc *gc, bool creating) +{ + int rc; + + if (chldmode_ours(CTX, creating)) { + rc = libxl__sigchld_installhandler(gc); + if (rc) return rc; + } + return 0; +} + static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) { EGC_GC; @@ -286,7 +301,7 @@ void libxl__fork_selfpipe_woken(libxl__egc *egc) * ctx must be locked EXACTLY ONCE */ EGC_GC; - while (chldmode_ours(CTX) /* in case the app changes the mode */) { + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = waitpid(-1, &status, WNOHANG); @@ -332,10 +347,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, CTX_LOCK; int rc; - if (chldmode_ours(CTX)) { - rc = libxl__sigchld_installhandler(gc); - if (rc) goto out; - } + perhaps_installhandler(gc, 1); pid_t pid = CTX->childproc_hooks->fork_replacement @@ -382,17 +394,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, ctx->childproc_hooks = hooks; ctx->childproc_user = user; - switch (ctx->childproc_hooks->chldowner) { - case libxl_sigchld_owner_mainloop: - case libxl_sigchld_owner_libxl: - libxl__sigchld_removehandler(gc); - break; - case libxl_sigchld_owner_libxl_always: - libxl__sigchld_installhandler(gc); - break; - default: - abort(); - } + perhaps_removehandler(gc); + perhaps_installhandler(gc, 0); /* idempotent, ok to ignore errors for now */ CTX_UNLOCK; GC_FREE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySe-0001Bj-Dw; Fri, 22 Nov 2013 21:40:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySc-0001BK-JX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:22 +0000 Received: from [193.109.254.147:9946] by server-11.bemta-14.messagelabs.com id DD/CB-08419-54FCF825; Fri, 22 Nov 2013 21:40:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156419!212656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26433 invoked from network); 22 Nov 2013 21:40:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySZ-0004KE-IO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySZ-0004UE-DV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:19 +0000 Date: Fri, 22 Nov 2013 21:40:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: properly register the SIGCHLD self-pipe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5b94170fddd1644edfd6ebd9f4a312e0e416883 Author: Ian Jackson AuthorDate: Tue Nov 5 17:32:06 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: properly register the SIGCHLD self-pipe An application which uses libxl_osevent_register_hooks, and doesn't use libxl_sigchld_owner_mainloop, would never properly experience the deaths of its (libxl) children. This is because the SIGCHLD self pipe would be handled using ad-hoc code in beforepoll_internal and afterpoll_internal. However, this is no good if application is using the fd registration system instead; in that case these functions would not be called and nothing would deal with readability of the self pipe. Fix this as follows: The SIGCHLD self pipe now is now dealt with by a standard libxl__ev_fd handler, which is registered and deregistered along with the SIGCHLD handler itself. The handler function subsumes the ad-hoc response code removed from beforepoll_internal, and the functionality of libxl__fork_selfpipe_woken. This is also tidier as the SIGCHLD self pipe is no longer touched outside libxl_fork.c other than in ctx initialisation and teardown. (The ad-hoc arrangements for poller->wakeup_pipe in beforepoll_internal and afterpoll_internal are OK because the libxl__poller mechanism exists to wake up threads which are sitting inside libxl's poll loop, so is not applicable to the application's event loop.) Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Cc: Ian Campbell Cc: Jim Fehlig --- tools/libxl/libxl.c | 2 + tools/libxl/libxl_event.c | 12 ---------- tools/libxl/libxl_fork.c | 50 ++++++++++++++++++++++++++++++++--------- tools/libxl/libxl_internal.h | 3 +- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b72e3a7..9b93262 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -64,6 +64,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->childproc_user = 0; ctx->sigchld_selfpipe[0] = -1; + libxl__ev_fd_init(&ctx->sigchld_selfpipe_efd); /* The mutex is special because we can't idempotently destroy it */ @@ -139,6 +140,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); + libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); /* Now there should be no more events requested from the application: */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 54d15db..bdef7ac 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -774,10 +774,6 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, \ REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, BODY); \ \ - int selfpipe = libxl__fork_selfpipe_active(CTX); \ - if (selfpipe >= 0) \ - REQUIRE_FD(selfpipe, POLLIN, BODY); \ - \ }while(0) #define REQUIRE_FD(req_fd_, req_events_, BODY) do{ \ @@ -999,14 +995,6 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, if (e) LIBXL__EVENT_DISASTER(egc, "read wakeup", e, 0); } - int selfpipe = libxl__fork_selfpipe_active(CTX); - if (selfpipe >= 0 && - afterpoll_check_fd(poller,fds,nfds, selfpipe, POLLIN)) { - int e = libxl__self_pipe_eatall(selfpipe); - if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); - libxl__fork_selfpipe_woken(egc); - } - for (;;) { libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (!etime) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index a581763..4ae9f94 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -155,6 +155,9 @@ int libxl__carefd_fd(const libxl__carefd *cf) * Actual child process handling */ +static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); + static void sigchld_handler(int signo) { int esave = errno; @@ -177,10 +180,18 @@ static void sigchld_removehandler_core(void) void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ { + int rc; + atfork_lock(); if (sigchld_owner == CTX) sigchld_removehandler_core(); atfork_unlock(); + + if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { + rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); + if (rc) + libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); + } } int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ @@ -197,6 +208,15 @@ int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ goto out; } } + if (!libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->sigchld_selfpipe_efd, + sigchld_selfpipe_handler, + CTX->sigchld_selfpipe[0], POLLIN); + if (rc) goto out; + } else { + rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, POLLIN); + if (rc) goto out; + } atfork_lock(); if (sigchld_owner != CTX) { @@ -237,15 +257,6 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) abort(); } -int libxl__fork_selfpipe_active(libxl_ctx *ctx) -{ - /* Returns the fd to read, or -1 */ - if (!chldmode_ours(ctx, 0)) - return -1; - - return ctx->sigchld_selfpipe[0]; -} - static void perhaps_removehandler(libxl__gc *gc) { if (!chldmode_ours(CTX, 0)) @@ -295,12 +306,29 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) return rc; } -void libxl__fork_selfpipe_woken(libxl__egc *egc) +static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { /* May make callbacks into the application for child processes. - * ctx must be locked EXACTLY ONCE */ + * So, this function may unlock and relock the CTX. This is OK + * because event callback functions are always called with the CTX + * locked exactly once, and from code which copes with reentrancy. + * (See also the comment in afterpoll_internal.) */ EGC_GC; + int selfpipe = CTX->sigchld_selfpipe[0]; + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event 0x%x on SIGCHLD self pipe", revents); + LIBXL__EVENT_DISASTER(egc, + "unexpected poll event on SIGCHLD self pipe", + 0, 0); + } + assert(revents & POLLIN); + + int e = libxl__self_pipe_eatall(selfpipe); + if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = waitpid(-1, &status, WNOHANG); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7310dc9..a2d8247 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -353,6 +353,7 @@ struct libxl__ctx { const libxl_childproc_hooks *childproc_hooks; void *childproc_user; int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ + libxl__ev_fd sigchld_selfpipe_efd; LIBXL_LIST_HEAD(, libxl__ev_child) children; libxl_version_info version_info; @@ -839,8 +840,6 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); extern const libxl_childproc_hooks libxl__childproc_default_hooks; int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ -int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ -void libxl__fork_selfpipe_woken(libxl__egc *egc); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySe-0001Bj-Dw; Fri, 22 Nov 2013 21:40:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySc-0001BK-JX for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:22 +0000 Received: from [193.109.254.147:9946] by server-11.bemta-14.messagelabs.com id DD/CB-08419-54FCF825; Fri, 22 Nov 2013 21:40:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385156419!212656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26433 invoked from network); 22 Nov 2013 21:40:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Nov 2013 21:40:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySZ-0004KE-IO for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySZ-0004UE-DV for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:19 +0000 Date: Fri, 22 Nov 2013 21:40:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: event system: properly register the SIGCHLD self-pipe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5b94170fddd1644edfd6ebd9f4a312e0e416883 Author: Ian Jackson AuthorDate: Tue Nov 5 17:32:06 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:47:24 2013 +0000 libxl: event system: properly register the SIGCHLD self-pipe An application which uses libxl_osevent_register_hooks, and doesn't use libxl_sigchld_owner_mainloop, would never properly experience the deaths of its (libxl) children. This is because the SIGCHLD self pipe would be handled using ad-hoc code in beforepoll_internal and afterpoll_internal. However, this is no good if application is using the fd registration system instead; in that case these functions would not be called and nothing would deal with readability of the self pipe. Fix this as follows: The SIGCHLD self pipe now is now dealt with by a standard libxl__ev_fd handler, which is registered and deregistered along with the SIGCHLD handler itself. The handler function subsumes the ad-hoc response code removed from beforepoll_internal, and the functionality of libxl__fork_selfpipe_woken. This is also tidier as the SIGCHLD self pipe is no longer touched outside libxl_fork.c other than in ctx initialisation and teardown. (The ad-hoc arrangements for poller->wakeup_pipe in beforepoll_internal and afterpoll_internal are OK because the libxl__poller mechanism exists to wake up threads which are sitting inside libxl's poll loop, so is not applicable to the application's event loop.) Reported-by: Bamvor Jian Zhang Signed-off-by: Ian Jackson Cc: Bamvor Jian Zhang Cc: Ian Campbell Cc: Jim Fehlig --- tools/libxl/libxl.c | 2 + tools/libxl/libxl_event.c | 12 ---------- tools/libxl/libxl_fork.c | 50 ++++++++++++++++++++++++++++++++--------- tools/libxl/libxl_internal.h | 3 +- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b72e3a7..9b93262 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -64,6 +64,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->childproc_user = 0; ctx->sigchld_selfpipe[0] = -1; + libxl__ev_fd_init(&ctx->sigchld_selfpipe_efd); /* The mutex is special because we can't idempotently destroy it */ @@ -139,6 +140,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); libxl__ev_fd_deregister(gc, &ctx->watch_efd); + libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); /* Now there should be no more events requested from the application: */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 54d15db..bdef7ac 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -774,10 +774,6 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, \ REQUIRE_FD(poller->wakeup_pipe[0], POLLIN, BODY); \ \ - int selfpipe = libxl__fork_selfpipe_active(CTX); \ - if (selfpipe >= 0) \ - REQUIRE_FD(selfpipe, POLLIN, BODY); \ - \ }while(0) #define REQUIRE_FD(req_fd_, req_events_, BODY) do{ \ @@ -999,14 +995,6 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, if (e) LIBXL__EVENT_DISASTER(egc, "read wakeup", e, 0); } - int selfpipe = libxl__fork_selfpipe_active(CTX); - if (selfpipe >= 0 && - afterpoll_check_fd(poller,fds,nfds, selfpipe, POLLIN)) { - int e = libxl__self_pipe_eatall(selfpipe); - if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); - libxl__fork_selfpipe_woken(egc); - } - for (;;) { libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (!etime) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index a581763..4ae9f94 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -155,6 +155,9 @@ int libxl__carefd_fd(const libxl__carefd *cf) * Actual child process handling */ +static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents); + static void sigchld_handler(int signo) { int esave = errno; @@ -177,10 +180,18 @@ static void sigchld_removehandler_core(void) void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ { + int rc; + atfork_lock(); if (sigchld_owner == CTX) sigchld_removehandler_core(); atfork_unlock(); + + if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { + rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); + if (rc) + libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); + } } int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ @@ -197,6 +208,15 @@ int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ goto out; } } + if (!libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->sigchld_selfpipe_efd, + sigchld_selfpipe_handler, + CTX->sigchld_selfpipe[0], POLLIN); + if (rc) goto out; + } else { + rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, POLLIN); + if (rc) goto out; + } atfork_lock(); if (sigchld_owner != CTX) { @@ -237,15 +257,6 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) abort(); } -int libxl__fork_selfpipe_active(libxl_ctx *ctx) -{ - /* Returns the fd to read, or -1 */ - if (!chldmode_ours(ctx, 0)) - return -1; - - return ctx->sigchld_selfpipe[0]; -} - static void perhaps_removehandler(libxl__gc *gc) { if (!chldmode_ours(CTX, 0)) @@ -295,12 +306,29 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) return rc; } -void libxl__fork_selfpipe_woken(libxl__egc *egc) +static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, + int fd, short events, short revents) { /* May make callbacks into the application for child processes. - * ctx must be locked EXACTLY ONCE */ + * So, this function may unlock and relock the CTX. This is OK + * because event callback functions are always called with the CTX + * locked exactly once, and from code which copes with reentrancy. + * (See also the comment in afterpoll_internal.) */ EGC_GC; + int selfpipe = CTX->sigchld_selfpipe[0]; + + if (revents & ~POLLIN) { + LOG(ERROR, "unexpected poll event 0x%x on SIGCHLD self pipe", revents); + LIBXL__EVENT_DISASTER(egc, + "unexpected poll event on SIGCHLD self pipe", + 0, 0); + } + assert(revents & POLLIN); + + int e = libxl__self_pipe_eatall(selfpipe); + if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = waitpid(-1, &status, WNOHANG); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7310dc9..a2d8247 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -353,6 +353,7 @@ struct libxl__ctx { const libxl_childproc_hooks *childproc_hooks; void *childproc_user; int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ + libxl__ev_fd sigchld_selfpipe_efd; LIBXL_LIST_HEAD(, libxl__ev_child) children; libxl_version_info version_info; @@ -839,8 +840,6 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); extern const libxl_childproc_hooks libxl__childproc_default_hooks; int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ -int libxl__fork_selfpipe_active(libxl_ctx *ctx); /* returns read fd or -1 */ -void libxl__fork_selfpipe_woken(libxl__egc *egc); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySn-0001EB-H6; Fri, 22 Nov 2013 21:40:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySm-0001Dp-AD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:32 +0000 Received: from [85.158.143.35:22697] by server-3.bemta-4.messagelabs.com id D2/4E-32360-F4FCF825; Fri, 22 Nov 2013 21:40:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385156429!516048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29619 invoked from network); 22 Nov 2013 21:40:30 -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; 22 Nov 2013 21:40:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySj-0004KM-OP for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySj-0004Ue-M6 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:29 +0000 Date: Fri, 22 Nov 2013 21:40:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .gitignore: Ignore tools/ocaml/libs/xentoollog/ build outputs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b18e2d96e785e7088f3b137e800f987bbe8c7657 Author: Ian Jackson AuthorDate: Thu Nov 21 18:59:22 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:59:22 2013 +0000 .gitignore: Ignore tools/ocaml/libs/xentoollog/ build outputs Signed-off-by: Ian Jackson --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3253675..f88e431 100644 --- a/.gitignore +++ b/.gitignore @@ -383,6 +383,9 @@ tools/ocaml/libs/xl/_libxl_types.ml.in tools/ocaml/libs/xl/_libxl_types.mli.in tools/ocaml/libs/xl/xenlight.ml tools/ocaml/libs/xl/xenlight.mli +tools/ocaml/libs/xentoollog/_xtl_levels.* +tools/ocaml/libs/xentoollog/xentoollog.ml +tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/xenstored/oxenstored tools/debugger/kdd/kdd -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 22 21:40:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Nov 2013 21:40: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 1VjySn-0001EB-H6; Fri, 22 Nov 2013 21:40:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySm-0001Dp-AD for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:32 +0000 Received: from [85.158.143.35:22697] by server-3.bemta-4.messagelabs.com id D2/4E-32360-F4FCF825; Fri, 22 Nov 2013 21:40:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385156429!516048!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29619 invoked from network); 22 Nov 2013 21:40:30 -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; 22 Nov 2013 21:40:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VjySj-0004KM-OP for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VjySj-0004Ue-M6 for xen-changelog@lists.xensource.com; Fri, 22 Nov 2013 21:40:29 +0000 Date: Fri, 22 Nov 2013 21:40:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] .gitignore: Ignore tools/ocaml/libs/xentoollog/ build outputs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b18e2d96e785e7088f3b137e800f987bbe8c7657 Author: Ian Jackson AuthorDate: Thu Nov 21 18:59:22 2013 +0000 Commit: Ian Jackson CommitDate: Thu Nov 21 18:59:22 2013 +0000 .gitignore: Ignore tools/ocaml/libs/xentoollog/ build outputs Signed-off-by: Ian Jackson --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3253675..f88e431 100644 --- a/.gitignore +++ b/.gitignore @@ -383,6 +383,9 @@ tools/ocaml/libs/xl/_libxl_types.ml.in tools/ocaml/libs/xl/_libxl_types.mli.in tools/ocaml/libs/xl/xenlight.ml tools/ocaml/libs/xl/xenlight.mli +tools/ocaml/libs/xentoollog/_xtl_levels.* +tools/ocaml/libs/xentoollog/xentoollog.ml +tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/xenstored/oxenstored tools/debugger/kdd/kdd -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3y0-0000Lb-2M; Sat, 23 Nov 2013 03: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 1Vk3xy-0000LR-PE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:07 +0000 Received: from [85.158.137.68:6880] by server-6.bemta-3.messagelabs.com id 5E/B8-04868-1F120925; Sat, 23 Nov 2013 03:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385177584!3311299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_32,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24279 invoked from network); 23 Nov 2013 03:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3xv-0006on-Rl for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3xv-0006sd-Dc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:03 +0000 Date: Sat, 23 Nov 2013 03:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "qga: set umask 0077 when daemonizing (CVE-2013-2007)" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc8500fb733093a46bbec0ac33ddea63d509c7a9 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:27 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:27 2013 +0100 Revert "qga: set umask 0077 when daemonizing (CVE-2013-2007)" This reverts commit 8a4bd762aa01b21c43aa24c5b743f4bd7c9db3e3. --- qemu-ga.c | 2 +- qga/commands-posix.c | 119 +------------------------------------------------ 2 files changed, 4 insertions(+), 117 deletions(-) diff --git a/qemu-ga.c b/qemu-ga.c index 8764cf9..9b59a52 100644 --- a/qemu-ga.c +++ b/qemu-ga.c @@ -421,7 +421,7 @@ static void become_daemon(const char *pidfile) } } - umask(S_IRWXG | S_IRWXO); + umask(0); sid = setsid(); if (sid < 0) { goto fail; diff --git a/qga/commands-posix.c b/qga/commands-posix.c index fbb5234..726930a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -125,122 +125,9 @@ static GuestFileHandle *guest_file_handle_find(int64_t id) return NULL; } -typedef const char * const ccpc; - -/* http://pubs.opengroup.org/onlinepubs/9699919799/functions/fopen.html */ -static const struct { - ccpc *forms; - int oflag_base; -} guest_file_open_modes[] = { - { (ccpc[]){ "r", "rb", NULL }, O_RDONLY }, - { (ccpc[]){ "w", "wb", NULL }, O_WRONLY | O_CREAT | O_TRUNC }, - { (ccpc[]){ "a", "ab", NULL }, O_WRONLY | O_CREAT | O_APPEND }, - { (ccpc[]){ "r+", "rb+", "r+b", NULL }, O_RDWR }, - { (ccpc[]){ "w+", "wb+", "w+b", NULL }, O_RDWR | O_CREAT | O_TRUNC }, - { (ccpc[]){ "a+", "ab+", "a+b", NULL }, O_RDWR | O_CREAT | O_APPEND } -}; - -static int -find_open_flag(const char *mode_str, Error **err) -{ - unsigned mode; - - for (mode = 0; mode < ARRAY_SIZE(guest_file_open_modes); ++mode) { - ccpc *form; - - form = guest_file_open_modes[mode].forms; - while (*form != NULL && strcmp(*form, mode_str) != 0) { - ++form; - } - if (*form != NULL) { - break; - } - } - - if (mode == ARRAY_SIZE(guest_file_open_modes)) { - error_setg(err, "invalid file open mode '%s'", mode_str); - return -1; - } - return guest_file_open_modes[mode].oflag_base | O_NOCTTY | O_NONBLOCK; -} - -#define DEFAULT_NEW_FILE_MODE (S_IRUSR | S_IWUSR | \ - S_IRGRP | S_IWGRP | \ - S_IROTH | S_IWOTH) - -static FILE * -safe_open_or_create(const char *path, const char *mode, Error **err) -{ - Error *local_err = NULL; - int oflag; - - oflag = find_open_flag(mode, &local_err); - if (local_err == NULL) { - int fd; - - /* If the caller wants / allows creation of a new file, we implement it - * with a two step process: open() + (open() / fchmod()). - * - * First we insist on creating the file exclusively as a new file. If - * that succeeds, we're free to set any file-mode bits on it. (The - * motivation is that we want to set those file-mode bits independently - * of the current umask.) - * - * If the exclusive creation fails because the file already exists - * (EEXIST is not possible for any other reason), we just attempt to - * open the file, but in this case we won't be allowed to change the - * file-mode bits on the preexistent file. - * - * The pathname should never disappear between the two open()s in - * practice. If it happens, then someone very likely tried to race us. - * In this case just go ahead and report the ENOENT from the second - * open() to the caller. - * - * If the caller wants to open a preexistent file, then the first - * open() is decisive and its third argument is ignored, and the second - * open() and the fchmod() are never called. - */ - fd = open(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0); - if (fd == -1 && errno == EEXIST) { - oflag &= ~(unsigned)O_CREAT; - fd = open(path, oflag); - } - - if (fd == -1) { - error_setg_errno(&local_err, errno, "failed to open file '%s' " - "(mode: '%s')", path, mode); - } else { - qemu_set_cloexec(fd); - - if ((oflag & O_CREAT) && fchmod(fd, DEFAULT_NEW_FILE_MODE) == -1) { - error_setg_errno(&local_err, errno, "failed to set permission " - "0%03o on new file '%s' (mode: '%s')", - (unsigned)DEFAULT_NEW_FILE_MODE, path, mode); - } else { - FILE *f; - - f = fdopen(fd, mode); - if (f == NULL) { - error_setg_errno(&local_err, errno, "failed to associate " - "stdio stream with file descriptor %d, " - "file '%s' (mode: '%s')", fd, path, mode); - } else { - return f; - } - } - - close(fd); - } - } - - error_propagate(err, local_err); - return NULL; -} - int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **err) { FILE *fh; - Error *local_err = NULL; int fd; int64_t ret = -1; @@ -248,9 +135,9 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E mode = "r"; } slog("guest-file-open called, filepath: %s, mode: %s", path, mode); - fh = safe_open_or_create(path, mode, &local_err); - if (local_err != NULL) { - error_propagate(err, local_err); + fh = fopen(path, mode); + if (!fh) { + error_set(err, QERR_OPEN_FILE_FAILED, path); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3y0-0000Lb-2M; Sat, 23 Nov 2013 03: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 1Vk3xy-0000LR-PE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:07 +0000 Received: from [85.158.137.68:6880] by server-6.bemta-3.messagelabs.com id 5E/B8-04868-1F120925; Sat, 23 Nov 2013 03:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385177584!3311299!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_32,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24279 invoked from network); 23 Nov 2013 03:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3xv-0006on-Rl for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3xv-0006sd-Dc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:03 +0000 Date: Sat, 23 Nov 2013 03:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "qga: set umask 0077 when daemonizing (CVE-2013-2007)" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc8500fb733093a46bbec0ac33ddea63d509c7a9 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:27 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:27 2013 +0100 Revert "qga: set umask 0077 when daemonizing (CVE-2013-2007)" This reverts commit 8a4bd762aa01b21c43aa24c5b743f4bd7c9db3e3. --- qemu-ga.c | 2 +- qga/commands-posix.c | 119 +------------------------------------------------ 2 files changed, 4 insertions(+), 117 deletions(-) diff --git a/qemu-ga.c b/qemu-ga.c index 8764cf9..9b59a52 100644 --- a/qemu-ga.c +++ b/qemu-ga.c @@ -421,7 +421,7 @@ static void become_daemon(const char *pidfile) } } - umask(S_IRWXG | S_IRWXO); + umask(0); sid = setsid(); if (sid < 0) { goto fail; diff --git a/qga/commands-posix.c b/qga/commands-posix.c index fbb5234..726930a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -125,122 +125,9 @@ static GuestFileHandle *guest_file_handle_find(int64_t id) return NULL; } -typedef const char * const ccpc; - -/* http://pubs.opengroup.org/onlinepubs/9699919799/functions/fopen.html */ -static const struct { - ccpc *forms; - int oflag_base; -} guest_file_open_modes[] = { - { (ccpc[]){ "r", "rb", NULL }, O_RDONLY }, - { (ccpc[]){ "w", "wb", NULL }, O_WRONLY | O_CREAT | O_TRUNC }, - { (ccpc[]){ "a", "ab", NULL }, O_WRONLY | O_CREAT | O_APPEND }, - { (ccpc[]){ "r+", "rb+", "r+b", NULL }, O_RDWR }, - { (ccpc[]){ "w+", "wb+", "w+b", NULL }, O_RDWR | O_CREAT | O_TRUNC }, - { (ccpc[]){ "a+", "ab+", "a+b", NULL }, O_RDWR | O_CREAT | O_APPEND } -}; - -static int -find_open_flag(const char *mode_str, Error **err) -{ - unsigned mode; - - for (mode = 0; mode < ARRAY_SIZE(guest_file_open_modes); ++mode) { - ccpc *form; - - form = guest_file_open_modes[mode].forms; - while (*form != NULL && strcmp(*form, mode_str) != 0) { - ++form; - } - if (*form != NULL) { - break; - } - } - - if (mode == ARRAY_SIZE(guest_file_open_modes)) { - error_setg(err, "invalid file open mode '%s'", mode_str); - return -1; - } - return guest_file_open_modes[mode].oflag_base | O_NOCTTY | O_NONBLOCK; -} - -#define DEFAULT_NEW_FILE_MODE (S_IRUSR | S_IWUSR | \ - S_IRGRP | S_IWGRP | \ - S_IROTH | S_IWOTH) - -static FILE * -safe_open_or_create(const char *path, const char *mode, Error **err) -{ - Error *local_err = NULL; - int oflag; - - oflag = find_open_flag(mode, &local_err); - if (local_err == NULL) { - int fd; - - /* If the caller wants / allows creation of a new file, we implement it - * with a two step process: open() + (open() / fchmod()). - * - * First we insist on creating the file exclusively as a new file. If - * that succeeds, we're free to set any file-mode bits on it. (The - * motivation is that we want to set those file-mode bits independently - * of the current umask.) - * - * If the exclusive creation fails because the file already exists - * (EEXIST is not possible for any other reason), we just attempt to - * open the file, but in this case we won't be allowed to change the - * file-mode bits on the preexistent file. - * - * The pathname should never disappear between the two open()s in - * practice. If it happens, then someone very likely tried to race us. - * In this case just go ahead and report the ENOENT from the second - * open() to the caller. - * - * If the caller wants to open a preexistent file, then the first - * open() is decisive and its third argument is ignored, and the second - * open() and the fchmod() are never called. - */ - fd = open(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0); - if (fd == -1 && errno == EEXIST) { - oflag &= ~(unsigned)O_CREAT; - fd = open(path, oflag); - } - - if (fd == -1) { - error_setg_errno(&local_err, errno, "failed to open file '%s' " - "(mode: '%s')", path, mode); - } else { - qemu_set_cloexec(fd); - - if ((oflag & O_CREAT) && fchmod(fd, DEFAULT_NEW_FILE_MODE) == -1) { - error_setg_errno(&local_err, errno, "failed to set permission " - "0%03o on new file '%s' (mode: '%s')", - (unsigned)DEFAULT_NEW_FILE_MODE, path, mode); - } else { - FILE *f; - - f = fdopen(fd, mode); - if (f == NULL) { - error_setg_errno(&local_err, errno, "failed to associate " - "stdio stream with file descriptor %d, " - "file '%s' (mode: '%s')", fd, path, mode); - } else { - return f; - } - } - - close(fd); - } - } - - error_propagate(err, local_err); - return NULL; -} - int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **err) { FILE *fh; - Error *local_err = NULL; int fd; int64_t ret = -1; @@ -248,9 +135,9 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E mode = "r"; } slog("guest-file-open called, filepath: %s, mode: %s", path, mode); - fh = safe_open_or_create(path, mode, &local_err); - if (local_err != NULL) { - error_propagate(err, local_err); + fh = fopen(path, mode); + if (!fh) { + error_set(err, QERR_OPEN_FILE_FAILED, path); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yA-0000ME-5C; Sat, 23 Nov 2013 03: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 1Vk3y8-0000M4-Qr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:17 +0000 Received: from [85.158.143.35:2608] by server-1.bemta-4.messagelabs.com id F5/87-02132-CF120925; Sat, 23 Nov 2013 03:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385177594!551974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18835 invoked from network); 23 Nov 2013 03:33: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; 23 Nov 2013 03:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3y6-0006oq-6p for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3y5-0006t1-WB for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:14 +0000 Date: Sat, 23 Nov 2013 03:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "xen: Fix vcpus initialisation." X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e310e13c93c48a0f5fc8558d56830d58713202a Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:29 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:29 2013 +0100 Revert "xen: Fix vcpus initialisation." This reverts commit f573cdfa7afa92ebb66b2ba066b4f08bd22fc84b. --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index 15be8ed..daf43b9 100644 --- a/xen-all.c +++ b/xen-all.c @@ -632,13 +632,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < max_cpus; i++) { + for (i = 0; i < smp_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == max_cpus) { + if (i == smp_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1123,10 +1123,10 @@ int xen_hvm_init(void) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < max_cpus; i++) { + for (i = 0; i < smp_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yA-0000ME-5C; Sat, 23 Nov 2013 03: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 1Vk3y8-0000M4-Qr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:17 +0000 Received: from [85.158.143.35:2608] by server-1.bemta-4.messagelabs.com id F5/87-02132-CF120925; Sat, 23 Nov 2013 03:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385177594!551974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18835 invoked from network); 23 Nov 2013 03:33: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; 23 Nov 2013 03:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3y6-0006oq-6p for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3y5-0006t1-WB for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:14 +0000 Date: Sat, 23 Nov 2013 03:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "xen: Fix vcpus initialisation." X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e310e13c93c48a0f5fc8558d56830d58713202a Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:29 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:29 2013 +0100 Revert "xen: Fix vcpus initialisation." This reverts commit f573cdfa7afa92ebb66b2ba066b4f08bd22fc84b. --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index 15be8ed..daf43b9 100644 --- a/xen-all.c +++ b/xen-all.c @@ -632,13 +632,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < max_cpus; i++) { + for (i = 0; i < smp_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == max_cpus) { + if (i == smp_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1123,10 +1123,10 @@ int xen_hvm_init(void) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < max_cpus; i++) { + for (i = 0; i < smp_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33: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 1Vk3yM-0000Ng-A3; Sat, 23 Nov 2013 03:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yK-0000NW-Ki for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:28 +0000 Received: from [85.158.139.211:46671] by server-1.bemta-5.messagelabs.com id B1/C5-21065-70220925; Sat, 23 Nov 2013 03:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1385177604!1852245!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32010 invoked from network); 23 Nov 2013 03:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yG-0006oz-CW for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3yG-0006tN-AV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:24 +0000 Date: Sat, 23 Nov 2013 03:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "cpu: Add qemu_for_each_cpu()" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88f78193a97df8512c6392777cfcd979f095d483 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:29 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:29 2013 +0100 Revert "cpu: Add qemu_for_each_cpu()" This reverts commit 0170b3ce88cb87346afa369a89ce9b197389058b. --- exec.c | 10 ---------- include/qemu/cpu.h | 9 --------- 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/exec.c b/exec.c index 9fb6927..8435de0 100644 --- a/exec.c +++ b/exec.c @@ -692,16 +692,6 @@ CPUArchState *qemu_get_cpu(int cpu) return env; } -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *data) -{ - CPUArchState *env = first_cpu; - - while (env) { - func(ENV_GET_CPU(env), data); - env = env->next_cpu; - } -} - void cpu_exec_init(CPUArchState *env) { #ifndef CONFIG_USER_ONLY diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 23b8b6f..8d2e0cb 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -138,14 +138,5 @@ bool cpu_is_stopped(CPUState *cpu); */ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); -/** - * qemu_for_each_cpu: - * @func: The function to be executed. - * @data: Data to pass to the function. - * - * Executes @func for each CPU. - */ -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *data); - #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33: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 1Vk3yM-0000Ng-A3; Sat, 23 Nov 2013 03:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yK-0000NW-Ki for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:28 +0000 Received: from [85.158.139.211:46671] by server-1.bemta-5.messagelabs.com id B1/C5-21065-70220925; Sat, 23 Nov 2013 03:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1385177604!1852245!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32010 invoked from network); 23 Nov 2013 03:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yG-0006oz-CW for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3yG-0006tN-AV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:24 +0000 Date: Sat, 23 Nov 2013 03:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "cpu: Add qemu_for_each_cpu()" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88f78193a97df8512c6392777cfcd979f095d483 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:29 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:29 2013 +0100 Revert "cpu: Add qemu_for_each_cpu()" This reverts commit 0170b3ce88cb87346afa369a89ce9b197389058b. --- exec.c | 10 ---------- include/qemu/cpu.h | 9 --------- 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/exec.c b/exec.c index 9fb6927..8435de0 100644 --- a/exec.c +++ b/exec.c @@ -692,16 +692,6 @@ CPUArchState *qemu_get_cpu(int cpu) return env; } -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *data) -{ - CPUArchState *env = first_cpu; - - while (env) { - func(ENV_GET_CPU(env), data); - env = env->next_cpu; - } -} - void cpu_exec_init(CPUArchState *env) { #ifndef CONFIG_USER_ONLY diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 23b8b6f..8d2e0cb 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -138,14 +138,5 @@ bool cpu_is_stopped(CPUState *cpu); */ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); -/** - * qemu_for_each_cpu: - * @func: The function to be executed. - * @data: Data to pass to the function. - * - * Executes @func for each CPU. - */ -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *data); - #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yU-0000Ot-Co; Sat, 23 Nov 2013 03:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yT-0000Of-0y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:37 +0000 Received: from [85.158.143.35:3009] by server-2.bemta-4.messagelabs.com id 00/7D-11386-01220925; Sat, 23 Nov 2013 03:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385177614!551997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19972 invoked from network); 23 Nov 2013 03:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yQ-0006p7-KI for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3yQ-0006tn-HZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:34 +0000 Date: Sat, 23 Nov 2013 03:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "cpu: Introduce get_arch_id() method and override it for X86CPU" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aad0677c3aae5ab84852210ff48361924bd7aa2d Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:30 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:30 2013 +0100 Revert "cpu: Introduce get_arch_id() method and override it for X86CPU" This reverts commit e48f3af500a229bf9bf63fbe02ca6ef35abc2820. --- include/qemu/cpu.h | 2 -- qom/cpu.c | 8 -------- target-i386/cpu.c | 10 ---------- 3 files changed, 0 insertions(+), 20 deletions(-) diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 8d2e0cb..61b7698 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -41,7 +41,6 @@ typedef struct CPUState CPUState; /** * CPUClass: * @reset: Callback to reset the #CPUState to its initial state. - * @get_arch_id: Callback for getting architecture-dependent CPU ID. * * Represents a CPU family or model. */ @@ -51,7 +50,6 @@ typedef struct CPUClass { /*< public >*/ void (*reset)(CPUState *cpu); - int64_t (*get_arch_id)(CPUState *cpu); } CPUClass; /** diff --git a/qom/cpu.c b/qom/cpu.c index dfd14c8..5b36046 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -34,19 +34,11 @@ static void cpu_common_reset(CPUState *cpu) { } -static int64_t cpu_common_get_arch_id(CPUState *cpu) -{ - /* Not used in Xen, so no backport. - * There is a missing cpu_index field in CPUState. */ - abort(); -} - static void cpu_class_init(ObjectClass *klass, void *data) { CPUClass *k = CPU_CLASS(klass); k->reset = cpu_common_reset; - k->get_arch_id = cpu_common_get_arch_id; } static TypeInfo cpu_type_info = { diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e055d69..c6c2ca0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2111,14 +2111,6 @@ static void x86_cpu_initfn(Object *obj) } } -static int64_t x86_cpu_get_arch_id(CPUState *cs) -{ - X86CPU *cpu = X86_CPU(cs); - CPUX86State *env = &cpu->env; - - return env->cpuid_apic_id; -} - static void x86_cpu_common_class_init(ObjectClass *oc, void *data) { X86CPUClass *xcc = X86_CPU_CLASS(oc); @@ -2126,8 +2118,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset; - - cc->get_arch_id = x86_cpu_get_arch_id; } static const TypeInfo x86_cpu_type_info = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yU-0000Ot-Co; Sat, 23 Nov 2013 03:33:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yT-0000Of-0y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:37 +0000 Received: from [85.158.143.35:3009] by server-2.bemta-4.messagelabs.com id 00/7D-11386-01220925; Sat, 23 Nov 2013 03:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1385177614!551997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19972 invoked from network); 23 Nov 2013 03:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yQ-0006p7-KI for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3yQ-0006tn-HZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:34 +0000 Date: Sat, 23 Nov 2013 03:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "cpu: Introduce get_arch_id() method and override it for X86CPU" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aad0677c3aae5ab84852210ff48361924bd7aa2d Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:30 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:30 2013 +0100 Revert "cpu: Introduce get_arch_id() method and override it for X86CPU" This reverts commit e48f3af500a229bf9bf63fbe02ca6ef35abc2820. --- include/qemu/cpu.h | 2 -- qom/cpu.c | 8 -------- target-i386/cpu.c | 10 ---------- 3 files changed, 0 insertions(+), 20 deletions(-) diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h index 8d2e0cb..61b7698 100644 --- a/include/qemu/cpu.h +++ b/include/qemu/cpu.h @@ -41,7 +41,6 @@ typedef struct CPUState CPUState; /** * CPUClass: * @reset: Callback to reset the #CPUState to its initial state. - * @get_arch_id: Callback for getting architecture-dependent CPU ID. * * Represents a CPU family or model. */ @@ -51,7 +50,6 @@ typedef struct CPUClass { /*< public >*/ void (*reset)(CPUState *cpu); - int64_t (*get_arch_id)(CPUState *cpu); } CPUClass; /** diff --git a/qom/cpu.c b/qom/cpu.c index dfd14c8..5b36046 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -34,19 +34,11 @@ static void cpu_common_reset(CPUState *cpu) { } -static int64_t cpu_common_get_arch_id(CPUState *cpu) -{ - /* Not used in Xen, so no backport. - * There is a missing cpu_index field in CPUState. */ - abort(); -} - static void cpu_class_init(ObjectClass *klass, void *data) { CPUClass *k = CPU_CLASS(klass); k->reset = cpu_common_reset; - k->get_arch_id = cpu_common_get_arch_id; } static TypeInfo cpu_type_info = { diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e055d69..c6c2ca0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2111,14 +2111,6 @@ static void x86_cpu_initfn(Object *obj) } } -static int64_t x86_cpu_get_arch_id(CPUState *cs) -{ - X86CPU *cpu = X86_CPU(cs); - CPUX86State *env = &cpu->env; - - return env->cpuid_apic_id; -} - static void x86_cpu_common_class_init(ObjectClass *oc, void *data) { X86CPUClass *xcc = X86_CPU_CLASS(oc); @@ -2126,8 +2118,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset; - - cc->get_arch_id = x86_cpu_get_arch_id; } static const TypeInfo x86_cpu_type_info = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3ye-0000QG-Fb; Sat, 23 Nov 2013 03:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yd-0000Q7-Gu for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:47 +0000 Received: from [85.158.137.68:7616] by server-12.bemta-3.messagelabs.com id 2F/41-20055-A1220925; Sat, 23 Nov 2013 03:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385177625!3292009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2165 invoked from network); 23 Nov 2013 03:33:46 -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; 23 Nov 2013 03:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3ya-0006pD-R4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3ya-0006uf-NE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:44 +0000 Date: Sat, 23 Nov 2013 03:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "Fix semaphores fallback 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 dfe0055e38e3e328f19d4d67f0f4ae049436d3c8 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:31 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:31 2013 +0100 Revert "Fix semaphores fallback code" This reverts commit 0a7ad69a0f012d5d70142f775f99405500d4d38e. --- qemu-thread-posix.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c index e24e2ae..6d95bac 100644 --- a/qemu-thread-posix.c +++ b/qemu-thread-posix.c @@ -213,7 +213,6 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms) while (sem->count < 0) { rc = pthread_cond_timedwait(&sem->cond, &sem->lock, &ts); if (rc == ETIMEDOUT) { - ++sem->count; break; } if (rc != 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:33:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3ye-0000QG-Fb; Sat, 23 Nov 2013 03:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3yd-0000Q7-Gu for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:47 +0000 Received: from [85.158.137.68:7616] by server-12.bemta-3.messagelabs.com id 2F/41-20055-A1220925; Sat, 23 Nov 2013 03:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385177625!3292009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2165 invoked from network); 23 Nov 2013 03:33:46 -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; 23 Nov 2013 03:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk3ya-0006pD-R4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk3ya-0006uf-NE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:33:44 +0000 Date: Sat, 23 Nov 2013 03:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "Fix semaphores fallback 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 dfe0055e38e3e328f19d4d67f0f4ae049436d3c8 Author: Anthony PERARD AuthorDate: Wed Oct 2 17:16:31 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:16:31 2013 +0100 Revert "Fix semaphores fallback code" This reverts commit 0a7ad69a0f012d5d70142f775f99405500d4d38e. --- qemu-thread-posix.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c index e24e2ae..6d95bac 100644 --- a/qemu-thread-posix.c +++ b/qemu-thread-posix.c @@ -213,7 +213,6 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms) while (sem->count < 0) { rc = pthread_cond_timedwait(&sem->cond, &sem->lock, &ts); if (rc == ETIMEDOUT) { - ++sem->count; break; } if (rc != 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:35:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:35: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 1Vk40V-0000YI-9s; Sat, 23 Nov 2013 03:35:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk40S-0000Y4-Dr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:41 +0000 Received: from [193.109.254.147:28016] by server-16.bemta-14.messagelabs.com id 37/FE-03396-B8220925; Sat, 23 Nov 2013 03:35:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385177734!237012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8614 invoked from network); 23 Nov 2013 03:35:34 -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; 23 Nov 2013 03:35:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk40L-0006qS-M7 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk40L-0003CE-2b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:33 +0000 Date: Sat, 23 Nov 2013 03:35:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge tag 'v1.6.0' into merging-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 === This changeset includes merge from high-traffic branch === Commits on that branch are not reported individually. commit 2c7d76d1a7e15b4c0de1a5c2852d6615aa336c52 Merge: dfe0055e38e3e328f19d4d67f0f4ae049436d3c8 1ee2daeb6448312d6d0e22175f5c1b9b01f8974c Author: Anthony PERARD AuthorDate: Wed Oct 2 17:17:01 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:01 2013 +0100 Merge tag 'v1.6.0' into merging-1.6 .gitignore | 21 +- .gitmodules | 5 +- HACKING | 46 +- LICENSE | 15 +- MAINTAINERS | 287 +- Makefile | 229 +- Makefile.dis | 20 - Makefile.objs | 239 +- Makefile.target | 92 +- Makefile.user | 24 - QMP/qmp-events.txt | 52 +- QMP/qmp-shell | 9 +- TODO | 37 - VERSION | 2 +- a.out.h | 430 - acl.c | 184 - acl.h | 74 - aes.c | 1314 --- aes.h | 26 - aio-posix.c | 136 +- aio-win32.c | 6 +- alpha-dis.c | 1916 ---- alpha.ld | 127 - arch_init.c | 689 +- arch_init.h | 39 - arm-dis.c | 4136 -------- arm.ld | 153 - async.c | 55 +- audio/Makefile.objs | 3 + audio/alsaaudio.c | 2 +- audio/audio.c | 11 +- audio/audio.h | 2 +- audio/audio_int.h | 31 +- audio/audio_win_int.c | 1 - audio/noaudio.c | 2 +- audio/ossaudio.c | 8 +- audio/spiceaudio.c | 2 +- audio/wavaudio.c | 2 +- audio/wavcapture.c | 2 +- audio/winwaveaudio.c | 2 +- backends/Makefile.objs | 6 + backends/baum.c | 631 ++ backends/msmouse.c | 85 + backends/rng-egd.c | 14 +- backends/rng-random.c | 20 +- backends/rng.c | 6 +- backends/tpm.c | 190 + balloon.c | 10 +- balloon.h | 29 - bitmap.c | 256 - bitmap.h | 222 - bitops.c | 142 - bitops.h | 362 - block-migration.c | 272 +- block-migration.h | 23 - block.c | 1308 ++-- block.h | 434 - block/Makefile.objs | 6 + block/backup.c | 386 + block/blkdebug.c | 244 +- block/blkverify.c | 120 +- block/bochs.c | 30 +- block/cloop.c | 35 +- block/commit.c | 15 +- block/cow.c | 11 +- block/curl.c | 204 +- block/dmg.c | 174 +- block/gluster.c | 114 +- block/iscsi.c | 707 +- block/linux-aio.c | 6 +- block/mirror.c | 394 +- block/nbd.c | 182 +- block/parallels.c | 29 +- block/qapi.c | 470 + block/qcow.c | 32 +- block/qcow2-cache.c | 2 +- block/qcow2-cluster.c | 687 +- block/qcow2-refcount.c | 247 +- block/qcow2-snapshot.c | 18 +- block/qcow2.c | 229 +- block/qcow2.h | 123 +- block/qed-table.c | 2 +- block/qed.c | 15 +- block/qed.h | 2 +- block/raw-aio.h | 5 +- block/raw-posix.c | 357 +- block/raw-win32.c | 95 +- block/raw.c | 43 +- block/rbd.c | 100 +- block/sheepdog.c | 889 ++- block/snapshot.c | 157 + block/ssh.c | 1076 ++ block/stream.c | 8 +- block/vdi.c | 40 +- block/vhdx.c | 972 ++ block/vhdx.h | 325 + block/vmdk.c | 499 +- block/vpc.c | 99 +- block/vvfat.c | 261 +- block/win32-aio.c | 28 +- block_int.h | 360 - blockdev-nbd.c | 14 +- blockdev.c | 1102 ++- blockdev.h | 64 - blockjob.c | 14 +- blockjob.h | 278 - bsd-user/elfload.c | 8 +- bsd-user/main.c | 63 +- bsd-user/mmap.c | 4 +- bsd-user/qemu-types.h | 24 - bsd-user/qemu.h | 8 +- bsd-user/syscall.c | 5 + bswap.h | 713 -- bt-host.c | 7 +- bt-host.h | 9 - bt-vhci.c | 4 +- buffered_file.c | 269 - buffered_file.h | 22 - cache-utils.c | 97 - cache-utils.h | 44 - cmd.c | 612 -- cmd.h | 79 - compatfd.c | 138 - compatfd.h | 44 - compiler.h | 58 - config.h | 2 - configure | 1577 ++-- console.c | 1723 ---- console.h | 476 - coroutine-gthread.c | 2 +- coroutine-sigaltstack.c | 71 +- coroutine-ucontext.c | 79 +- coroutine-win32.c | 2 +- cpu-all.h | 522 - cpu-common.h | 112 - cpu-defs.h | 213 - cpu-exec.c | 237 +- cpus.c | 413 +- cpus.h | 24 - cputlb.c | 89 +- cputlb.h | 46 - cris-dis.c | 2871 ------ cursor.c | 211 - cursor_hidden.xpm | 37 - cursor_left_ptr.xpm | 39 - cutils.c | 323 - def-helper.h | 275 - default-configs/alpha-softmmu.mak | 3 + default-configs/arm-softmmu.mak | 34 + default-configs/cris-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 23 +- default-configs/lm32-softmmu.mak | 4 + default-configs/m68k-softmmu.mak | 2 + default-configs/microblaze-softmmu.mak | 2 + default-configs/microblazeel-softmmu.mak | 2 + default-configs/mips-softmmu.mak | 10 +- default-configs/mips64-softmmu.mak | 10 +- default-configs/mips64el-softmmu.mak | 10 +- default-configs/mipsel-softmmu.mak | 10 +- default-configs/moxie-softmmu.mak | 5 + default-configs/pci.mak | 9 + default-configs/ppc-softmmu.mak | 14 +- default-configs/ppc64-softmmu.mak | 26 +- default-configs/ppcemb-softmmu.mak | 12 +- default-configs/s390x-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 13 +- default-configs/sh4eb-softmmu.mak | 13 +- default-configs/sound.mak | 4 + default-configs/sparc-softmmu.mak | 8 + default-configs/sparc64-softmmu.mak | 4 + default-configs/usb.mak | 8 + default-configs/x86_64-softmmu.mak | 23 +- device-hotplug.c | 79 + device_tree.c | 64 +- device_tree.h | 54 - dis-asm.h | 483 - disas.c | 18 +- disas.h | 43 - disas/Makefile.objs | 19 + disas/alpha.c | 1916 ++++ disas/arm.c | 4140 ++++++++ disas/cris.c | 2871 ++++++ disas/hppa.c | 2831 ++++++ disas/i386.c | 6627 ++++++++++++ disas/ia64.c |10602 ++++++++++++++++++++ disas/lm32.c | 361 + disas/m68k.c | 5052 ++++++++++ disas/microblaze.c | 1100 ++ disas/mips.c | 4873 +++++++++ disas/moxie.c | 360 + disas/ppc.c | 5412 ++++++++++ disas/s390.c | 1931 ++++ disas/sh4.c | 2077 ++++ disas/sparc.c | 3275 ++++++ disas/tci.c | 59 + dma-helpers.c | 195 +- dma.h | 282 - docs/atomics.txt | 352 + docs/bootindex.txt | 10 +- docs/ccid.txt | 2 +- docs/memory.txt | 11 +- docs/migration.txt | 37 +- docs/q35-chipset.cfg | 129 + docs/qapi-code-gen.txt | 109 +- docs/rdma.txt | 424 + docs/specs/pci-ids.txt | 50 + docs/specs/pci-testdev.txt | 26 + docs/specs/pvpanic.txt | 39 + docs/specs/vmw_pvscsi-spec.txt | 92 + docs/spice-port-fqdn.txt | 19 + docs/tracing.txt | 66 +- docs/usb-storage.txt | 13 +- docs/usb2.txt | 20 +- docs/virtio-balloon-stats.txt | 104 + docs/vnc-ledstate-Pseudo-encoding.txt | 50 + dtc | 1 + dump-stub.c | 64 - dump.c | 229 +- dump.h | 35 - elf.h | 1308 --- envlist.c | 246 - envlist.h | 22 - error.c | 115 - error.h | 80 - event_notifier-posix.c | 120 - event_notifier-win32.c | 59 - event_notifier.h | 46 - exec-all.h | 418 - exec-memory.h | 41 - exec.c | 3136 ++----- fpu/softfloat-macros.h | 2 +- fpu/softfloat.c | 39 +- fpu/softfloat.h | 638 -- fsdev/Makefile.objs | 9 +- fsdev/qemu-fsdev-dummy.c | 11 +- fsdev/qemu-fsdev-opts.c | 85 + fsdev/qemu-fsdev.c | 16 +- fsdev/qemu-fsdev.h | 2 +- fsdev/virtfs-proxy-helper.c | 105 +- fsdev/virtio-9p-marshal.c | 4 +- gdbstub.c | 1644 +--- gdbstub.h | 53 - gen-icount.h | 48 - hmp-commands.hx | 129 +- hmp.c | 331 +- hmp.h | 45 +- host-utils.c | 105 - host-utils.h | 236 - hppa-dis.c | 2831 ------ hppa.ld | 211 - hw/9p.h | 24 - hw/9pfs/codir.c | 4 +- hw/9pfs/cofile.c | 8 +- hw/9pfs/cofs.c | 4 +- hw/9pfs/coxattr.c | 4 +- hw/9pfs/virtio-9p-coth.c | 5 +- hw/9pfs/virtio-9p-coth.h | 4 +- hw/9pfs/virtio-9p-device.c | 128 +- hw/9pfs/virtio-9p-handle.c | 4 +- hw/9pfs/virtio-9p-local.c | 64 +- hw/9pfs/virtio-9p-posix-acl.c | 4 +- hw/9pfs/virtio-9p-proxy.c | 7 +- hw/9pfs/virtio-9p-synth.c | 2 +- hw/9pfs/virtio-9p-synth.h | 4 + hw/9pfs/virtio-9p-xattr-user.c | 2 +- hw/9pfs/virtio-9p-xattr.c | 2 +- hw/9pfs/virtio-9p-xattr.h | 2 +- hw/9pfs/virtio-9p.c | 33 +- hw/9pfs/virtio-9p.h | 19 +- hw/Makefile.objs | 243 +- hw/a15mpcore.c | 108 - hw/a9mpcore.c | 242 - hw/ac97.c | 1438 --- hw/acpi.c | 470 - hw/acpi.h | 155 - hw/acpi/Makefile.objs | 2 + hw/acpi/core.c | 624 ++ hw/acpi/ich9.c | 230 + hw/acpi/piix4.c | 739 ++ hw/acpi_ich9.c | 322 - hw/acpi_ich9.h | 47 - hw/acpi_piix4.c | 759 -- hw/adb.c | 455 - hw/adb.h | 63 - hw/adlib.c | 337 - hw/ads7846.c | 177 - hw/alpha/Makefile.objs | 5 +- hw/alpha/alpha_sys.h | 21 + hw/alpha/dp264.c | 184 + hw/alpha/pci.c | 91 + hw/alpha/typhoon.c | 810 ++ hw/alpha_dp264.c | 181 - hw/alpha_pci.c | 109 - hw/alpha_sys.h | 22 - hw/alpha_typhoon.c | 838 -- hw/an5206.c | 96 - hw/apb_pci.c | 542 - hw/apb_pci.h | 10 - hw/apic-msidef.h | 30 - hw/apic.c | 910 -- hw/apic.h | 32 - hw/apic_common.c | 402 - hw/apic_internal.h | 149 - hw/apm.c | 89 - hw/apm.h | 22 - hw/applesmc.c | 251 - hw/arm-misc.h | 70 - hw/arm/Makefile.objs | 40 +- hw/arm/armv7m.c | 290 + hw/arm/boot.c | 476 + hw/arm/collie.c | 73 + hw/arm/exynos4210.c | 371 + hw/arm/exynos4_boards.c | 170 + hw/arm/gumstix.c | 141 + hw/arm/highbank.c | 386 + hw/arm/integratorcp.c | 581 ++ hw/arm/kzm.c | 157 + hw/arm/mainstone.c | 190 + hw/arm/musicpal.c | 1771 ++++ hw/arm/nseries.c | 1415 +++ hw/arm/omap1.c | 4059 ++++++++ hw/arm/omap2.c | 2684 +++++ hw/arm/omap_sx1.c | 238 + hw/arm/palm.c | 284 + hw/arm/pic_cpu.c | 68 + hw/arm/pxa2xx.c | 2320 +++++ hw/arm/pxa2xx_gpio.c | 358 + hw/arm/pxa2xx_pic.c | 341 + hw/arm/realview.c | 410 + hw/arm/spitz.c | 1145 +++ hw/arm/stellaris.c | 1418 +++ hw/arm/strongarm.c | 1661 +++ hw/arm/strongarm.h | 68 + hw/arm/tosa.c | 302 + hw/arm/versatilepb.c | 412 + hw/arm/vexpress.c | 672 ++ hw/arm/xilinx_zynq.c | 247 + hw/arm/z2.c | 384 + hw/arm11mpcore.c | 268 - hw/arm_boot.c | 465 - hw/arm_gic.c | 718 -- hw/arm_gic_common.c | 184 - hw/arm_gic_internal.h | 136 - hw/arm_l2x0.c | 194 - hw/arm_mptimer.c | 344 - hw/arm_pic.c | 40 - hw/arm_sysctl.c | 425 - hw/arm_timer.c | 399 - hw/armv7m.c | 284 - hw/armv7m_nvic.c | 550 - hw/audio/Makefile.objs | 18 + hw/audio/ac97.c | 1442 +++ hw/audio/adlib.c | 391 + hw/audio/cs4231.c | 187 + hw/audio/cs4231a.c | 708 ++ hw/audio/es1370.c | 1091 ++ hw/audio/fmopl.c | 1395 +++ hw/audio/fmopl.h | 174 + hw/audio/gus.c | 337 + hw/audio/gusemu.h | 105 + hw/audio/gusemu_hal.c | 554 + hw/audio/gusemu_mixer.c | 240 + hw/audio/gustate.h | 132 + hw/audio/hda-codec.c | 1101 ++ hw/audio/intel-hda-defs.h | 717 ++ hw/audio/intel-hda.c | 1342 +++ hw/audio/intel-hda.h | 72 + hw/audio/lm4549.c | 336 + hw/audio/lm4549.h | 43 + hw/audio/marvell_88w8618.c | 305 + hw/audio/milkymist-ac97.c | 349 + hw/audio/pcspk.c | 212 + hw/audio/pl041.c | 653 ++ hw/audio/pl041.h | 135 + hw/audio/pl041.hx | 81 + hw/audio/sb16.c | 1435 +++ hw/audio/wm8750.c | 716 ++ hw/audiodev.h | 20 - hw/axis_dev88.c | 365 - hw/baum.c | 627 -- hw/baum.h | 26 - hw/bitbang_i2c.c | 245 - hw/bitbang_i2c.h | 14 - hw/blizzard.c | 997 -- hw/blizzard_template.h | 136 - hw/block-common.c | 64 - hw/block-common.h | 79 - hw/block/Makefile.objs | 15 + hw/block/block.c | 62 + hw/block/cdrom.c | 155 + hw/block/dataplane/Makefile.objs | 1 + hw/block/dataplane/ioq.c | 117 + hw/block/dataplane/ioq.h | 57 + hw/block/dataplane/virtio-blk.c | 542 + hw/block/dataplane/virtio-blk.h | 29 + hw/block/ecc.c | 91 + hw/block/fdc.c | 2328 +++++ hw/block/hd-geometry.c | 157 + hw/block/m25p80.c | 703 ++ hw/block/nand.c | 800 ++ hw/block/nvme.c | 887 ++ hw/block/nvme.h | 711 ++ hw/block/onenand.c | 854 ++ hw/block/pflash_cfi01.c | 775 ++ hw/block/pflash_cfi02.c | 789 ++ hw/block/tc58128.c | 178 + hw/block/virtio-blk.c | 760 ++ hw/block/xen_blkif.h | 103 + hw/block/xen_disk.c | 988 ++ hw/boards.h | 50 - hw/bonito.c | 847 -- hw/bt-hci-csr.c | 453 - hw/bt-hci.c | 2217 ---- hw/bt-hid.c | 553 - hw/bt-l2cap.c | 1365 --- hw/bt-sdp.c | 967 -- hw/bt.c | 121 - hw/bt.h | 2185 ---- hw/bt/Makefile.objs | 3 + hw/bt/core.c | 121 + hw/bt/hci-csr.c | 454 + hw/bt/hci.c | 2217 ++++ hw/bt/hid.c | 553 + hw/bt/l2cap.c | 1365 +++ hw/bt/sdp.c | 967 ++ hw/cadence_gem.c | 1233 --- hw/cadence_ttc.c | 489 - hw/cadence_uart.c | 516 - hw/cbus.c | 618 -- hw/ccid-card-emulated.c | 602 -- hw/ccid-card-passthru.c | 351 - hw/ccid.h | 65 - hw/cdrom.c | 155 - hw/char/Makefile.objs | 27 + hw/char/cadence_uart.c | 522 + hw/char/debugcon.c | 140 + hw/char/escc.c | 941 ++ hw/char/etraxfs_ser.c | 252 + hw/char/exynos4210_uart.c | 680 ++ hw/char/grlib_apbuart.c | 298 + hw/char/imx_serial.c | 473 + hw/char/ipack.c | 116 + hw/char/ipack.h | 79 + hw/char/ipoctal232.c | 606 ++ hw/char/lm32_juart.c | 162 + hw/char/lm32_uart.c | 302 + hw/char/mcf_uart.c | 307 + hw/char/milkymist-uart.c | 249 + hw/char/omap_uart.c | 187 + hw/char/parallel.c | 625 ++ hw/char/pl011.c | 332 + hw/char/sclpconsole.c | 289 + hw/char/serial-isa.c | 138 + hw/char/serial-pci.c | 269 + hw/char/serial.c | 775 ++ hw/char/sh_serial.c | 410 + hw/char/spapr_vty.c | 241 + hw/char/tpci200.c | 672 ++ hw/char/virtio-console.c | 207 + hw/char/virtio-serial-bus.c | 1044 ++ hw/char/xen_console.c | 305 + hw/char/xilinx_uartlite.c | 235 + hw/cirrus_vga.c | 3011 ------ hw/cirrus_vga_rop.h | 208 - hw/cirrus_vga_rop2.h | 281 - hw/cirrus_vga_template.h | 102 - hw/collie.c | 72 - hw/core/Makefile.objs | 13 + hw/core/empty_slot.c | 102 + hw/core/irq.c | 136 + hw/core/loader.c | 884 ++ hw/core/null-machine.c | 36 + hw/core/ptimer.c | 231 + hw/core/qdev-properties-system.c | 391 + hw/core/qdev-properties.c | 1198 +++ hw/core/qdev.c | 907 ++ hw/core/stream.c | 32 + hw/core/sysbus.c | 301 + hw/core/uboot_image.h | 158 + hw/cpu/Makefile.objs | 5 + hw/cpu/a15mpcore.c | 122 + hw/cpu/a9mpcore.c | 145 + hw/cpu/arm11mpcore.c | 291 + hw/cpu/icc_bus.c | 127 + hw/cris-boot.c | 98 - hw/cris-boot.h | 11 - hw/cris/Makefile.objs | 14 +- hw/cris/axis_dev88.c | 366 + hw/cris/boot.c | 98 + hw/cris/boot.h | 15 + hw/cris/pic_cpu.c | 47 + hw/cris_pic_cpu.c | 45 - hw/cs4231.c | 181 - hw/cs4231a.c | 697 -- hw/cuda.c | 752 -- hw/debugcon.c | 117 - hw/dec_pci.c | 151 - hw/dec_pci.h | 10 - hw/device-hotplug.c | 92 - hw/devices.h | 70 - hw/display/Makefile.objs | 35 + hw/display/ads7846.c | 177 + hw/display/blizzard.c | 995 ++ hw/display/blizzard_template.h | 136 + hw/display/cirrus_vga.c | 3025 ++++++ hw/display/cirrus_vga_rop.h | 208 + hw/display/cirrus_vga_rop2.h | 281 + hw/display/cirrus_vga_template.h | 102 + hw/display/exynos4210_fimd.c | 1947 ++++ hw/display/framebuffer.c | 113 + hw/display/framebuffer.h | 25 + hw/display/g364fb.c | 557 + hw/display/jazz_led.c | 311 + hw/display/milkymist-tmu2.c | 495 + hw/display/milkymist-vgafb.c | 345 + hw/display/milkymist-vgafb_template.h | 74 + hw/display/omap_dss.c | 1086 ++ hw/display/omap_lcd_template.h | 175 + hw/display/omap_lcdc.c | 412 + hw/display/pl110.c | 532 + hw/display/pl110_template.h | 395 + hw/display/pxa2xx_lcd.c | 1061 ++ hw/display/pxa2xx_template.h | 435 + hw/display/qxl-logger.c | 275 + hw/display/qxl-render.c | 280 + hw/display/qxl.c | 2369 +++++ hw/display/qxl.h | 165 + hw/display/sm501.c | 1452 +++ hw/display/sm501_template.h | 145 + hw/display/ssd0303.c | 325 + hw/display/ssd0323.c | 376 + hw/display/tc6393xb.c | 593 ++ hw/display/tc6393xb_template.h | 68 + hw/display/tcx.c | 627 ++ hw/display/vga-isa-mm.c | 142 + hw/display/vga-isa.c | 105 + hw/display/vga-pci.c | 216 + hw/display/vga.c | 2396 +++++ hw/display/vga.h | 159 + hw/display/vga_int.h | 214 + hw/display/vga_template.h | 459 + hw/display/vmware_vga.c | 1324 +++ hw/display/xenfb.c | 1000 ++ hw/dma.c | 565 -- hw/dma/Makefile.objs | 13 + hw/dma/etraxfs_dma.c | 781 ++ hw/dma/i82374.c | 177 + hw/dma/i8257.c | 600 ++ hw/dma/omap_dma.c | 2102 ++++ hw/dma/pl080.c | 410 + hw/dma/pl330.c | 1654 +++ hw/dma/puv3_dma.c | 113 + hw/dma/pxa2xx_dma.c | 578 ++ hw/dma/rc4030.c | 825 ++ hw/dma/soc_dma.c | 366 + hw/dma/sparc32_dma.c | 321 + hw/dma/sun4m_iommu.c | 391 + hw/dma/xilinx_axidma.c | 668 ++ hw/dp8393x.c | 913 -- hw/ds1225y.c | 165 - hw/ds1338.c | 193 - hw/dummy_m68k.c | 83 - hw/e1000.c | 1337 --- hw/e1000_hw.h | 893 -- hw/ecc.c | 91 - hw/eccmemctl.c | 340 - hw/eepro100.c | 2115 ---- hw/eeprom93xx.c | 337 - hw/eeprom93xx.h | 40 - hw/elf_ops.h | 306 - hw/empty_slot.c | 98 - hw/empty_slot.h | 2 - hw/es1370.c | 1089 -- hw/escc.c | 938 -- hw/escc.h | 8 - hw/esp-pci.c | 518 - hw/esp.c | 727 -- hw/esp.h | 132 - hw/etraxfs.h | 46 - hw/etraxfs_dma.c | 781 -- hw/etraxfs_dma.h | 29 - hw/etraxfs_eth.c | 645 -- hw/etraxfs_pic.c | 180 - hw/etraxfs_ser.c | 248 - hw/etraxfs_timer.c | 351 - hw/exynos4210.c | 338 - hw/exynos4210.h | 137 - hw/exynos4210_combiner.c | 455 - hw/exynos4210_fimd.c | 1928 ---- hw/exynos4210_gic.c | 462 - hw/exynos4210_i2c.c | 334 - hw/exynos4210_mct.c | 1482 --- hw/exynos4210_pmu.c | 499 - hw/exynos4210_pwm.c | 422 - hw/exynos4210_rtc.c | 592 -- hw/exynos4210_uart.c | 676 -- hw/exynos4_boards.c | 168 - hw/fdc.c | 2284 ----- hw/fdc.h | 24 - hw/fifo.c | 78 - hw/fifo.h | 99 - hw/firmware_abi.h | 73 - hw/flash.h | 59 - hw/fmopl.c | 1395 --- hw/fmopl.h | 174 - hw/framebuffer.c | 110 - hw/framebuffer.h | 25 - hw/fw_cfg.c | 589 -- hw/fw_cfg.h | 70 - hw/g364fb.c | 612 -- hw/gpio/Makefile.objs | 6 + hw/gpio/max7310.c | 213 + hw/gpio/omap_gpio.c | 806 ++ hw/gpio/pl061.c | 336 + hw/gpio/puv3_gpio.c | 145 + hw/gpio/zaurus.c | 297 + hw/grackle_pci.c | 165 - hw/grlib.h | 126 - hw/grlib_apbuart.c | 271 - hw/grlib_gptimer.c | 404 - hw/grlib_irqmp.c | 385 - hw/gt64xxx.c | 1188 --- hw/gumstix.c | 139 - hw/gus.c | 332 - hw/gusemu.h | 105 - hw/gusemu_hal.c | 554 - hw/gusemu_mixer.c | 240 - hw/gustate.h | 132 - hw/hd-geometry.c | 157 - hw/hda-audio.c | 1098 -- hw/heathrow_pic.c | 215 - hw/hid.c | 467 - hw/hid.h | 82 - hw/highbank.c | 338 - hw/hpet.c | 760 -- hw/hpet_emul.h | 74 - hw/hw.h | 70 - hw/i2c.c | 246 - hw/i2c.h | 92 - hw/i2c/Makefile.objs | 7 + hw/i2c/bitbang_i2c.c | 252 + hw/i2c/bitbang_i2c.h | 14 + hw/i2c/core.c | 247 + hw/i2c/exynos4210_i2c.c | 336 + hw/i2c/omap_i2c.c | 498 + hw/i2c/pm_smbus.c | 207 + hw/i2c/smbus.c | 335 + hw/i2c/smbus_eeprom.c | 156 + hw/i2c/smbus_ich9.c | 127 + hw/i2c/versatile_i2c.c | 113 + hw/i386/Makefile.objs | 19 +- hw/i386/kvm/Makefile.objs | 1 + hw/i386/kvm/apic.c | 209 + hw/i386/kvm/clock.c | 145 + hw/i386/kvm/i8254.c | 336 + hw/i386/kvm/i8259.c | 162 + hw/i386/kvm/ioapic.c | 166 + hw/i386/kvm/pci-assign.c | 1946 ++++ hw/i386/kvmvapic.c | 838 ++ hw/i386/multiboot.c | 347 + hw/i386/multiboot.h | 14 + hw/i386/pc.c | 1364 +++ hw/i386/pc_piix.c | 782 ++ hw/i386/pc_q35.c | 283 + hw/i386/pc_sysfw.c | 188 + hw/i386/smbios.c | 246 + hw/i386/xen_domainbuild.c | 299 + hw/i386/xen_domainbuild.h | 13 + hw/i386/xen_machine_pv.c | 110 + hw/i82374.c | 168 - hw/i82378.c | 277 - hw/i8254.c | 362 - hw/i8254.h | 68 - hw/i8254_common.c | 311 - hw/i8254_internal.h | 85 - hw/i8259.c | 496 - hw/i8259_common.c | 161 - hw/i8259_internal.h | 82 - hw/i82801b11.c | 125 - hw/ich9.h | 207 - hw/ide.h | 39 - hw/ide/Makefile.objs | 2 + hw/ide/ahci.c | 188 +- hw/ide/ahci.h | 34 +- hw/ide/atapi.c | 2 +- hw/ide/cmd646.c | 93 +- hw/ide/core.c | 1344 ++-- hw/ide/ich.c | 59 +- hw/ide/internal.h | 15 +- hw/ide/isa.c | 64 +- hw/ide/macio.c | 338 +- hw/ide/microdrive.c | 6 +- hw/ide/mmio.c | 98 +- hw/ide/pci.c | 42 +- hw/ide/pci.h | 8 +- hw/ide/piix.c | 59 +- hw/ide/qdev.c | 34 +- hw/ide/via.c | 41 +- hw/imx.h | 34 - hw/imx_avic.c | 408 - hw/imx_ccm.c | 321 - hw/imx_serial.c | 467 - hw/imx_timer.c | 689 -- hw/input/Makefile.objs | 13 + hw/input/adb.c | 581 ++ hw/input/hid.c | 498 + hw/input/lm832x.c | 521 + hw/input/milkymist-softusb.c | 338 + hw/input/pckbd.c | 542 + hw/input/pl050.c | 205 + hw/input/ps2.c | 676 ++ hw/input/pxa2xx_keypad.c | 335 + hw/input/stellaris_input.c | 89 + hw/input/tsc2005.c | 593 ++ hw/input/tsc210x.c | 1293 +++ hw/input/vmmouse.c | 303 + hw/intc/Makefile.objs | 25 + hw/intc/apic.c | 911 ++ hw/intc/apic_common.c | 408 + hw/intc/arm_gic.c | 725 ++ hw/intc/arm_gic_common.c | 176 + hw/intc/arm_gic_kvm.c | 169 + hw/intc/armv7m_nvic.c | 559 ++ hw/intc/etraxfs_pic.c | 187 + hw/intc/exynos4210_combiner.c | 460 + hw/intc/exynos4210_gic.c | 473 + hw/intc/gic_internal.h | 141 + hw/intc/grlib_irqmp.c | 372 + hw/intc/heathrow_pic.c | 215 + hw/intc/i8259.c | 522 + hw/intc/i8259_common.c | 157 + hw/intc/imx_avic.c | 416 + hw/intc/ioapic.c | 259 + hw/intc/ioapic_common.c | 118 + hw/intc/lm32_pic.c | 204 + hw/intc/omap_intc.c | 662 ++ hw/intc/openpic.c | 1663 +++ hw/intc/openpic_kvm.c | 264 + hw/intc/pl190.c | 293 + hw/intc/puv3_intc.c | 140 + hw/intc/realview_gic.c | 81 + hw/intc/sh_intc.c | 512 + hw/intc/slavio_intctl.c | 473 + hw/intc/xics.c | 708 ++ hw/intc/xilinx_intc.c | 200 + hw/integratorcp.c | 565 -- hw/intel-hda-defs.h | 717 -- hw/intel-hda.c | 1302 --- hw/intel-hda.h | 72 - hw/ioapic.c | 259 - hw/ioapic.h | 27 - hw/ioapic_common.c | 120 - hw/ioapic_internal.h | 102 - hw/ioh3420.c | 250 - hw/ioh3420.h | 10 - hw/irq.c | 136 - hw/irq.h | 57 - hw/isa-bus.c | 267 - hw/isa.h | 103 - hw/isa/Makefile.objs | 8 + hw/isa/apm.c | 102 + hw/isa/i82378.c | 149 + hw/isa/isa-bus.c | 261 + hw/isa/lpc_ich9.c | 629 ++ hw/isa/pc87312.c | 400 + hw/isa/piix4.c | 132 + hw/isa/vt82c686.c | 502 + hw/isa_mmio.c | 81 - hw/ivshmem.c | 821 -- hw/jazz_led.c | 291 - hw/kvm/Makefile.objs | 1 - hw/kvm/apic.c | 209 - hw/kvm/clock.c | 143 - hw/kvm/clock.h | 24 - hw/kvm/i8254.c | 317 - hw/kvm/i8259.c | 138 - hw/kvm/ioapic.c | 165 - hw/kvm/pci-assign.c | 1918 ---- hw/kvmvapic.c | 821 -- hw/kzm.c | 156 - hw/lan9118.c | 1399 --- hw/lance.c | 170 - hw/leon3.c | 223 - hw/lm32.h | 25 - hw/lm32/Makefile.objs | 20 - hw/lm32/lm32.h | 29 + hw/lm32/lm32_boards.c | 309 + hw/lm32/lm32_hwsetup.h | 178 + hw/lm32/milkymist-hw.h | 207 + hw/lm32/milkymist.c | 219 + hw/lm32_boards.c | 307 - hw/lm32_hwsetup.h | 178 - hw/lm32_juart.c | 159 - hw/lm32_juart.h | 11 - hw/lm32_pic.c | 199 - hw/lm32_pic.h | 14 - hw/lm32_sys.c | 172 - hw/lm32_timer.c | 230 - hw/lm32_uart.c | 296 - hw/lm4549.c | 336 - hw/lm4549.h | 43 - hw/lm832x.c | 521 - hw/loader.c | 801 -- hw/loader.h | 49 - hw/lpc_ich9.c | 525 - hw/lsi53c895a.c | 2141 ---- hw/m25p80.c | 651 -- hw/m48t59.c | 778 -- hw/m68k/Makefile.objs | 4 +- hw/m68k/an5206.c | 100 + hw/m68k/dummy_m68k.c | 84 + hw/m68k/mcf5206.c | 548 + hw/m68k/mcf5208.c | 306 + hw/m68k/mcf_intc.c | 154 + hw/mac_dbdma.c | 854 -- hw/mac_dbdma.h | 44 - hw/mac_nvram.c | 178 - hw/macio.c | 140 - hw/mainstone.c | 189 - hw/marvell_88w8618_audio.c | 303 - hw/max111x.c | 193 - hw/max7310.c | 213 - hw/mc146818rtc.c | 913 -- hw/mc146818rtc.h | 11 - hw/mc146818rtc_regs.h | 67 - hw/mcf.h | 30 - hw/mcf5206.c | 548 - hw/mcf5208.c | 302 - hw/mcf_fec.c | 480 - hw/mcf_intc.c | 154 - hw/mcf_uart.c | 306 - hw/megasas.c | 2213 ---- hw/mfi.h | 1249 --- hw/microblaze/Makefile.objs | 12 +- hw/microblaze/boot.c | 164 + hw/microblaze/boot.h | 10 + hw/microblaze/petalogix_ml605_mmu.c | 197 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 127 + hw/microblaze/pic_cpu.c | 47 + hw/microblaze/pic_cpu.h | 8 + hw/microblaze_boot.c | 177 - hw/microblaze_boot.h | 10 - hw/microblaze_pic_cpu.c | 44 - hw/microblaze_pic_cpu.h | 8 - hw/milkymist-ac97.c | 344 - hw/milkymist-hpdmc.c | 170 - hw/milkymist-hw.h | 223 - hw/milkymist-memcard.c | 303 - hw/milkymist-minimac2.c | 550 - hw/milkymist-pfpu.c | 544 - hw/milkymist-softusb.c | 331 - hw/milkymist-sysctl.c | 338 - hw/milkymist-tmu2.c | 490 - hw/milkymist-uart.c | 243 - hw/milkymist-vgafb.c | 334 - hw/milkymist-vgafb_template.h | 74 - hw/milkymist.c | 218 - hw/mips-bios.h | 8 - hw/mips.h | 29 - hw/mips/Makefile.objs | 10 +- hw/mips/addr.c | 34 + hw/mips/cputimer.c | 147 + hw/mips/gt64xxx_pci.c | 1189 +++ hw/mips/mips_fulong2e.c | 414 + hw/mips/mips_int.c | 67 + hw/mips/mips_jazz.c | 347 + hw/mips/mips_malta.c | 1153 +++ hw/mips/mips_mipssim.c | 243 + hw/mips/mips_r4k.c | 317 + hw/mips_addr.c | 34 - hw/mips_cpudevs.h | 15 - hw/mips_fulong2e.c | 410 - hw/mips_int.c | 65 - hw/mips_jazz.c | 343 - hw/mips_malta.c | 1033 -- hw/mips_mipssim.c | 238 - hw/mips_r4k.c | 312 - hw/mips_timer.c | 147 - hw/mipsnet.c | 284 - hw/misc/Makefile.objs | 43 + hw/misc/a9scu.c | 165 + hw/misc/applesmc.c | 281 + hw/misc/arm_l2x0.c | 199 + hw/misc/arm_sysctl.c | 656 ++ hw/misc/cbus.c | 618 ++ hw/misc/debugexit.c | 76 + hw/misc/eccmemctl.c | 345 + hw/misc/exynos4210_pmu.c | 503 + hw/misc/imx_ccm.c | 326 + hw/misc/ivshmem.c | 839 ++ hw/misc/lm32_sys.c | 176 + hw/misc/macio/Makefile.objs | 3 + hw/misc/macio/cuda.c | 740 ++ hw/misc/macio/mac_dbdma.c | 764 ++ hw/misc/macio/macio.c | 402 + hw/misc/max111x.c | 193 + hw/misc/milkymist-hpdmc.c | 175 + hw/misc/milkymist-pfpu.c | 549 + hw/misc/mst_fpga.c | 267 + hw/misc/omap_clk.c | 1264 +++ hw/misc/omap_gpmc.c | 894 ++ hw/misc/omap_l4.c | 162 + hw/misc/omap_sdrc.c | 168 + hw/misc/omap_tap.c | 116 + hw/misc/pc-testdev.c | 207 + hw/misc/pci-testdev.c | 334 + hw/misc/puv3_pm.c | 153 + hw/misc/pvpanic.c | 147 + hw/misc/pxa2xx_pcmcia.c | 207 + hw/misc/sga.c | 67 + hw/misc/slavio_misc.c | 517 + hw/misc/tmp105.c | 269 + hw/misc/tmp105.h | 47 + hw/misc/vfio.c | 3322 ++++++ hw/misc/vmport.c | 180 + hw/misc/zynq_slcr.c | 539 + hw/moxie/Makefile.objs | 2 + hw/moxie/moxiesim.c | 174 + hw/mpc8544_guts.c | 143 - hw/msi.c | 395 - hw/msi.h | 50 - hw/msix.c | 562 -- hw/msix.h | 41 - hw/msmouse.c | 78 - hw/msmouse.h | 2 - hw/mst_fpga.c | 263 - hw/multiboot.c | 349 - hw/multiboot.h | 12 - hw/musicpal.c | 1697 ---- hw/nand.c | 789 -- hw/ne2000-isa.c | 112 - hw/ne2000.c | 788 -- hw/ne2000.h | 35 - hw/net/Makefile.objs | 33 + hw/net/cadence_gem.c | 1224 +++ hw/net/dp8393x.c | 914 ++ hw/net/e1000.c | 1422 +++ hw/net/e1000_regs.h | 893 ++ hw/net/eepro100.c | 2116 ++++ hw/net/etraxfs_eth.c | 663 ++ hw/net/lan9118.c | 1406 +++ hw/net/lance.c | 178 + hw/net/mcf_fec.c | 480 + hw/net/milkymist-minimac2.c | 551 + hw/net/mipsnet.c | 290 + hw/net/ne2000-isa.c | 116 + hw/net/ne2000.c | 790 ++ hw/net/ne2000.h | 40 + hw/net/opencores_eth.c | 740 ++ hw/net/pcnet-pci.c | 384 + hw/net/pcnet.c | 1772 ++++ hw/net/pcnet.h | 70 + hw/net/rtl8139.c | 3581 +++++++ hw/net/smc91c111.c | 814 ++ hw/net/spapr_llan.c | 557 + hw/net/stellaris_enet.c | 462 + hw/net/vhost_net.c | 331 + hw/net/virtio-net.c | 1667 +++ hw/net/vmware_utils.h | 143 + hw/net/vmxnet3.c | 2472 +++++ hw/net/vmxnet3.h | 757 ++ hw/net/vmxnet_debug.h | 115 + hw/net/vmxnet_rx_pkt.c | 187 + hw/net/vmxnet_rx_pkt.h | 174 + hw/net/vmxnet_tx_pkt.c | 567 ++ hw/net/vmxnet_tx_pkt.h | 148 + hw/net/xen_nic.c | 439 + hw/net/xgmac.c | 440 + hw/net/xilinx_axienet.c | 1071 ++ hw/net/xilinx_ethlite.c | 269 + hw/nseries.c | 1428 --- hw/null-machine.c | 35 - hw/nvram.h | 34 - hw/nvram/Makefile.objs | 5 + hw/nvram/ds1225y.c | 170 + hw/nvram/eeprom93xx.c | 337 + hw/nvram/fw_cfg.c | 598 ++ hw/nvram/mac_nvram.c | 196 + hw/nvram/spapr_nvram.c | 200 + hw/omap.h | 1015 -- hw/omap1.c | 4053 -------- hw/omap2.c | 2684 ----- hw/omap_clk.c | 1264 --- hw/omap_dma.c | 2089 ---- hw/omap_dss.c | 1086 -- hw/omap_gpio.c | 792 -- hw/omap_gpmc.c | 894 -- hw/omap_gptimer.c | 488 - hw/omap_i2c.c | 492 - hw/omap_intc.c | 649 -- hw/omap_l4.c | 162 - hw/omap_lcd_template.h | 175 - hw/omap_lcdc.c | 489 - hw/omap_mmc.c | 641 -- hw/omap_sdrc.c | 168 - hw/omap_spi.c | 349 - hw/omap_sx1.c | 236 - hw/omap_synctimer.c | 102 - hw/omap_tap.c | 116 - hw/omap_uart.c | 187 - hw/onenand.c | 841 -- hw/opencores_eth.c | 733 -- hw/openpic.c | 1710 ---- hw/openpic.h | 18 - hw/openrisc/Makefile.objs | 5 +- hw/openrisc/cputimer.c | 103 + hw/openrisc/openrisc_sim.c | 150 + hw/openrisc/pic_cpu.c | 61 + hw/openrisc_pic.c | 60 - hw/openrisc_sim.c | 149 - hw/openrisc_timer.c | 101 - hw/palm.c | 290 - hw/pam.c | 87 - hw/pam.h | 97 - hw/parallel.c | 614 -- hw/pc.c | 1109 -- hw/pc.h | 189 - hw/pc_piix.c | 646 -- hw/pc_q35.c | 223 - hw/pc_sysfw.c | 266 - hw/pci-bridge/Makefile.objs | 5 + hw/pci-bridge/dec.c | 156 + hw/pci-bridge/dec.h | 10 + hw/pci-bridge/i82801b11.c | 130 + hw/pci-bridge/ioh3420.c | 236 + hw/pci-bridge/ioh3420.h | 10 + hw/pci-bridge/pci_bridge_dev.c | 165 + hw/pci-bridge/xio3130_downstream.c | 203 + hw/pci-bridge/xio3130_downstream.h | 11 + hw/pci-bridge/xio3130_upstream.c | 183 + hw/pci-bridge/xio3130_upstream.h | 10 + hw/pci-host/Makefile.objs | 17 + hw/pci-host/apb.c | 580 ++ hw/pci-host/bonito.c | 842 ++ hw/pci-host/grackle.c | 165 + hw/pci-host/pam.c | 89 + hw/pci-host/piix.c | 744 ++ hw/pci-host/ppce500.c | 428 + hw/pci-host/prep.c | 235 + hw/pci-host/q35.c | 390 + hw/pci-host/uninorth.c | 492 + hw/pci-host/versatile.c | 532 + hw/pci-hotplug.c | 293 - hw/pci-stub.c | 47 - hw/pci.c | 2168 ---- hw/pci.h | 684 -- hw/pci/Makefile.objs | 11 + hw/pci/msi.c | 395 + hw/pci/msix.c | 604 ++ hw/pci/pci-hotplug-old.c | 337 + hw/pci/pci-stub.c | 47 + hw/pci/pci.c | 2264 +++++ hw/pci/pci_bridge.c | 420 + hw/pci/pci_host.c | 181 + hw/pci/pcie.c | 571 ++ hw/pci/pcie_aer.c | 1031 ++ hw/pci/pcie_host.c | 162 + hw/pci/pcie_port.c | 170 + hw/pci/shpc.c | 682 ++ hw/pci/slotid_cap.c | 45 + hw/pci_bridge.c | 363 - hw/pci_bridge.h | 66 - hw/pci_bridge_dev.c | 171 - hw/pci_host.c | 180 - hw/pci_host.h | 62 - hw/pci_ids.h | 147 - hw/pci_internals.h | 78 - hw/pci_regs.h | 717 -- hw/pcie.c | 555 - hw/pcie.h | 142 - hw/pcie_aer.c | 1032 -- hw/pcie_aer.h | 106 - hw/pcie_host.c | 161 - hw/pcie_host.h | 54 - hw/pcie_port.c | 114 - hw/pcie_port.h | 51 - hw/pcie_regs.h | 156 - hw/pckbd.c | 527 - hw/pcmcia.h | 51 - hw/pcnet-pci.c | 376 - hw/pcnet.c | 1767 ---- hw/pcnet.h | 65 - hw/pcspk.c | 201 - hw/pcspk.h | 45 - hw/petalogix_ml605_mmu.c | 184 - hw/petalogix_s3adsp1800_mmu.c | 126 - hw/pflash_cfi01.c | 754 -- hw/pflash_cfi02.c | 786 -- hw/piix4.c | 132 - hw/piix_pci.c | 584 -- hw/pixel_ops.h | 53 - hw/pl011.c | 330 - hw/pl022.c | 308 - hw/pl031.c | 265 - hw/pl041.c | 647 -- hw/pl041.h | 135 - hw/pl041.hx | 81 - hw/pl050.c | 200 - hw/pl061.c | 336 - hw/pl080.c | 421 - hw/pl110.c | 532 - hw/pl110_template.h | 395 - hw/pl181.c | 515 - hw/pl190.c | 289 - hw/pm_smbus.c | 176 - hw/pm_smbus.h | 21 - hw/ppc-viosrp.h | 216 - hw/ppc.c | 1317 --- hw/ppc.h | 92 - hw/ppc/Makefile.objs | 41 +- hw/ppc/e500-ccsr.h | 17 + hw/ppc/e500.c | 409 +- hw/ppc/e500.h | 4 + hw/ppc/e500plat.c | 19 +- hw/ppc/mac.h | 184 + hw/ppc/mac_newworld.c | 488 + hw/ppc/mac_oldworld.c | 361 + hw/ppc/mpc8544_guts.c | 140 + hw/ppc/mpc8544ds.c | 9 +- hw/ppc/ppc.c | 1364 +++ hw/ppc/ppc405.h | 81 + hw/ppc/ppc405_boards.c | 662 ++ hw/ppc/ppc405_uc.c | 2548 +++++ hw/ppc/ppc440_bamboo.c | 307 + hw/ppc/ppc4xx_devs.c | 721 ++ hw/ppc/ppc4xx_pci.c | 414 + hw/ppc/ppc_booke.c | 326 + hw/ppc/ppce500_spin.c | 224 + hw/ppc/prep.c | 702 ++ hw/ppc/spapr.c | 1336 +++ hw/ppc/spapr_events.c | 321 + hw/ppc/spapr_hcall.c | 739 ++ hw/ppc/spapr_iommu.c | 336 + hw/ppc/spapr_pci.c | 868 ++ hw/ppc/spapr_rtas.c | 327 + hw/ppc/spapr_vio.c | 675 ++ hw/ppc/virtex_ml507.c | 256 + hw/ppc405.h | 81 - hw/ppc405_boards.c | 660 -- hw/ppc405_uc.c | 2540 ----- hw/ppc440_bamboo.c | 305 - hw/ppc4xx.h | 64 - hw/ppc4xx_devs.c | 721 -- hw/ppc4xx_pci.c | 414 - hw/ppc_booke.c | 254 - hw/ppc_mac.h | 81 - hw/ppc_newworld.c | 431 - hw/ppc_oldworld.c | 351 - hw/ppc_prep.c | 704 -- hw/ppce500_pci.c | 393 - hw/ppce500_spin.c | 227 - hw/prep_pci.c | 208 - hw/primecell.h | 12 - hw/ps2.c | 676 -- hw/ps2.h | 38 - hw/ptimer.c | 231 - hw/ptimer.h | 39 - hw/puv3.c | 133 - hw/puv3.h | 49 - hw/puv3_dma.c | 109 - hw/puv3_gpio.c | 141 - hw/puv3_intc.c | 135 - hw/puv3_ost.c | 151 - hw/puv3_pm.c | 149 - hw/pxa.h | 191 - hw/pxa2xx.c | 2291 ----- hw/pxa2xx_dma.c | 574 -- hw/pxa2xx_gpio.c | 349 - hw/pxa2xx_keypad.c | 335 - hw/pxa2xx_lcd.c | 1051 -- hw/pxa2xx_mmci.c | 553 - hw/pxa2xx_pcmcia.c | 207 - hw/pxa2xx_pic.c | 334 - hw/pxa2xx_template.h | 435 - hw/pxa2xx_timer.c | 536 - hw/q35.c | 309 - hw/q35.h | 150 - hw/qdev-addr.c | 77 - hw/qdev-addr.h | 5 - hw/qdev-core.h | 233 - hw/qdev-dma.h | 10 - hw/qdev-monitor.c | 616 -- hw/qdev-monitor.h | 16 - hw/qdev-properties.c | 1281 --- hw/qdev-properties.h | 130 - hw/qdev.c | 798 -- hw/qdev.h | 9 - hw/qxl-logger.c | 275 - hw/qxl-render.c | 278 - hw/qxl.c | 2340 ----- hw/qxl.h | 160 - hw/r2d.c | 357 - hw/rc4030.c | 825 -- hw/realview.c | 400 - hw/realview_gic.c | 74 - hw/rtl8139.c | 3554 ------- hw/s390-virtio-bus.c | 571 -- hw/s390-virtio-bus.h | 102 - hw/s390-virtio.c | 354 - hw/s390x/Makefile.objs | 9 +- hw/s390x/css.c | 1280 +++ hw/s390x/css.h | 100 + hw/s390x/event-facility.c | 12 +- hw/s390x/event-facility.h | 96 - hw/s390x/ipl.c | 199 + hw/s390x/s390-virtio-bus.c | 738 ++ hw/s390x/s390-virtio-bus.h | 187 + hw/s390x/s390-virtio-ccw.c | 137 + hw/s390x/s390-virtio-hcall.c | 36 + hw/s390x/s390-virtio.c | 304 + hw/s390x/s390-virtio.h | 29 + hw/s390x/sclp.c | 8 +- hw/s390x/sclp.h | 118 - hw/s390x/sclpconsole.c | 306 - hw/s390x/sclpquiesce.c | 8 +- hw/s390x/virtio-ccw.c | 1342 +++ hw/s390x/virtio-ccw.h | 184 + hw/sb16.c | 1424 --- hw/sbi.c | 156 - hw/scsi-bus.c | 1881 ---- hw/scsi-defs.h | 303 - hw/scsi-disk.c | 2501 ----- hw/scsi-generic.c | 516 - hw/scsi.h | 255 - hw/scsi/Makefile.objs | 13 + hw/scsi/esp-pci.c | 533 + hw/scsi/esp.c | 738 ++ hw/scsi/lsi53c895a.c | 2159 ++++ hw/scsi/megasas.c | 2232 ++++ hw/scsi/mfi.h | 1249 +++ hw/scsi/scsi-bus.c | 1907 ++++ hw/scsi/scsi-disk.c | 2546 +++++ hw/scsi/scsi-generic.c | 520 + hw/scsi/spapr_vscsi.c | 1109 ++ hw/scsi/srp.h | 240 + hw/scsi/vhost-scsi.c | 289 + hw/scsi/viosrp.h | 216 + hw/scsi/virtio-scsi.c | 711 ++ hw/scsi/vmw_pvscsi.c | 1217 +++ hw/scsi/vmw_pvscsi.h | 434 + hw/sd.c | 1764 ---- hw/sd.h | 80 - hw/sd/Makefile.objs | 8 + hw/sd/milkymist-memcard.c | 307 + hw/sd/omap_mmc.c | 641 ++ hw/sd/pl181.c | 520 + hw/sd/pxa2xx_mmci.c | 553 + hw/sd/sd.c | 1771 ++++ hw/sd/sdhci.c | 1300 +++ hw/sd/sdhci.h | 312 + hw/sd/ssi-sd.c | 274 + hw/serial-isa.c | 130 - hw/serial-pci.c | 252 - hw/serial.c | 797 -- hw/serial.h | 99 - hw/sga.c | 63 - hw/sh.h | 57 - hw/sh4/Makefile.objs | 7 +- hw/sh4/r2d.c | 367 + hw/sh4/sh7750.c | 843 ++ hw/sh4/sh7750_regnames.c | 97 + hw/sh4/sh7750_regnames.h | 6 + hw/sh4/sh7750_regs.h | 1277 +++ hw/sh4/sh_pci.c | 198 + hw/sh4/shix.c | 107 + hw/sh7750.c | 838 -- hw/sh7750_regnames.c | 97 - hw/sh7750_regnames.h | 6 - hw/sh7750_regs.h | 1277 --- hw/sh_intc.c | 511 - hw/sh_intc.h | 83 - hw/sh_pci.c | 186 - hw/sh_serial.c | 408 - hw/sh_timer.c | 333 - hw/sharpsl.h | 17 - hw/shix.c | 102 - hw/shpc.c | 681 -- hw/shpc.h | 48 - hw/slavio_intctl.c | 471 - hw/slavio_misc.c | 508 - hw/slavio_timer.c | 435 - hw/slotid_cap.c | 44 - hw/slotid_cap.h | 11 - hw/sm501.c | 1447 --- hw/sm501_template.h | 145 - hw/smbios.c | 241 - hw/smbios.h | 162 - hw/smbus.c | 335 - hw/smbus.h | 83 - hw/smbus_eeprom.c | 156 - hw/smbus_ich9.c | 159 - hw/smc91c111.c | 805 -- hw/soc_dma.c | 366 - hw/soc_dma.h | 110 - hw/spapr.c | 937 -- hw/spapr.h | 356 - hw/spapr_events.c | 321 - hw/spapr_hcall.c | 745 -- hw/spapr_iommu.c | 287 - hw/spapr_llan.c | 523 - hw/spapr_pci.c | 771 -- hw/spapr_pci.h | 86 - hw/spapr_rtas.c | 332 - hw/spapr_vio.c | 666 -- hw/spapr_vio.h | 136 - hw/spapr_vscsi.c | 983 -- hw/spapr_vty.c | 221 - hw/sparc/Makefile.objs | 9 +- hw/sparc/leon3.c | 227 + hw/sparc/sun4m.c | 1506 +++ hw/sparc32_dma.c | 315 - hw/sparc32_dma.h | 12 - hw/sparc64/Makefile.objs | 5 +- hw/sparc64/sun4u.c | 1028 ++ hw/spitz.c | 1134 --- hw/srp.h | 240 - hw/ssd0303.c | 321 - hw/ssd0323.c | 372 - hw/ssi-sd.c | 274 - hw/ssi.c | 174 - hw/ssi.h | 93 - hw/ssi/Makefile.objs | 6 + hw/ssi/omap_spi.c | 373 + hw/ssi/pl022.c | 313 + hw/ssi/ssi.c | 174 + hw/ssi/xilinx_spi.c | 391 + hw/ssi/xilinx_spips.c | 772 ++ hw/stellaris.c | 1399 --- hw/stellaris_enet.c | 449 - hw/stellaris_input.c | 89 - hw/stream.c | 23 - hw/stream.h | 31 - hw/strongarm.c | 1622 --- hw/strongarm.h | 68 - hw/sun4c_intctl.c | 208 - hw/sun4m.c | 1927 ---- hw/sun4m.h | 36 - hw/sun4m_iommu.c | 388 - hw/sun4u.c | 1012 -- hw/sysbus.c | 297 - hw/sysbus.h | 89 - hw/tc58128.c | 178 - hw/tc6393xb.c | 587 -- hw/tc6393xb_template.h | 67 - hw/tcx.c | 730 -- hw/timer/Makefile.objs | 29 + hw/timer/arm_mptimer.c | 316 + hw/timer/arm_timer.c | 411 + hw/timer/cadence_ttc.c | 495 + hw/timer/ds1338.c | 236 + hw/timer/etraxfs_timer.c | 357 + hw/timer/exynos4210_mct.c | 1486 +++ hw/timer/exynos4210_pwm.c | 426 + hw/timer/exynos4210_rtc.c | 596 ++ hw/timer/grlib_gptimer.c | 410 + hw/timer/hpet.c | 773 ++ hw/timer/i8254.c | 377 + hw/timer/i8254_common.c | 302 + hw/timer/imx_epit.c | 432 + hw/timer/imx_gpt.c | 557 + hw/timer/lm32_timer.c | 235 + hw/timer/m48t59.c | 795 ++ hw/timer/mc146818rtc.c | 924 ++ hw/timer/milkymist-sysctl.c | 342 + hw/timer/omap_gptimer.c | 488 + hw/timer/omap_synctimer.c | 102 + hw/timer/pl031.c | 269 + hw/timer/puv3_ost.c | 155 + hw/timer/pxa2xx_timer.c | 599 ++ hw/timer/sh_timer.c | 333 + hw/timer/slavio_timer.c | 440 + hw/timer/tusb6010.c | 819 ++ hw/timer/twl92230.c | 882 ++ hw/timer/xilinx_timer.c | 260 + hw/tmp105.c | 253 - hw/tosa.c | 301 - hw/tpm/Makefile.objs | 2 + hw/tpm/tpm_int.h | 67 + hw/tpm/tpm_passthrough.c | 552 + hw/tpm/tpm_tis.c | 931 ++ hw/tpm/tpm_tis.h | 75 + hw/tsc2005.c | 593 -- hw/tsc210x.c | 1293 --- hw/tusb6010.c | 813 -- hw/twl92230.c | 882 -- hw/unicore32/Makefile.objs | 2 - hw/unicore32/puv3.c | 139 + hw/unin_pci.c | 492 - hw/usb.h | 547 - hw/usb/Makefile.objs | 38 +- hw/usb/bus.c | 58 +- hw/usb/ccid-card-emulated.c | 612 ++ hw/usb/ccid-card-passthru.c | 413 + hw/usb/ccid.h | 65 + hw/usb/combined-packet.c | 2 +- hw/usb/core.c | 43 +- hw/usb/desc.c | 17 +- hw/usb/dev-audio.c | 4 +- hw/usb/dev-bluetooth.c | 7 +- hw/usb/dev-hid.c | 113 +- hw/usb/dev-hub.c | 23 +- hw/usb/dev-network.c | 36 +- hw/usb/dev-serial.c | 21 +- hw/usb/dev-smartcard-reader.c | 258 +- hw/usb/dev-storage.c | 131 +- hw/usb/dev-uas.c | 260 +- hw/usb/dev-wacom.c | 9 +- hw/usb/hcd-ehci-pci.c | 70 +- hw/usb/hcd-ehci-sysbus.c | 179 +- hw/usb/hcd-ehci.c | 481 +- hw/usb/hcd-ehci.h | 85 +- hw/usb/hcd-musb.c | 4 +- hw/usb/hcd-ohci.c | 286 +- hw/usb/hcd-uhci.c | 217 +- hw/usb/hcd-xhci.c | 784 ++- hw/usb/host-bsd.c | 13 +- hw/usb/host-legacy.c | 144 + hw/usb/host-libusb.c | 1528 +++ hw/usb/host-linux.c | 157 +- hw/usb/host-stub.c | 11 +- hw/usb/host.h | 44 + hw/usb/libhw.c | 8 +- hw/usb/quirks-ftdi-ids.h | 1255 +++ hw/usb/quirks-pl2303-ids.h | 150 + hw/usb/quirks.c | 53 + hw/usb/quirks.h | 910 ++ hw/usb/redirect.c | 525 +- hw/versatile_i2c.c | 107 - hw/versatile_pci.c | 164 - hw/versatilepb.c | 401 - hw/vexpress.c | 498 - hw/vfio_pci.c | 2138 ---- hw/vga-isa-mm.c | 143 - hw/vga-isa.c | 101 - hw/vga-pci.c | 215 - hw/vga.c | 2450 ----- hw/vga.h | 159 - hw/vga_int.h | 214 - hw/vga_template.h | 459 - hw/vhost.c | 964 -- hw/vhost.h | 56 - hw/vhost_net.c | 237 - hw/vhost_net.h | 20 - hw/virtex_ml507.c | 274 - hw/virtio-balloon.c | 274 - hw/virtio-balloon.h | 55 - hw/virtio-blk.c | 658 -- hw/virtio-blk.h | 114 - hw/virtio-console.c | 182 - hw/virtio-net.c | 1103 -- hw/virtio-net.h | 190 - hw/virtio-pci.c | 1131 --- hw/virtio-pci.h | 62 - hw/virtio-rng.c | 205 - hw/virtio-rng.h | 28 - hw/virtio-scsi.c | 744 -- hw/virtio-scsi.h | 43 - hw/virtio-serial-bus.c | 1045 -- hw/virtio-serial.h | 208 - hw/virtio.c | 1058 -- hw/virtio.h | 247 - hw/virtio/Makefile.objs | 8 + hw/virtio/dataplane/Makefile.objs | 1 + hw/virtio/dataplane/hostmem.c | 183 + hw/virtio/dataplane/vring.c | 366 + hw/virtio/vhost.c | 1072 ++ hw/virtio/virtio-balloon.c | 414 + hw/virtio/virtio-bus.c | 190 + hw/virtio/virtio-mmio.c | 425 + hw/virtio/virtio-pci.c | 1562 +++ hw/virtio/virtio-pci.h | 206 + hw/virtio/virtio-rng.c | 236 + hw/virtio/virtio.c | 1199 +++ hw/vmmouse.c | 302 - hw/vmport.c | 170 - hw/vmware_vga.c | 1259 --- hw/vt82c686.c | 559 -- hw/vt82c686.h | 11 - hw/watchdog.c | 147 - hw/watchdog.h | 43 - hw/watchdog/Makefile.objs | 3 + hw/watchdog/watchdog.c | 146 + hw/watchdog/wdt_i6300esb.c | 470 + hw/watchdog/wdt_ib700.c | 156 + hw/wdt_i6300esb.c | 455 - hw/wdt_ib700.c | 145 - hw/wm8750.c | 716 -- hw/xen-host-pci-device.c | 396 - hw/xen-host-pci-device.h | 55 - hw/xen.h | 58 - hw/xen/Makefile.objs | 6 + hw/xen/xen-host-pci-device.c | 396 + hw/xen/xen-host-pci-device.h | 55 + hw/xen/xen_apic.c | 95 + hw/xen/xen_backend.c | 800 ++ hw/xen/xen_devconfig.c | 174 + hw/xen/xen_platform.c | 449 + hw/xen/xen_pt.c | 850 ++ hw/xen/xen_pt.h | 302 + hw/xen/xen_pt_config_init.c | 1882 ++++ hw/xen/xen_pt_msi.c | 621 ++ hw/xen/xen_pvdevice.c | 131 + hw/xen_apic.c | 95 - hw/xen_backend.c | 800 -- hw/xen_backend.h | 110 - hw/xen_blkif.h | 103 - hw/xen_common.h | 160 - hw/xen_console.c | 295 - hw/xen_devconfig.c | 174 - hw/xen_disk.c | 985 -- hw/xen_domainbuild.c | 299 - hw/xen_domainbuild.h | 13 - hw/xen_machine_pv.c | 125 - hw/xen_nic.c | 439 - hw/xen_platform.c | 436 - hw/xen_pt.c | 844 -- hw/xen_pt.h | 302 - hw/xen_pt_config_init.c | 1882 ---- hw/xen_pt_msi.c | 620 -- hw/xenfb.c | 1025 -- hw/xgmac.c | 433 - hw/xics.c | 573 -- hw/xics.h | 39 - hw/xilinx.h | 92 - hw/xilinx_axidma.c | 524 - hw/xilinx_axienet.c | 910 -- hw/xilinx_ethlite.c | 258 - hw/xilinx_intc.c | 190 - hw/xilinx_spi.c | 385 - hw/xilinx_spips.c | 575 -- hw/xilinx_timer.c | 255 - hw/xilinx_uartlite.c | 234 - hw/xilinx_zynq.c | 213 - hw/xio3130_downstream.c | 217 - hw/xio3130_downstream.h | 11 - hw/xio3130_upstream.c | 192 - hw/xio3130_upstream.h | 10 - hw/xtensa/Makefile.objs | 4 +- hw/xtensa/pic_cpu.c | 166 + hw/xtensa/xtensa_bootparam.h | 25 + hw/xtensa/xtensa_lx60.c | 317 + hw/xtensa/xtensa_sim.c | 119 + hw/xtensa_bootparam.h | 25 - hw/xtensa_lx60.c | 312 - hw/xtensa_pic.c | 164 - hw/xtensa_sim.c | 116 - hw/z2.c | 383 - hw/zaurus.c | 292 - hw/zynq_slcr.c | 535 - hwaddr.h | 24 - i386-dis.c | 6562 ------------ i386.ld | 153 - ia64-dis.c |10602 -------------------- ia64.ld | 209 - include/block/aio.h | 254 + include/block/block.h | 445 + include/block/block_int.h | 423 + include/block/blockjob.h | 278 + include/block/coroutine.h | 223 + include/block/coroutine_int.h | 53 + include/block/nbd.h | 101 + include/block/qapi.h | 47 + include/block/scsi.h | 307 + include/block/snapshot.h | 53 + include/block/thread-pool.h | 41 + include/config.h | 2 + include/disas/bfd.h | 485 + include/disas/disas.h | 43 + include/elf.h | 1443 +++ include/exec/address-spaces.h | 41 + include/exec/cpu-all.h | 494 + include/exec/cpu-common.h | 124 + include/exec/cpu-defs.h | 184 + include/exec/cputlb.h | 48 + include/exec/def-helper.h | 275 + include/exec/exec-all.h | 453 + include/exec/gdbstub.h | 98 + include/exec/gen-icount.h | 65 + include/exec/hwaddr.h | 20 + include/exec/ioport.h | 74 + include/exec/memory-internal.h | 124 + include/exec/memory.h | 1061 ++ include/exec/poison.h | 62 + include/exec/softmmu-semi.h | 79 + include/exec/softmmu_defs.h | 37 + include/exec/softmmu_exec.h | 163 + include/exec/softmmu_header.h | 213 + include/exec/softmmu_template.h | 328 + include/exec/spinlock.h | 49 + include/exec/user/abitypes.h | 70 + include/exec/user/thunk.h | 189 + include/fpu/softfloat.h | 641 ++ include/glib-compat.h | 27 + include/hw/acpi/acpi.h | 170 + include/hw/acpi/ich9.h | 52 + include/hw/arm/arm.h | 74 + include/hw/arm/exynos4210.h | 137 + include/hw/arm/imx.h | 34 + include/hw/arm/omap.h | 1015 ++ include/hw/arm/primecell.h | 12 + include/hw/arm/pxa.h | 191 + include/hw/arm/sharpsl.h | 17 + include/hw/arm/soc_dma.h | 116 + include/hw/audio/audio.h | 10 + include/hw/audio/pcspk.h | 47 + include/hw/block/block.h | 79 + include/hw/block/fdc.h | 26 + include/hw/block/flash.h | 64 + include/hw/boards.h | 56 + include/hw/bt.h | 2190 ++++ include/hw/char/escc.h | 14 + include/hw/char/lm32_juart.h | 13 + include/hw/char/serial.h | 97 + include/hw/cpu/icc_bus.h | 82 + include/hw/cris/etraxfs.h | 51 + include/hw/cris/etraxfs_dma.h | 34 + include/hw/devices.h | 70 + include/hw/elf_ops.h | 309 + include/hw/empty_slot.h | 7 + include/hw/hw.h | 75 + include/hw/i2c/i2c.h | 88 + include/hw/i2c/pm_smbus.h | 20 + include/hw/i2c/smbus.h | 83 + include/hw/i386/apic-msidef.h | 30 + include/hw/i386/apic.h | 32 + include/hw/i386/apic_internal.h | 147 + include/hw/i386/ich9.h | 219 + include/hw/i386/ioapic.h | 28 + include/hw/i386/ioapic_internal.h | 102 + include/hw/i386/pc.h | 319 + include/hw/i386/smbios.h | 162 + include/hw/ide.h | 32 + include/hw/input/adb.h | 87 + include/hw/input/hid.h | 84 + include/hw/input/ps2.h | 38 + include/hw/irq.h | 57 + include/hw/isa/apm.h | 25 + include/hw/isa/i8259_internal.h | 83 + include/hw/isa/isa.h | 106 + include/hw/isa/pc87312.h | 68 + include/hw/isa/vt82c686.h | 11 + include/hw/kvm/clock.h | 24 + include/hw/lm32/lm32_pic.h | 14 + include/hw/loader.h | 66 + include/hw/m68k/mcf.h | 30 + include/hw/mips/bios.h | 8 + include/hw/mips/cpudevs.h | 15 + include/hw/mips/mips.h | 32 + include/hw/misc/tmp105_regs.h | 50 + include/hw/nvram/eeprom93xx.h | 40 + include/hw/nvram/fw_cfg.h | 80 + include/hw/nvram/openbios_firmware_abi.h | 73 + include/hw/pci-host/apb.h | 10 + include/hw/pci-host/pam.h | 97 + include/hw/pci-host/ppce500.h | 9 + include/hw/pci-host/q35.h | 159 + include/hw/pci-host/spapr.h | 93 + include/hw/pci/msi.h | 50 + include/hw/pci/msix.h | 57 + include/hw/pci/pci.h | 729 ++ include/hw/pci/pci_bridge.h | 66 + include/hw/pci/pci_bus.h | 83 + include/hw/pci/pci_host.h | 73 + include/hw/pci/pci_ids.h | 156 + include/hw/pci/pci_regs.h | 717 ++ include/hw/pci/pcie.h | 143 + include/hw/pci/pcie_aer.h | 106 + include/hw/pci/pcie_host.h | 54 + include/hw/pci/pcie_port.h | 61 + include/hw/pci/pcie_regs.h | 156 + include/hw/pci/shpc.h | 48 + include/hw/pci/slotid_cap.h | 11 + include/hw/pcmcia.h | 56 + include/hw/ppc/mac_dbdma.h | 172 + include/hw/ppc/openpic.h | 32 + include/hw/ppc/ppc.h | 98 + include/hw/ppc/ppc4xx.h | 64 + include/hw/ppc/ppc_e500.h | 6 + include/hw/ppc/spapr.h | 377 + include/hw/ppc/spapr_vio.h | 142 + include/hw/ppc/xics.h | 103 + include/hw/ptimer.h | 39 + include/hw/qdev-core.h | 327 + include/hw/qdev-dma.h | 10 + include/hw/qdev-properties.h | 198 + include/hw/qdev.h | 8 + include/hw/s390x/event-facility.h | 96 + include/hw/s390x/sclp.h | 118 + include/hw/scsi/esp.h | 132 + include/hw/scsi/scsi.h | 257 + include/hw/sd.h | 80 + include/hw/sh4/sh.h | 57 + include/hw/sh4/sh_intc.h | 83 + include/hw/sparc/grlib.h | 126 + include/hw/sparc/sparc32_dma.h | 12 + include/hw/sparc/sun4m.h | 38 + include/hw/ssi.h | 93 + include/hw/stream.h | 57 + include/hw/sysbus.h | 96 + include/hw/timer/hpet.h | 74 + include/hw/timer/i8254.h | 75 + include/hw/timer/i8254_internal.h | 84 + include/hw/timer/m48t59.h | 37 + include/hw/timer/mc146818rtc.h | 13 + include/hw/timer/mc146818rtc_regs.h | 67 + include/hw/unicore32/puv3.h | 49 + include/hw/usb.h | 572 ++ include/hw/virtio/dataplane/hostmem.h | 58 + include/hw/virtio/dataplane/vring.h | 62 + include/hw/virtio/vhost-scsi.h | 73 + include/hw/virtio/vhost.h | 71 + include/hw/virtio/virtio-9p.h | 24 + include/hw/virtio/virtio-balloon.h | 72 + include/hw/virtio/virtio-blk.h | 153 + include/hw/virtio/virtio-bus.h | 101 + include/hw/virtio/virtio-net.h | 277 + include/hw/virtio/virtio-rng.h | 59 + include/hw/virtio/virtio-scsi.h | 192 + include/hw/virtio/virtio-serial.h | 254 + include/hw/virtio/virtio.h | 252 + include/hw/xen/xen.h | 57 + include/hw/xen/xen_backend.h | 109 + include/hw/xen/xen_common.h | 160 + include/hw/xilinx.h | 96 + include/migration/block.h | 23 + include/migration/migration.h | 165 + include/migration/page_cache.h | 80 + include/migration/qemu-file.h | 266 + include/migration/vmstate.h | 740 ++ include/monitor/monitor.h | 104 + include/monitor/qdev.h | 15 + include/monitor/readline.h | 55 + include/net/checksum.h | 53 + include/net/eth.h | 347 + include/net/net.h | 201 + include/net/queue.h | 58 + include/net/slirp.h | 47 + include/net/tap.h | 69 + include/net/vhost_net.h | 23 + include/qapi/dealloc-visitor.h | 26 + include/qapi/error.h | 85 + include/qapi/opts-visitor.h | 31 + include/qapi/qmp-input-visitor.h | 29 + include/qapi/qmp-output-visitor.h | 28 + include/qapi/qmp/dispatch.h | 55 + include/qapi/qmp/json-lexer.h | 51 + include/qapi/qmp/json-parser.h | 24 + include/qapi/qmp/json-streamer.h | 40 + include/qapi/qmp/qbool.h | 29 + include/qapi/qmp/qdict.h | 70 + include/qapi/qmp/qerror.h | 249 + include/qapi/qmp/qfloat.h | 29 + include/qapi/qmp/qint.h | 28 + include/qapi/qmp/qjson.h | 29 + include/qapi/qmp/qlist.h | 63 + include/qapi/qmp/qobject.h | 113 + include/qapi/qmp/qstring.h | 36 + include/qapi/qmp/types.h | 25 + include/qapi/string-input-visitor.h | 25 + include/qapi/string-output-visitor.h | 26 + include/qapi/visitor-impl.h | 69 + include/qapi/visitor.h | 64 + include/qemu-common.h | 478 + include/qemu-io.h | 46 + include/qemu/acl.h | 74 + include/qemu/aes.h | 45 + include/qemu/atomic.h | 202 + include/qemu/bitmap.h | 222 + include/qemu/bitops.h | 326 + include/qemu/bswap.h | 478 + include/qemu/cache-utils.h | 44 + include/qemu/compatfd.h | 44 + include/qemu/compiler.h | 55 + include/qemu/config-file.h | 24 + include/qemu/cpu.h | 140 - include/qemu/crc32c.h | 35 + include/qemu/envlist.h | 22 + include/qemu/error-report.h | 46 + include/qemu/event_notifier.h | 46 + include/qemu/fifo8.h | 99 + include/qemu/hbitmap.h | 209 + include/qemu/host-utils.h | 322 + include/qemu/int128.h | 144 + include/qemu/iov.h | 115 + include/qemu/log.h | 184 + include/qemu/main-loop.h | 311 + include/qemu/module.h | 40 + include/qemu/notify.h | 72 + include/qemu/object.h | 1003 -- include/qemu/option.h | 160 + include/qemu/option_int.h | 54 + include/qemu/osdep.h | 218 + include/qemu/page_cache.h | 79 - include/qemu/qom-qobject.h | 42 - include/qemu/queue.h | 414 + include/qemu/range.h | 45 + include/qemu/rng-random.h | 22 - include/qemu/rng.h | 93 - include/qemu/sockets.h | 83 + include/qemu/thread-posix.h | 28 + include/qemu/thread-win32.h | 29 + include/qemu/thread.h | 56 + include/qemu/timer.h | 305 + include/qemu/tls.h | 52 + include/qemu/typedefs.h | 69 + include/qemu/uri.h | 113 + include/qemu/xattr.h | 30 + include/qom/cpu.h | 524 + include/qom/object.h | 1137 +++ include/qom/qom-qobject.h | 42 + include/sysemu/arch_init.h | 40 + include/sysemu/balloon.h | 29 + include/sysemu/blockdev.h | 69 + include/sysemu/bt.h | 20 + include/sysemu/char.h | 301 + include/sysemu/cpus.h | 29 + include/sysemu/device_tree.h | 113 + include/sysemu/dma.h | 219 + include/sysemu/dump.h | 28 + include/sysemu/kvm.h | 317 + include/sysemu/memory_mapping.h | 82 + include/sysemu/os-posix.h | 52 + include/sysemu/os-win32.h | 114 + include/sysemu/qtest.h | 53 + include/sysemu/rng-random.h | 22 + include/sysemu/rng.h | 93 + include/sysemu/seccomp.h | 22 + include/sysemu/sysemu.h | 199 + include/sysemu/tpm.h | 23 + include/sysemu/tpm_backend.h | 210 + include/sysemu/tpm_backend_int.h | 45 + include/sysemu/watchdog.h | 43 + include/sysemu/xen-mapcache.h | 56 + include/trace.h | 6 + include/ui/console.h | 344 + include/ui/pixel_ops.h | 53 + include/ui/qemu-pixman.h | 56 + include/ui/qemu-spice.h | 88 + include/ui/spice-display.h | 137 + input.c | 530 - int128.h | 116 - iohandler.c | 47 +- ioport.c | 387 +- ioport.h | 78 - iorange.h | 31 - iov.c | 356 - iov.h | 97 - json-lexer.c | 373 - json-lexer.h | 51 - json-parser.c | 704 -- json-parser.h | 24 - json-streamer.c | 122 - json-streamer.h | 40 - kvm-all.c | 476 +- kvm-stub.c | 55 +- kvm.h | 280 - libcacard/Makefile | 64 +- libcacard/cac.c | 80 +- libcacard/cac.h | 8 + libcacard/event.c | 2 +- libcacard/libcacard.syms | 77 + libcacard/vcard_emul_nss.c | 71 +- libcacard/vcardt.c | 40 + libcacard/vcardt.h | 5 - libcacard/vcardt_internal.h | 6 + libcacard/vreader.c | 81 +- libcacard/vscclient.c | 521 +- libfdt_env.h | 36 - linux-headers/asm-arm/kvm.h | 180 + linux-headers/asm-arm/kvm_para.h | 1 + linux-headers/asm-generic/kvm_para.h | 4 + linux-headers/asm-mips/kvm.h | 138 + linux-headers/asm-mips/kvm_para.h | 1 + linux-headers/asm-powerpc/epapr_hcalls.h | 98 + linux-headers/asm-powerpc/kvm.h | 186 +- linux-headers/asm-powerpc/kvm_para.h | 13 +- linux-headers/asm-x86/kvm.h | 1 - linux-headers/linux/kvm.h | 110 +- linux-headers/linux/kvm_para.h | 6 +- linux-headers/linux/vfio.h | 16 +- linux-headers/linux/vhost.h | 28 + linux-headers/linux/virtio_config.h | 6 +- linux-headers/linux/virtio_ring.h | 6 +- linux-user/alpha/target_cpu.h | 36 + linux-user/arm/nwfpe/double_cpdo.c | 2 +- linux-user/arm/nwfpe/extended_cpdo.c | 2 +- linux-user/arm/nwfpe/fpa11.h | 2 +- linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +- linux-user/arm/nwfpe/fpa11_cprt.c | 2 +- linux-user/arm/nwfpe/fpopcode.c | 2 +- linux-user/arm/nwfpe/single_cpdo.c | 2 +- linux-user/arm/syscall.h | 2 + linux-user/arm/syscall_nr.h | 4 +- linux-user/arm/target_cpu.h | 35 + linux-user/cpu-uname.c | 10 +- linux-user/cris/syscall.h | 7 + linux-user/cris/target_cpu.h | 36 + linux-user/elfload.c | 198 +- linux-user/i386/syscall.h | 2 + linux-user/i386/syscall_nr.h | 4 +- linux-user/i386/target_cpu.h | 48 + linux-user/ioctls.h | 6 +- linux-user/linuxload.c | 3 +- linux-user/m68k/target_cpu.h | 38 + linux-user/main.c | 528 +- linux-user/microblaze/syscall.h | 8 + linux-user/microblaze/target_cpu.h | 35 + linux-user/mips/syscall.h | 2 + linux-user/mips/target_cpu.h | 36 + linux-user/mips64/syscall.h | 20 +- linux-user/mips64/syscall_nr.h | 920 ++- linux-user/mips64/target_cpu.h | 1 + linux-user/mipsn32/syscall.h | 224 - linux-user/mipsn32/syscall_nr.h | 311 - linux-user/mipsn32/target_signal.h | 29 - linux-user/mipsn32/termbits.h | 245 - linux-user/mmap.c | 15 +- linux-user/openrisc/target_cpu.h | 38 + linux-user/ppc/syscall.h | 2 + linux-user/ppc/target_cpu.h | 41 + linux-user/qemu-types.h | 36 - linux-user/qemu.h | 94 +- linux-user/s390x/syscall.h | 4 +- linux-user/s390x/target_cpu.h | 39 + linux-user/sh4/target_cpu.h | 35 + linux-user/signal.c | 348 +- linux-user/socket.h | 450 +- linux-user/sparc/syscall.h | 7 + linux-user/sparc/syscall_nr.h | 6 +- linux-user/sparc/target_cpu.h | 44 + linux-user/sparc64/syscall.h | 7 + linux-user/sparc64/target_cpu.h | 1 + linux-user/strace.c | 107 +- linux-user/strace.list | 6 - linux-user/syscall.c | 915 +- linux-user/syscall_defs.h | 80 +- linux-user/unicore32/syscall_nr.h | 4 +- linux-user/unicore32/target_cpu.h | 27 + linux-user/x86_64/target_cpu.h | 1 + lm32-dis.c | 361 - m68k-dis.c | 5051 ---------- m68k.ld | 175 - main-loop.c | 215 +- main-loop.h | 306 - memory-internal.h | 141 - memory.c | 736 +- memory.h | 882 -- memory_mapping-stub.c | 33 - memory_mapping.c | 154 +- memory_mapping.h | 64 - microblaze-dis.c | 1100 -- migration-exec.c | 49 +- migration-fd.c | 60 +- migration-rdma.c | 3430 +++++++ migration-tcp.c | 41 +- migration-unix.c | 41 +- migration.c | 416 +- migration.h | 131 - mips-dis.c | 4873 --------- mips.ld | 222 - module.c | 81 - module.h | 40 - monitor.c | 482 +- monitor.h | 102 - nbd.c | 67 +- nbd.h | 100 - net.c | 1055 -- net.h | 186 - net/Makefile.objs | 3 +- net/checksum.c | 42 +- net/checksum.h | 29 - net/clients.h | 2 +- net/dump.c | 6 +- net/eth.c | 217 + net/hub.c | 22 +- net/hub.h | 3 +- net/net.c | 1250 +++ net/queue.c | 19 +- net/queue.h | 58 - net/slirp.c | 22 +- net/slirp.h | 47 - net/socket.c | 54 +- net/tap-aix.c | 21 +- net/tap-bsd.c | 27 +- net/tap-haiku.c | 20 +- net/tap-linux.c | 92 +- net/tap-linux.h | 31 +- net/tap-solaris.c | 24 +- net/tap-win32.c | 34 +- net/tap.c | 368 +- net/tap.h | 58 - net/tap_int.h | 50 + net/util.c | 2 +- net/vde.c | 8 +- notify.c | 41 - notify.h | 43 - os-posix.c | 14 +- os-win32.c | 31 +- osdep.c | 402 - osdep.h | 178 - oslib-posix.c | 228 - oslib-win32.c | 152 - page_cache.c | 28 +- path.c | 181 - pc-bios/README | 8 +- pc-bios/acpi-dsdt.aml | Bin 4521 -> 4407 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/efi-e1000.rom | Bin 0 -> 173568 bytes pc-bios/efi-eepro100.rom | Bin 0 -> 174592 bytes pc-bios/efi-ne2k_pci.rom | Bin 0 -> 173056 bytes pc-bios/efi-pcnet.rom | Bin 0 -> 173056 bytes pc-bios/efi-rtl8139.rom | Bin 0 -> 176640 bytes pc-bios/efi-virtio.rom | Bin 0 -> 171008 bytes pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/openbios-ppc | Bin 729908 -> 733976 bytes pc-bios/openbios-sparc32 | Bin 381764 -> 381484 bytes pc-bios/openbios-sparc64 | Bin 1598648 -> 1598328 bytes pc-bios/optionrom/multiboot.S | 75 +- pc-bios/optionrom/optionrom.h | 2 +- pc-bios/palcode-clipper | Bin 185703 -> 133550 bytes pc-bios/q35-acpi-dsdt.aml | Bin 7458 -> 7344 bytes pc-bios/qemu-nsis.bmp | Bin 0 -> 154542 bytes pc-bios/qemu-nsis.ico | Bin 0 -> 4846 bytes pc-bios/qemu_logo_no_text.svg | 976 ++ pc-bios/s390-ccw.img | Bin 0 -> 9432 bytes pc-bios/s390-ccw/Makefile | 26 + pc-bios/s390-ccw/bootmap.c | 235 + pc-bios/s390-ccw/cio.h | 342 + pc-bios/s390-ccw/main.c | 80 + pc-bios/s390-ccw/s390-ccw.h | 135 + pc-bios/s390-ccw/sclp-ascii.c | 81 + pc-bios/s390-ccw/sclp.h | 107 + pc-bios/s390-ccw/start.S | 33 + pc-bios/s390-ccw/virtio.c | 321 + pc-bios/s390-ccw/virtio.h | 163 + pc-bios/slof.bin | Bin 878640 -> 909720 bytes pci-ids.txt | 31 - po/Makefile | 49 + po/de_DE.po | 64 + po/fr_FR.po | 62 + po/hu.po | 63 + po/it.po | 64 + po/messages.po | 61 + po/tr.po | 62 + poison.h | 64 - ppc-dis.c | 5412 ---------- ppc.ld | 237 - ppc64.ld | 230 - qapi-schema-guest.json | 517 - qapi-schema-test.json | 38 - qapi-schema.json | 889 ++- qapi/Makefile.objs | 8 +- qapi/opts-visitor.c | 10 +- qapi/opts-visitor.h | 31 - qapi/qapi-dealloc-visitor.c | 7 +- qapi/qapi-dealloc-visitor.h | 26 - qapi/qapi-types-core.h | 21 - qapi/qapi-visit-core.c | 42 +- qapi/qapi-visit-core.h | 95 - qapi/qapi-visit-impl.h | 23 - qapi/qmp-core.h | 55 - qapi/qmp-dispatch.c | 10 +- qapi/qmp-input-visitor.c | 57 +- qapi/qmp-input-visitor.h | 29 - qapi/qmp-output-visitor.c | 10 +- qapi/qmp-output-visitor.h | 28 - qapi/qmp-registry.c | 6 +- qapi/string-input-visitor.c | 6 +- qapi/string-input-visitor.h | 25 - qapi/string-output-visitor.c | 6 +- qapi/string-output-visitor.h | 26 - qbool.c | 68 - qbool.h | 29 - qdev-monitor.c | 716 ++ qdict.c | 456 - qdict.h | 67 - qemu-aio.h | 243 - qemu-barrier.h | 67 - qemu-bridge-helper.c | 20 +- qemu-char.c | 2184 +++-- qemu-char.h | 254 - qemu-common.h | 471 - qemu-config.c | 939 -- qemu-config.h | 29 - qemu-coroutine-int.h | 49 - qemu-coroutine-io.c | 29 +- qemu-coroutine-lock.c | 87 +- qemu-coroutine-sleep.c | 4 +- qemu-coroutine.c | 68 +- qemu-coroutine.h | 211 - qemu-doc.texi | 103 +- qemu-error.c | 215 - qemu-error.h | 41 - qemu-file.h | 241 - qemu-ga.c | 901 -- qemu-img-cmds.hx | 34 +- qemu-img.c | 873 ++- qemu-img.texi | 61 +- qemu-io-cmds.c | 2118 ++++ qemu-io.c | 1890 +---- qemu-lock.h | 49 - qemu-log.c | 57 +- qemu-log.h | 160 - qemu-nbd.c | 24 +- qemu-nbd.texi | 11 +- qemu-objects.h | 25 - qemu-option-internal.h | 53 - qemu-option.c | 1112 -- qemu-option.h | 156 - qemu-options.hx | 937 +- qemu-os-posix.h | 51 - qemu-os-win32.h | 99 - qemu-pixman.c | 80 - qemu-pixman.h | 39 - qemu-progress.c | 150 - qemu-queue.h | 414 - qemu-seccomp.c | 27 +- qemu-seccomp.h | 22 - qemu-sockets.c | 970 -- qemu-thread-posix.c | 326 - qemu-thread-posix.h | 28 - qemu-thread-win32.c | 371 - qemu-thread-win32.h | 29 - qemu-thread.h | 56 - qemu-timer-common.c | 63 - qemu-timer.c | 35 +- qemu-timer.h | 310 - qemu-tls.h | 52 - qemu-tool.c | 115 - qemu-user.c | 37 - qemu-x509.h | 9 - qemu-xattr.h | 30 - qemu.nsi | 250 + qemu.sasl | 2 +- qemu_socket.h | 77 - qerror.c | 156 - qerror.h | 252 - qfloat.c | 68 - qfloat.h | 29 - qga/Makefile.objs | 2 +- qga/channel-posix.c | 21 +- qga/channel-win32.c | 4 +- qga/commands-posix.c | 750 ++- qga/commands-win32.c | 75 +- qga/commands.c | 4 +- qga/guest-agent-core.h | 4 +- qga/main.c | 1195 +++ qga/qapi-schema.json | 640 ++ qga/service-win32.c | 118 +- qga/service-win32.h | 3 +- qint.c | 67 - qint.h | 28 - qjson.c | 294 - qjson.h | 29 - qlist.c | 170 - qlist.h | 65 - qmp-commands.hx | 539 +- qmp.c | 14 +- qobject.h | 112 - qobject/Makefile.objs | 3 + qobject/json-lexer.c | 373 + qobject/json-parser.c | 724 ++ qobject/json-streamer.c | 122 + qobject/qbool.c | 68 + qobject/qdict.c | 529 + qobject/qerror.c | 156 + qobject/qfloat.c | 68 + qobject/qint.c | 67 + qobject/qjson.c | 284 + qobject/qlist.c | 170 + qobject/qstring.c | 149 + qom/Makefile.objs | 6 +- qom/container.c | 6 +- qom/cpu.c | 234 +- qom/object.c | 165 +- qom/qom-qobject.c | 6 +- qstring.c | 141 - qstring.h | 35 - qtest.c | 118 +- qtest.h | 53 - range.h | 29 - readline.c | 27 +- readline.h | 55 - roms/Makefile | 49 + roms/SLOF | 2 +- roms/config.ipxe.general.h | 2 + roms/ipxe | 2 +- roms/openbios | 2 +- roms/qemu-palcode | 2 +- roms/seabios | 2 +- rules.mak | 51 +- s390-dis.c | 1796 ---- s390.ld | 201 - savevm.c | 896 +- scripts/cleanup-trace-events.pl | 51 + scripts/create_config | 26 +- scripts/feature_to_c.sh | 2 +- scripts/get_maintainer.pl | 25 +- scripts/kvm/vmxcap | 27 +- scripts/make_device_config.sh | 4 +- scripts/qapi-commands.py | 32 +- scripts/qapi-types.py | 120 +- scripts/qapi-visit.py | 222 +- scripts/qapi.py | 295 +- scripts/qemu-guest-agent/fsfreeze-hook | 33 + .../fsfreeze-hook.d/mysql-flush.sh.sample | 56 + scripts/tracetool.py | 22 +- scripts/tracetool/backend/__init__.py | 16 +- scripts/tracetool/backend/dtrace.py | 5 +- scripts/tracetool/backend/events.py | 23 + scripts/tracetool/backend/ftrace.py | 54 + scripts/tracetool/backend/simple.py | 22 +- scripts/tracetool/backend/stderr.py | 28 +- scripts/tracetool/backend/ust.py | 3 + scripts/tracetool/format/events_c.py | 39 + scripts/tracetool/format/events_h.py | 50 + scripts/tracetool/format/h.py | 13 +- scripts/update-linux-headers.sh | 3 + sh4-dis.c | 2077 ---- slirp/bootp.h | 4 + slirp/if.c | 2 +- slirp/ip_icmp.c | 2 +- slirp/ip_input.c | 2 +- slirp/libslirp.h | 6 +- slirp/main.h | 5 +- slirp/mbuf.h | 51 +- slirp/misc.c | 10 +- slirp/misc.h | 14 - slirp/sbuf.c | 2 +- slirp/slirp.c | 685 +- slirp/slirp.h | 5 +- slirp/socket.c | 14 +- slirp/socket.h | 2 + slirp/tcp_input.c | 26 +- slirp/tcp_subr.c | 157 +- slirp/tftp.h | 4 + slirp/udp.c | 2 +- softmmu-semi.h | 73 - softmmu_defs.h | 37 - softmmu_exec.h | 163 - softmmu_header.h | 213 - softmmu_template.h | 354 - sparc-dis.c | 3275 ------ sparc.ld | 150 - sparc64.ld | 138 - spice-qemu-char.c | 282 +- stubs/Makefile.objs | 20 + stubs/arch-query-cpu-def.c | 4 +- stubs/clock-warp.c | 7 + stubs/cpu-get-clock.c | 7 + stubs/cpu-get-icount.c | 9 + stubs/cpus.c | 10 + stubs/dump.c | 29 + stubs/fd-register.c | 2 +- stubs/fdset-add-fd.c | 2 +- stubs/fdset-find-fd.c | 2 +- stubs/fdset-get-fd.c | 2 +- stubs/fdset-remove-fd.c | 2 +- stubs/gdbstub.c | 5 + stubs/get-fd.c | 2 +- stubs/get-vm-name.c | 7 + stubs/iothread-lock.c | 10 + stubs/migr-blocker.c | 10 + stubs/mon-is-qmp.c | 7 + stubs/mon-print-filename.c | 6 + stubs/mon-printf.c | 10 + stubs/mon-protocol-event.c | 6 + stubs/mon-set-error.c | 8 + stubs/pci-drive-hot-add.c | 10 + stubs/reset.c | 13 + stubs/set-fd-handler.c | 2 +- stubs/slirp.c | 15 + stubs/sysbus.c | 6 + stubs/vm-stop.c | 7 + stubs/vmstate.c | 19 + sysemu.h | 188 - target-alpha/Makefile.objs | 1 + target-alpha/cpu-qom.h | 21 +- target-alpha/cpu.c | 253 +- target-alpha/cpu.h | 65 +- target-alpha/fpu_helper.c | 2 +- target-alpha/gdbstub.c | 93 + target-alpha/helper.c | 31 +- target-alpha/helper.h | 8 +- target-alpha/int_helper.c | 9 +- target-alpha/machine.c | 28 +- target-alpha/mem_helper.c | 28 +- target-alpha/sys_helper.c | 17 +- target-alpha/translate.c | 149 +- target-arm/Makefile.objs | 3 + target-arm/arm-semi.c | 19 +- target-arm/cpu-qom.h | 48 +- target-arm/cpu.c | 106 +- target-arm/cpu.h | 126 +- target-arm/gdbstub.c | 102 + target-arm/helper.c | 489 +- target-arm/helper.h | 9 +- target-arm/iwmmxt_helper.c | 2 +- target-arm/kvm-stub.c | 23 + target-arm/kvm.c | 649 ++ target-arm/kvm_arm.h | 65 + target-arm/machine.c | 454 +- target-arm/neon_helper.c | 2 +- target-arm/op_helper.c | 52 +- target-arm/translate.c | 1199 ++- target-cris/Makefile.objs | 1 + target-cris/cpu-qom.h | 22 +- target-cris/cpu.c | 214 +- target-cris/cpu.h | 33 +- target-cris/crisv32-decode.h | 4 + target-cris/gdbstub.c | 130 + target-cris/helper.c | 415 +- target-cris/helper.h | 4 +- target-cris/op_helper.c | 24 +- target-cris/translate.c | 155 +- target-cris/translate_v10.c | 5 +- target-i386/Makefile.objs | 1 + target-i386/arch_dump.c | 67 +- target-i386/arch_memory_mapping.c | 43 +- target-i386/cc_helper.c | 262 +- target-i386/cc_helper_template.h | 261 +- target-i386/cpu-qom.h | 50 +- target-i386/cpu.c | 1520 ++- target-i386/cpu.h | 188 +- target-i386/excp_helper.c | 6 +- target-i386/fpu_helper.c | 4 +- target-i386/gdbstub.c | 231 + target-i386/helper.c | 212 +- target-i386/helper.h | 19 +- target-i386/int_helper.c | 175 +- target-i386/ioport-user.c | 2 +- target-i386/kvm.c | 426 +- target-i386/kvm_i386.h | 2 +- target-i386/machine.c | 298 +- target-i386/mem_helper.c | 36 +- target-i386/misc_helper.c | 121 +- target-i386/ops_sse.h | 175 +- target-i386/ops_sse_header.h | 11 + target-i386/seg_helper.c | 218 +- target-i386/shift_helper_template.h | 12 +- target-i386/smm_helper.c | 74 +- target-i386/svm_helper.c | 73 +- target-i386/topology.h | 134 + target-i386/translate.c | 2873 +++--- target-lm32/Makefile.objs | 1 + target-lm32/cpu-qom.h | 18 +- target-lm32/cpu.c | 51 +- target-lm32/cpu.h | 43 +- target-lm32/gdbstub.c | 92 + target-lm32/helper.c | 30 +- target-lm32/helper.h | 4 +- target-lm32/machine.c | 25 +- target-lm32/op_helper.c | 46 +- target-lm32/translate.c | 70 +- target-m68k/Makefile.objs | 2 +- target-m68k/cpu-qom.h | 14 +- target-m68k/cpu.c | 81 +- target-m68k/cpu.h | 45 +- target-m68k/gdbstub.c | 75 + target-m68k/helper.c | 70 +- target-m68k/helpers.h | 4 +- target-m68k/m68k-semi.c | 11 +- target-m68k/op_helper.c | 32 +- target-m68k/qregs.def | 1 - target-m68k/translate.c | 54 +- target-microblaze/Makefile.objs | 3 +- target-microblaze/cpu-qom.h | 15 +- target-microblaze/cpu.c | 60 +- target-microblaze/cpu.h | 41 +- target-microblaze/gdbstub.c | 56 + target-microblaze/helper.c | 41 +- target-microblaze/helper.h | 4 +- target-microblaze/machine.c | 11 - target-microblaze/mmu.c | 2 +- target-microblaze/op_helper.c | 35 +- target-microblaze/translate.c | 82 +- target-mips/Makefile.objs | 1 + target-mips/cpu-qom.h | 14 +- target-mips/cpu.c | 60 + target-mips/cpu.h | 45 +- target-mips/dsp_helper.c | 913 +-- target-mips/gdbstub.c | 155 + target-mips/helper.c | 18 +- target-mips/helper.h | 19 +- target-mips/op_helper.c | 199 +- target-mips/translate.c | 1308 ++-- target-mips/translate_init.c | 7 +- target-moxie/Makefile.objs | 2 + target-moxie/cpu.c | 180 + target-moxie/cpu.h | 163 + target-moxie/helper.c | 173 + target-moxie/helper.h | 9 + target-moxie/machine.c | 18 + target-moxie/machine.h | 1 + target-moxie/mmu.c | 36 + target-moxie/mmu.h | 19 + target-moxie/translate.c | 929 ++ target-openrisc/Makefile.objs | 1 + target-openrisc/cpu.c | 97 +- target-openrisc/cpu.h | 46 +- target-openrisc/exception_helper.c | 2 +- target-openrisc/fpu_helper.c | 32 +- target-openrisc/gdbstub.c | 83 + target-openrisc/helper.h | 4 +- target-openrisc/int_helper.c | 4 +- target-openrisc/interrupt.c | 8 +- target-openrisc/interrupt_helper.c | 5 +- target-openrisc/machine.c | 27 +- target-openrisc/mmu.c | 13 +- target-openrisc/mmu_helper.c | 20 +- target-openrisc/sys_helper.c | 7 +- target-openrisc/translate.c | 49 +- target-ppc/Makefile.objs | 14 +- target-ppc/cpu-models.c | 1421 +++ target-ppc/cpu-models.h | 741 ++ target-ppc/cpu-qom.h | 43 +- target-ppc/cpu.h | 213 +- target-ppc/excp_helper.c | 76 +- target-ppc/fpu_helper.c | 76 +- target-ppc/gdbstub.c | 131 + target-ppc/helper.c | 50 - target-ppc/helper.h | 15 +- target-ppc/helper_regs.h | 11 +- target-ppc/int_helper.c | 73 +- target-ppc/kvm-stub.c | 18 + target-ppc/kvm.c | 846 ++- target-ppc/kvm_ppc.c | 4 +- target-ppc/kvm_ppc.h | 77 +- target-ppc/machine.c | 539 +- target-ppc/mem_helper.c | 69 +- target-ppc/misc_helper.c | 6 - target-ppc/mmu-hash32.c | 560 ++ target-ppc/mmu-hash32.h | 102 + target-ppc/mmu-hash64.c | 546 + target-ppc/mmu-hash64.h | 124 + target-ppc/mmu_helper.c | 940 +-- target-ppc/mpic_helper.c | 35 - target-ppc/translate.c | 1286 ++-- target-ppc/translate_init.c | 6276 ++++-------- target-ppc/user_only_helper.c | 44 + target-s390x/Makefile.objs | 3 +- target-s390x/arch_dump.c | 213 + target-s390x/cc_helper.c | 335 +- target-s390x/cpu-qom.h | 19 +- target-s390x/cpu.c | 124 +- target-s390x/cpu.h | 590 +- target-s390x/fpu_helper.c | 962 +- target-s390x/gdbstub.c | 88 + target-s390x/helper.c | 326 +- target-s390x/helper.h | 223 +- target-s390x/insn-data.def | 813 ++ target-s390x/insn-format.def | 55 + target-s390x/int_helper.c | 175 +- target-s390x/interrupt.c | 7 +- target-s390x/ioinst.c | 782 ++ target-s390x/ioinst.h | 233 + target-s390x/kvm.c | 567 +- target-s390x/machine.c | 30 - target-s390x/mem_helper.c | 378 +- target-s390x/misc_helper.c | 191 +- target-s390x/translate.c | 8723 ++++++++--------- target-sh4/Makefile.objs | 2 +- target-sh4/cpu-qom.h | 27 +- target-sh4/cpu.c | 239 +- target-sh4/cpu.h | 39 +- target-sh4/gdbstub.c | 146 + target-sh4/helper.c | 22 +- target-sh4/helper.h | 4 +- target-sh4/op_helper.c | 37 +- target-sh4/translate.c | 160 +- target-sparc/Makefile.objs | 1 + target-sparc/cpu-qom.h | 14 +- target-sparc/cpu.c | 205 +- target-sparc/cpu.h | 47 +- target-sparc/gdbstub.c | 208 + target-sparc/helper.c | 29 +- target-sparc/helper.h | 5 +- target-sparc/int32_helper.c | 8 +- target-sparc/int64_helper.c | 6 +- target-sparc/ldst_helper.c | 69 +- target-sparc/machine.c | 2 +- target-sparc/mmu_helper.c | 27 +- target-sparc/translate.c | 125 +- target-unicore32/Makefile.objs | 2 +- target-unicore32/cpu-qom.h | 13 +- target-unicore32/cpu.c | 75 +- target-unicore32/cpu.h | 33 +- target-unicore32/helper.c | 27 +- target-unicore32/helper.h | 4 +- target-unicore32/machine.c | 23 - target-unicore32/op_helper.c | 17 +- target-unicore32/softmmu.c | 13 +- target-unicore32/translate.c | 128 +- target-xtensa/Makefile.objs | 2 +- target-xtensa/core-dc232b.c | 6 +- target-xtensa/core-dc233c.c | 6 +- target-xtensa/core-fsf.c | 6 +- target-xtensa/cpu-qom.h | 17 +- target-xtensa/cpu.c | 75 +- target-xtensa/cpu.h | 31 +- target-xtensa/gdbstub.c | 109 + target-xtensa/helper.c | 149 +- target-xtensa/helper.h | 5 +- target-xtensa/machine.c | 38 - target-xtensa/op_helper.c | 95 +- target-xtensa/overlay_tool.h | 12 +- target-xtensa/translate.c | 526 +- target-xtensa/xtensa-semi.c | 16 +- tcg-runtime.c | 16 +- tcg/README | 44 +- tcg/aarch64/tcg-target.c | 1554 +++ tcg/aarch64/tcg-target.h | 101 + tcg/arm/tcg-target.c | 1589 ++-- tcg/arm/tcg-target.h | 19 +- tcg/hppa/tcg-target.c | 39 +- tcg/hppa/tcg-target.h | 5 + tcg/i386/tcg-target.c | 131 +- tcg/i386/tcg-target.h | 16 +- tcg/ia64/tcg-target.c | 2 +- tcg/ia64/tcg-target.h | 13 + tcg/mips/tcg-target.c | 18 +- tcg/mips/tcg-target.h | 5 + tcg/optimize.c | 217 +- tcg/ppc/tcg-target.c | 16 +- tcg/ppc/tcg-target.h | 7 +- tcg/ppc64/tcg-target.c | 1379 ++- tcg/ppc64/tcg-target.h | 67 +- tcg/s390/tcg-target.c | 552 +- tcg/s390/tcg-target.h | 27 +- tcg/sparc/tcg-target.c | 45 +- tcg/sparc/tcg-target.h | 13 + tcg/tcg-op.h | 264 +- tcg/tcg-opc.h | 48 +- tcg/tcg-runtime.h | 2 + tcg/tcg.c | 73 +- tcg/tcg.h | 89 +- tcg/tci/README | 2 +- tcg/tci/tcg-target.c | 27 +- tcg/tci/tcg-target.h | 23 +- tci-dis.c | 59 - tci.c | 59 +- tests/.gitignore | 8 + tests/Makefile | 186 +- tests/boot-order-test.c | 209 + tests/check-qdict.c | 6 +- tests/check-qfloat.c | 2 +- tests/check-qint.c | 2 +- tests/check-qjson.c | 738 ++- tests/check-qlist.c | 4 +- tests/check-qstring.c | 2 +- tests/endianness-test.c | 316 + tests/fdc-test.c | 2 +- tests/fw_cfg-test.c | 141 + tests/hd-geo-test.c | 8 +- tests/i440fx-test.c | 285 + tests/ide-test.c | 506 + tests/libqos/fw_cfg.c | 107 + tests/libqos/fw_cfg.h | 43 + tests/libqos/i2c-omap.c | 173 + tests/libqos/i2c.c | 22 + tests/libqos/i2c.h | 30 + tests/libqos/malloc-pc.c | 71 + tests/libqos/malloc-pc.h | 20 + tests/libqos/malloc.h | 38 + tests/libqos/pci-pc.c | 239 + tests/libqos/pci-pc.h | 20 + tests/libqos/pci.c | 151 + tests/libqos/pci.h | 80 + tests/libqtest.c | 98 +- tests/libqtest.h | 382 +- tests/m48t59-test.c | 14 +- tests/qapi-schema/comments.exit | 1 + tests/qapi-schema/comments.json | 4 + tests/qapi-schema/comments.out | 3 + tests/qapi-schema/empty.exit | 1 + tests/qapi-schema/empty.out | 3 + tests/qapi-schema/funny-char.err | 1 + tests/qapi-schema/funny-char.exit | 1 + tests/qapi-schema/funny-char.json | 2 + tests/qapi-schema/indented-expr.exit | 1 + tests/qapi-schema/indented-expr.json | 2 + tests/qapi-schema/indented-expr.out | 3 + tests/qapi-schema/missing-colon.err | 1 + tests/qapi-schema/missing-colon.exit | 1 + tests/qapi-schema/missing-colon.json | 2 + tests/qapi-schema/missing-comma-list.err | 1 + tests/qapi-schema/missing-comma-list.exit | 1 + tests/qapi-schema/missing-comma-list.json | 2 + tests/qapi-schema/missing-comma-object.err | 1 + tests/qapi-schema/missing-comma-object.exit | 1 + tests/qapi-schema/missing-comma-object.json | 2 + tests/qapi-schema/non-objects.err | 1 + tests/qapi-schema/non-objects.exit | 1 + tests/qapi-schema/non-objects.json | 2 + tests/qapi-schema/qapi-schema-test.exit | 1 + tests/qapi-schema/qapi-schema-test.json | 53 + tests/qapi-schema/qapi-schema-test.out | 19 + tests/qapi-schema/quoted-structural-chars.err | 1 + tests/qapi-schema/quoted-structural-chars.exit | 1 + tests/qapi-schema/quoted-structural-chars.json | 1 + tests/qapi-schema/test-qapi.py | 27 + tests/qapi-schema/trailing-comma-list.err | 1 + tests/qapi-schema/trailing-comma-list.exit | 1 + tests/qapi-schema/trailing-comma-list.json | 2 + tests/qapi-schema/trailing-comma-object.err | 1 + tests/qapi-schema/trailing-comma-object.exit | 1 + tests/qapi-schema/trailing-comma-object.json | 2 + tests/qapi-schema/unclosed-list.err | 1 + tests/qapi-schema/unclosed-list.exit | 1 + tests/qapi-schema/unclosed-list.json | 1 + tests/qapi-schema/unclosed-object.err | 1 + tests/qapi-schema/unclosed-object.exit | 1 + tests/qapi-schema/unclosed-object.json | 1 + tests/qapi-schema/unclosed-string.err | 1 + tests/qapi-schema/unclosed-string.exit | 1 + tests/qapi-schema/unclosed-string.json | 2 + tests/qemu-iotests/002 | 13 + tests/qemu-iotests/002.out | 26 + tests/qemu-iotests/007 | 7 +- tests/qemu-iotests/017 | 4 +- tests/qemu-iotests/017.out | 2 +- tests/qemu-iotests/018 | 4 +- tests/qemu-iotests/018.out | 2 +- tests/qemu-iotests/026 | 6 +- tests/qemu-iotests/030 | 99 +- tests/qemu-iotests/036 | 3 +- tests/qemu-iotests/038.out | 10 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/041 | 298 +- tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/042 | 2 +- tests/qemu-iotests/043 | 2 +- tests/qemu-iotests/044.out | 2 + tests/qemu-iotests/045 | 129 + tests/qemu-iotests/045.out | 5 + tests/qemu-iotests/046 | 262 + tests/qemu-iotests/046.out | 239 + tests/qemu-iotests/047 | 75 + tests/qemu-iotests/047.out | 22 + tests/qemu-iotests/048 | 78 + tests/qemu-iotests/048.out | 31 + tests/qemu-iotests/049 | 123 + tests/qemu-iotests/049.out | 212 + tests/qemu-iotests/050 | 75 + tests/qemu-iotests/050.out | 17 + tests/qemu-iotests/051 | 167 + tests/qemu-iotests/051.out | 229 + tests/qemu-iotests/052 | 61 + tests/qemu-iotests/052.out | 13 + tests/qemu-iotests/053 | 73 + tests/qemu-iotests/053.out | 17 + tests/qemu-iotests/054 | 58 + tests/qemu-iotests/054.out | 10 + tests/qemu-iotests/055 | 294 + tests/qemu-iotests/055.out | 5 + tests/qemu-iotests/056 | 94 + tests/qemu-iotests/056.out | 5 + tests/qemu-iotests/059 | 72 + tests/qemu-iotests/059.out | 20 + tests/qemu-iotests/check | 3 +- tests/qemu-iotests/common | 5 + tests/qemu-iotests/common.filter | 7 + tests/qemu-iotests/common.rc | 19 +- tests/qemu-iotests/group | 13 + tests/qemu-iotests/iotests.py | 72 +- tests/qemu-iotests/qcow2.py | 17 + tests/rtc-test.c | 250 +- tests/tcg/cris/crisutils.h | 5 + tests/tcg/linux-test.c | 1 - tests/tcg/lm32/test_cmpgei.S | 15 + tests/tcg/lm32/test_cmpgeui.S | 15 + tests/tcg/lm32/test_cmpgi.S | 15 + tests/tcg/lm32/test_cmpgui.S | 17 +- tests/tcg/mips/mips32-dsp/dpaq_sa_l_w.c | 64 +- tests/tcg/mips/mips32-dsp/dpsq_s_w_ph.c | 10 +- tests/tcg/mips/mips32-dsp/dpsq_sa_l_w.c | 4 +- tests/tcg/mips/mips32-dsp/extp.c | 18 + tests/tcg/mips/mips32-dsp/extpdp.c | 18 + tests/tcg/mips/mips32-dsp/extr_r_w.c | 46 + tests/tcg/mips/mips32-dsp/extr_rs_w.c | 69 + tests/tcg/mips/mips32-dsp/extr_s_h.c | 23 + tests/tcg/mips/mips32-dsp/extr_w.c | 46 + tests/tcg/mips/mips32-dsp/extrv_r_w.c | 25 + tests/tcg/mips/mips32-dsp/extrv_rs_w.c | 25 + tests/tcg/mips/mips32-dsp/extrv_s_h.c | 17 + tests/tcg/mips/mips32-dsp/extrv_w.c | 26 + tests/tcg/mips/mips32-dsp/insv.c | 13 + tests/tcg/mips/mips32-dsp/maq_s_w_phl.c | 16 +- tests/tcg/mips/mips32-dsp/maq_s_w_phr.c | 24 +- tests/tcg/mips/mips32-dsp/maq_sa_w_phl.c | 12 +- tests/tcg/mips/mips32-dsp/maq_sa_w_phr.c | 24 +- tests/tcg/mips/mips32-dsp/mthlip.c | 2 +- tests/tcg/mips/mips32-dsp/mulq_rs_ph.c | 19 +- tests/tcg/mips/mips32-dsp/precrq_rs_ph_w.c | 24 +- tests/tcg/mips/mips32-dsp/rddsp.c | 32 +- tests/tcg/mips/mips32-dsp/shll_ph.c | 33 +- tests/tcg/mips/mips32-dsp/shll_qb.c | 23 +- tests/tcg/mips/mips32-dsp/subq_s_ph.c | 22 +- tests/tcg/mips/mips32-dsp/subq_s_w.c | 36 +- tests/tcg/mips/mips32-dsp/wrdsp.c | 32 +- tests/tcg/mips/mips32-dspr2/dpa_w_ph.c | 4 +- tests/tcg/mips/mips32-dspr2/dpaqx_sa_w_ph.c | 12 +- tests/tcg/mips/mips32-dspr2/dpax_w_ph.c | 17 + tests/tcg/mips/mips32-dspr2/dps_w_ph.c | 17 + tests/tcg/mips/mips32-dspr2/dpsqx_s_w_ph.c | 8 +- tests/tcg/mips/mips32-dspr2/dpsx_w_ph.c | 4 +- tests/tcg/mips/mips32-dspr2/mulq_rs_w.c | 2 +- tests/tcg/mips/mips32-dspr2/mulq_s_ph.c | 15 + tests/tcg/mips/mips32-dspr2/mulq_s_w.c | 2 +- tests/tcg/test-i386-fprem.c | 4 +- tests/tcg/test-i386.c | 12 +- tests/tcg/xtensa/Makefile | 23 +- tests/tcg/xtensa/macros.inc | 2 +- tests/tcg/xtensa/test_extui.S | 26 + tests/tcg/xtensa/test_s32c1i.S | 39 + tests/tcg/xtensa/test_sr.S | 90 + tests/test-aio.c | 33 +- tests/test-bitops.c | 75 + tests/test-coroutine.c | 4 +- tests/test-cutils.c | 251 + tests/test-hbitmap.c | 401 + tests/test-int128.c | 212 + tests/test-iov.c | 154 +- tests/test-mul64.c | 70 + tests/test-qmp-commands.c | 7 +- tests/test-qmp-input-strict.c | 3 +- tests/test-qmp-input-visitor.c | 361 +- tests/test-qmp-output-visitor.c | 340 +- tests/test-string-input-visitor.c | 52 +- tests/test-string-output-visitor.c | 3 +- tests/test-thread-pool.c | 70 +- tests/test-visitor-serialization.c | 503 +- tests/test-x86-cpuid.c | 110 + tests/test-xbzrle.c | 196 + tests/tmp105-test.c | 76 + thread-pool.c | 257 +- thread-pool.h | 34 - thunk.c | 2 +- thunk.h | 189 - tpm.c | 358 + trace-events | 348 +- trace/Makefile.objs | 81 + trace/control-internal.h | 67 + trace/control.c | 106 +- trace/control.h | 190 +- trace/default.c | 5 +- trace/event-internal.h | 33 + trace/ftrace.c | 102 + trace/ftrace.h | 10 + trace/simple.c | 96 +- trace/simple.h | 6 +- trace/stderr.c | 34 +- trace/stderr.h | 11 - translate-all.c | 1697 ++++- translate-all.h | 34 + uboot_image.h | 158 - ui/Makefile.objs | 10 +- ui/cocoa.m | 109 +- ui/console.c | 2020 ++++ ui/curses.c | 49 +- ui/curses_keys.h | 5 + ui/cursor.c | 211 + ui/cursor_hidden.xpm | 37 + ui/cursor_left_ptr.xpm | 39 + ui/d3des.h | 4 + ui/gtk.c | 1533 +++ ui/input.c | 559 ++ ui/keymaps.c | 18 +- ui/qemu-pixman.c | 135 + ui/qemu-spice.h | 80 - ui/qemu-x509.h | 9 + ui/sdl.c | 176 +- ui/sdl_zoom.c | 11 +- ui/sdl_zoom_template.h | 16 +- ui/spice-core.c | 145 +- ui/spice-display.c | 98 +- ui/spice-display.h | 134 - ui/spice-input.c | 4 +- ui/vgafont.h | 4611 +++++++++ ui/vnc-auth-sasl.h | 2 +- ui/vnc-enc-tight.c | 11 +- ui/vnc-jobs.c | 3 +- ui/vnc-palette.c | 2 + ui/vnc-palette.h | 4 +- ui/vnc-tls.c | 69 +- ui/vnc-tls.h | 2 +- ui/vnc-ws.c | 348 + ui/vnc-ws.h | 89 + ui/vnc.c | 589 +- ui/vnc.h | 43 +- ui/vnc_keysym.h | 4 + uri.c | 2249 ----- uri.h | 113 - user-exec.c | 48 +- util/Makefile.objs | 13 + util/acl.c | 187 + util/aes.c | 1309 +++ util/bitmap.c | 256 + util/bitops.c | 158 + util/cache-utils.c | 97 + util/compatfd.c | 138 + util/crc32c.c | 115 + util/cutils.c | 532 + util/envlist.c | 241 + util/error.c | 120 + util/event_notifier-posix.c | 121 + util/event_notifier-win32.c | 59 + util/fifo8.c | 79 + util/hbitmap.c | 402 + util/hexdump.c | 37 + util/host-utils.c | 89 + util/iov.c | 432 + util/module.c | 81 + util/notify.c | 71 + util/osdep.c | 474 + util/oslib-posix.c | 243 + util/oslib-win32.c | 184 + util/path.c | 179 + util/qemu-config.c | 283 + util/qemu-error.c | 225 + util/qemu-openpty.c | 135 + util/qemu-option.c | 1149 +++ util/qemu-progress.c | 150 + util/qemu-sockets.c | 970 ++ util/qemu-thread-posix.c | 331 + util/qemu-thread-win32.c | 359 + util/qemu-timer-common.c | 61 + util/unicode.c | 100 + util/uri.c | 2249 +++++ vgafont.h | 4611 --------- vl.c | 1187 ++- vmstate.h | 639 -- x86_64.ld | 180 - xbzrle.c | 173 + xen-all.c | 62 +- xen-mapcache.c | 8 +- xen-mapcache.h | 56 - xen-stub.c | 9 +- 2838 files changed, 502314 insertions(+), 410765 deletions(-) diff --git a/.gitignore b/.gitignore index bd6ba1c..0fe114d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ config-devices.* config-all-devices.* +config-all-disas.* config-host.* config-target.* -trace.h -trace.c -trace-dtrace.h -trace-dtrace.dtrace +trace/generated-tracers.h +trace/generated-tracers.c +trace/generated-tracers-dtrace.h +trace/generated-tracers.dtrace +trace/generated-events.h +trace/generated-events.c +libcacard/trace/generated-tracers.c *-timestamp *-softmmu *-darwin-user @@ -47,6 +51,7 @@ test-qmp-output-visitor test-string-input-visitor test-string-output-visitor test-visitor-serialization +fsdev/virtfs-proxy-helper fsdev/virtfs-proxy-helper.1 fsdev/virtfs-proxy-helper.pod .gdbinit @@ -68,6 +73,7 @@ fsdev/virtfs-proxy-helper.pod *.tp *.vr *.d +!scripts/qemu-guest-agent/fsfreeze-hook.d *.o *.lo *.la @@ -76,18 +82,25 @@ fsdev/virtfs-proxy-helper.pod *.swp *.orig .pc +*.gcda +*.gcno patches pc-bios/bios-pq/status pc-bios/vgabios-pq/status +pc-bios/optionrom/linuxboot.asm pc-bios/optionrom/linuxboot.bin pc-bios/optionrom/linuxboot.raw pc-bios/optionrom/linuxboot.img +pc-bios/optionrom/multiboot.asm pc-bios/optionrom/multiboot.bin pc-bios/optionrom/multiboot.raw pc-bios/optionrom/multiboot.img +pc-bios/optionrom/kvmvapic.asm pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.img +pc-bios/s390-ccw/s390-ccw.elf +pc-bios/s390-ccw/s390-ccw.img .stgit-* cscope.* tags diff --git a/.gitmodules b/.gitmodules index cfa2af9..d7e3f3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,10 +15,13 @@ url = git://git.qemu.org/openbios.git [submodule "roms/qemu-palcode"] path = roms/qemu-palcode - url = git://repo.or.cz/qemu-palcode.git + url = git://github.com/rth7680/qemu-palcode.git [submodule "roms/sgabios"] path = roms/sgabios url = git://git.qemu.org/sgabios.git [submodule "pixman"] path = pixman url = git://anongit.freedesktop.org/pixman +[submodule "dtc"] + path = dtc + url = git://git.qemu.org/dtc.git diff --git a/HACKING b/HACKING index 89a6b3a..12fbc8a 100644 --- a/HACKING +++ b/HACKING @@ -40,8 +40,23 @@ speaking, the size of guest memory can always fit into ram_addr_t but it would not be correct to store an actual guest physical address in a ram_addr_t. -Use target_ulong (or abi_ulong) for CPU virtual addresses, however -devices should not need to use target_ulong. +For CPU virtual addresses there are several possible types. +vaddr is the best type to use to hold a CPU virtual address in +target-independent code. It is guaranteed to be large enough to hold a +virtual address for any target, and it does not change size from target +to target. It is always unsigned. +target_ulong is a type the size of a virtual address on the CPU; this means +it may be 32 or 64 bits depending on which target is being built. It should +therefore be used only in target-specific code, and in some +performance-critical built-per-target core code such as the TLB code. +There is also a signed version, target_long. +abi_ulong is for the *-user targets, and represents a type the size of +'void *' in that target's ABI. (This may not be the same as the size of a +full CPU virtual address in the case of target ABIs which use 32 bit pointers +on 64 bit CPUs, like sparc32plus.) Definitions of structures that must match +the target's ABI must use this type for anything that on the target is defined +to be an 'unsigned long' or a pointer type. +There is also a signed version, abi_long. Of course, take all of the above with a grain of salt. If you're about to use some system interface that requires a type like size_t, pid_t or @@ -78,16 +93,15 @@ avoided. Use of the malloc/free/realloc/calloc/valloc/memalign/posix_memalign APIs is not allowed in the QEMU codebase. Instead of these routines, use the GLib memory allocation routines g_malloc/g_malloc0/g_new/ -g_new0/g_realloc/g_free or QEMU's qemu_vmalloc/qemu_memalign/qemu_vfree +g_new0/g_realloc/g_free or QEMU's qemu_memalign/qemu_blockalign/qemu_vfree APIs. Please note that g_malloc will exit on allocation failure, so there is no need to test for failure (as you would have to with malloc). Calling g_malloc with a zero size is valid and will return NULL. -Memory allocated by qemu_vmalloc or qemu_memalign must be freed with -qemu_vfree, since breaking this will cause problems on Win32 and user -emulators. +Memory allocated by qemu_memalign or qemu_blockalign must be freed with +qemu_vfree, since breaking this will cause problems on Win32. 4. String manipulation @@ -123,3 +137,23 @@ gcc's printf attribute directive in the prototype. This makes it so gcc's -Wformat and -Wformat-security options can do their jobs and cross-check format strings with the number and types of arguments. + +6. C standard, implementation defined and undefined behaviors + +C code in QEMU should be written to the C99 language specification. A copy _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:35:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:35: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 1Vk40V-0000YI-9s; Sat, 23 Nov 2013 03:35:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk40S-0000Y4-Dr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:41 +0000 Received: from [193.109.254.147:28016] by server-16.bemta-14.messagelabs.com id 37/FE-03396-B8220925; Sat, 23 Nov 2013 03:35:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385177734!237012!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8614 invoked from network); 23 Nov 2013 03:35:34 -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; 23 Nov 2013 03:35:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk40L-0006qS-M7 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk40L-0003CE-2b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:35:33 +0000 Date: Sat, 23 Nov 2013 03:35:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge tag 'v1.6.0' into merging-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 === This changeset includes merge from high-traffic branch === Commits on that branch are not reported individually. commit 2c7d76d1a7e15b4c0de1a5c2852d6615aa336c52 Merge: dfe0055e38e3e328f19d4d67f0f4ae049436d3c8 1ee2daeb6448312d6d0e22175f5c1b9b01f8974c Author: Anthony PERARD AuthorDate: Wed Oct 2 17:17:01 2013 +0100 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:01 2013 +0100 Merge tag 'v1.6.0' into merging-1.6 .gitignore | 21 +- .gitmodules | 5 +- HACKING | 46 +- LICENSE | 15 +- MAINTAINERS | 287 +- Makefile | 229 +- Makefile.dis | 20 - Makefile.objs | 239 +- Makefile.target | 92 +- Makefile.user | 24 - QMP/qmp-events.txt | 52 +- QMP/qmp-shell | 9 +- TODO | 37 - VERSION | 2 +- a.out.h | 430 - acl.c | 184 - acl.h | 74 - aes.c | 1314 --- aes.h | 26 - aio-posix.c | 136 +- aio-win32.c | 6 +- alpha-dis.c | 1916 ---- alpha.ld | 127 - arch_init.c | 689 +- arch_init.h | 39 - arm-dis.c | 4136 -------- arm.ld | 153 - async.c | 55 +- audio/Makefile.objs | 3 + audio/alsaaudio.c | 2 +- audio/audio.c | 11 +- audio/audio.h | 2 +- audio/audio_int.h | 31 +- audio/audio_win_int.c | 1 - audio/noaudio.c | 2 +- audio/ossaudio.c | 8 +- audio/spiceaudio.c | 2 +- audio/wavaudio.c | 2 +- audio/wavcapture.c | 2 +- audio/winwaveaudio.c | 2 +- backends/Makefile.objs | 6 + backends/baum.c | 631 ++ backends/msmouse.c | 85 + backends/rng-egd.c | 14 +- backends/rng-random.c | 20 +- backends/rng.c | 6 +- backends/tpm.c | 190 + balloon.c | 10 +- balloon.h | 29 - bitmap.c | 256 - bitmap.h | 222 - bitops.c | 142 - bitops.h | 362 - block-migration.c | 272 +- block-migration.h | 23 - block.c | 1308 ++-- block.h | 434 - block/Makefile.objs | 6 + block/backup.c | 386 + block/blkdebug.c | 244 +- block/blkverify.c | 120 +- block/bochs.c | 30 +- block/cloop.c | 35 +- block/commit.c | 15 +- block/cow.c | 11 +- block/curl.c | 204 +- block/dmg.c | 174 +- block/gluster.c | 114 +- block/iscsi.c | 707 +- block/linux-aio.c | 6 +- block/mirror.c | 394 +- block/nbd.c | 182 +- block/parallels.c | 29 +- block/qapi.c | 470 + block/qcow.c | 32 +- block/qcow2-cache.c | 2 +- block/qcow2-cluster.c | 687 +- block/qcow2-refcount.c | 247 +- block/qcow2-snapshot.c | 18 +- block/qcow2.c | 229 +- block/qcow2.h | 123 +- block/qed-table.c | 2 +- block/qed.c | 15 +- block/qed.h | 2 +- block/raw-aio.h | 5 +- block/raw-posix.c | 357 +- block/raw-win32.c | 95 +- block/raw.c | 43 +- block/rbd.c | 100 +- block/sheepdog.c | 889 ++- block/snapshot.c | 157 + block/ssh.c | 1076 ++ block/stream.c | 8 +- block/vdi.c | 40 +- block/vhdx.c | 972 ++ block/vhdx.h | 325 + block/vmdk.c | 499 +- block/vpc.c | 99 +- block/vvfat.c | 261 +- block/win32-aio.c | 28 +- block_int.h | 360 - blockdev-nbd.c | 14 +- blockdev.c | 1102 ++- blockdev.h | 64 - blockjob.c | 14 +- blockjob.h | 278 - bsd-user/elfload.c | 8 +- bsd-user/main.c | 63 +- bsd-user/mmap.c | 4 +- bsd-user/qemu-types.h | 24 - bsd-user/qemu.h | 8 +- bsd-user/syscall.c | 5 + bswap.h | 713 -- bt-host.c | 7 +- bt-host.h | 9 - bt-vhci.c | 4 +- buffered_file.c | 269 - buffered_file.h | 22 - cache-utils.c | 97 - cache-utils.h | 44 - cmd.c | 612 -- cmd.h | 79 - compatfd.c | 138 - compatfd.h | 44 - compiler.h | 58 - config.h | 2 - configure | 1577 ++-- console.c | 1723 ---- console.h | 476 - coroutine-gthread.c | 2 +- coroutine-sigaltstack.c | 71 +- coroutine-ucontext.c | 79 +- coroutine-win32.c | 2 +- cpu-all.h | 522 - cpu-common.h | 112 - cpu-defs.h | 213 - cpu-exec.c | 237 +- cpus.c | 413 +- cpus.h | 24 - cputlb.c | 89 +- cputlb.h | 46 - cris-dis.c | 2871 ------ cursor.c | 211 - cursor_hidden.xpm | 37 - cursor_left_ptr.xpm | 39 - cutils.c | 323 - def-helper.h | 275 - default-configs/alpha-softmmu.mak | 3 + default-configs/arm-softmmu.mak | 34 + default-configs/cris-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 23 +- default-configs/lm32-softmmu.mak | 4 + default-configs/m68k-softmmu.mak | 2 + default-configs/microblaze-softmmu.mak | 2 + default-configs/microblazeel-softmmu.mak | 2 + default-configs/mips-softmmu.mak | 10 +- default-configs/mips64-softmmu.mak | 10 +- default-configs/mips64el-softmmu.mak | 10 +- default-configs/mipsel-softmmu.mak | 10 +- default-configs/moxie-softmmu.mak | 5 + default-configs/pci.mak | 9 + default-configs/ppc-softmmu.mak | 14 +- default-configs/ppc64-softmmu.mak | 26 +- default-configs/ppcemb-softmmu.mak | 12 +- default-configs/s390x-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 13 +- default-configs/sh4eb-softmmu.mak | 13 +- default-configs/sound.mak | 4 + default-configs/sparc-softmmu.mak | 8 + default-configs/sparc64-softmmu.mak | 4 + default-configs/usb.mak | 8 + default-configs/x86_64-softmmu.mak | 23 +- device-hotplug.c | 79 + device_tree.c | 64 +- device_tree.h | 54 - dis-asm.h | 483 - disas.c | 18 +- disas.h | 43 - disas/Makefile.objs | 19 + disas/alpha.c | 1916 ++++ disas/arm.c | 4140 ++++++++ disas/cris.c | 2871 ++++++ disas/hppa.c | 2831 ++++++ disas/i386.c | 6627 ++++++++++++ disas/ia64.c |10602 ++++++++++++++++++++ disas/lm32.c | 361 + disas/m68k.c | 5052 ++++++++++ disas/microblaze.c | 1100 ++ disas/mips.c | 4873 +++++++++ disas/moxie.c | 360 + disas/ppc.c | 5412 ++++++++++ disas/s390.c | 1931 ++++ disas/sh4.c | 2077 ++++ disas/sparc.c | 3275 ++++++ disas/tci.c | 59 + dma-helpers.c | 195 +- dma.h | 282 - docs/atomics.txt | 352 + docs/bootindex.txt | 10 +- docs/ccid.txt | 2 +- docs/memory.txt | 11 +- docs/migration.txt | 37 +- docs/q35-chipset.cfg | 129 + docs/qapi-code-gen.txt | 109 +- docs/rdma.txt | 424 + docs/specs/pci-ids.txt | 50 + docs/specs/pci-testdev.txt | 26 + docs/specs/pvpanic.txt | 39 + docs/specs/vmw_pvscsi-spec.txt | 92 + docs/spice-port-fqdn.txt | 19 + docs/tracing.txt | 66 +- docs/usb-storage.txt | 13 +- docs/usb2.txt | 20 +- docs/virtio-balloon-stats.txt | 104 + docs/vnc-ledstate-Pseudo-encoding.txt | 50 + dtc | 1 + dump-stub.c | 64 - dump.c | 229 +- dump.h | 35 - elf.h | 1308 --- envlist.c | 246 - envlist.h | 22 - error.c | 115 - error.h | 80 - event_notifier-posix.c | 120 - event_notifier-win32.c | 59 - event_notifier.h | 46 - exec-all.h | 418 - exec-memory.h | 41 - exec.c | 3136 ++----- fpu/softfloat-macros.h | 2 +- fpu/softfloat.c | 39 +- fpu/softfloat.h | 638 -- fsdev/Makefile.objs | 9 +- fsdev/qemu-fsdev-dummy.c | 11 +- fsdev/qemu-fsdev-opts.c | 85 + fsdev/qemu-fsdev.c | 16 +- fsdev/qemu-fsdev.h | 2 +- fsdev/virtfs-proxy-helper.c | 105 +- fsdev/virtio-9p-marshal.c | 4 +- gdbstub.c | 1644 +--- gdbstub.h | 53 - gen-icount.h | 48 - hmp-commands.hx | 129 +- hmp.c | 331 +- hmp.h | 45 +- host-utils.c | 105 - host-utils.h | 236 - hppa-dis.c | 2831 ------ hppa.ld | 211 - hw/9p.h | 24 - hw/9pfs/codir.c | 4 +- hw/9pfs/cofile.c | 8 +- hw/9pfs/cofs.c | 4 +- hw/9pfs/coxattr.c | 4 +- hw/9pfs/virtio-9p-coth.c | 5 +- hw/9pfs/virtio-9p-coth.h | 4 +- hw/9pfs/virtio-9p-device.c | 128 +- hw/9pfs/virtio-9p-handle.c | 4 +- hw/9pfs/virtio-9p-local.c | 64 +- hw/9pfs/virtio-9p-posix-acl.c | 4 +- hw/9pfs/virtio-9p-proxy.c | 7 +- hw/9pfs/virtio-9p-synth.c | 2 +- hw/9pfs/virtio-9p-synth.h | 4 + hw/9pfs/virtio-9p-xattr-user.c | 2 +- hw/9pfs/virtio-9p-xattr.c | 2 +- hw/9pfs/virtio-9p-xattr.h | 2 +- hw/9pfs/virtio-9p.c | 33 +- hw/9pfs/virtio-9p.h | 19 +- hw/Makefile.objs | 243 +- hw/a15mpcore.c | 108 - hw/a9mpcore.c | 242 - hw/ac97.c | 1438 --- hw/acpi.c | 470 - hw/acpi.h | 155 - hw/acpi/Makefile.objs | 2 + hw/acpi/core.c | 624 ++ hw/acpi/ich9.c | 230 + hw/acpi/piix4.c | 739 ++ hw/acpi_ich9.c | 322 - hw/acpi_ich9.h | 47 - hw/acpi_piix4.c | 759 -- hw/adb.c | 455 - hw/adb.h | 63 - hw/adlib.c | 337 - hw/ads7846.c | 177 - hw/alpha/Makefile.objs | 5 +- hw/alpha/alpha_sys.h | 21 + hw/alpha/dp264.c | 184 + hw/alpha/pci.c | 91 + hw/alpha/typhoon.c | 810 ++ hw/alpha_dp264.c | 181 - hw/alpha_pci.c | 109 - hw/alpha_sys.h | 22 - hw/alpha_typhoon.c | 838 -- hw/an5206.c | 96 - hw/apb_pci.c | 542 - hw/apb_pci.h | 10 - hw/apic-msidef.h | 30 - hw/apic.c | 910 -- hw/apic.h | 32 - hw/apic_common.c | 402 - hw/apic_internal.h | 149 - hw/apm.c | 89 - hw/apm.h | 22 - hw/applesmc.c | 251 - hw/arm-misc.h | 70 - hw/arm/Makefile.objs | 40 +- hw/arm/armv7m.c | 290 + hw/arm/boot.c | 476 + hw/arm/collie.c | 73 + hw/arm/exynos4210.c | 371 + hw/arm/exynos4_boards.c | 170 + hw/arm/gumstix.c | 141 + hw/arm/highbank.c | 386 + hw/arm/integratorcp.c | 581 ++ hw/arm/kzm.c | 157 + hw/arm/mainstone.c | 190 + hw/arm/musicpal.c | 1771 ++++ hw/arm/nseries.c | 1415 +++ hw/arm/omap1.c | 4059 ++++++++ hw/arm/omap2.c | 2684 +++++ hw/arm/omap_sx1.c | 238 + hw/arm/palm.c | 284 + hw/arm/pic_cpu.c | 68 + hw/arm/pxa2xx.c | 2320 +++++ hw/arm/pxa2xx_gpio.c | 358 + hw/arm/pxa2xx_pic.c | 341 + hw/arm/realview.c | 410 + hw/arm/spitz.c | 1145 +++ hw/arm/stellaris.c | 1418 +++ hw/arm/strongarm.c | 1661 +++ hw/arm/strongarm.h | 68 + hw/arm/tosa.c | 302 + hw/arm/versatilepb.c | 412 + hw/arm/vexpress.c | 672 ++ hw/arm/xilinx_zynq.c | 247 + hw/arm/z2.c | 384 + hw/arm11mpcore.c | 268 - hw/arm_boot.c | 465 - hw/arm_gic.c | 718 -- hw/arm_gic_common.c | 184 - hw/arm_gic_internal.h | 136 - hw/arm_l2x0.c | 194 - hw/arm_mptimer.c | 344 - hw/arm_pic.c | 40 - hw/arm_sysctl.c | 425 - hw/arm_timer.c | 399 - hw/armv7m.c | 284 - hw/armv7m_nvic.c | 550 - hw/audio/Makefile.objs | 18 + hw/audio/ac97.c | 1442 +++ hw/audio/adlib.c | 391 + hw/audio/cs4231.c | 187 + hw/audio/cs4231a.c | 708 ++ hw/audio/es1370.c | 1091 ++ hw/audio/fmopl.c | 1395 +++ hw/audio/fmopl.h | 174 + hw/audio/gus.c | 337 + hw/audio/gusemu.h | 105 + hw/audio/gusemu_hal.c | 554 + hw/audio/gusemu_mixer.c | 240 + hw/audio/gustate.h | 132 + hw/audio/hda-codec.c | 1101 ++ hw/audio/intel-hda-defs.h | 717 ++ hw/audio/intel-hda.c | 1342 +++ hw/audio/intel-hda.h | 72 + hw/audio/lm4549.c | 336 + hw/audio/lm4549.h | 43 + hw/audio/marvell_88w8618.c | 305 + hw/audio/milkymist-ac97.c | 349 + hw/audio/pcspk.c | 212 + hw/audio/pl041.c | 653 ++ hw/audio/pl041.h | 135 + hw/audio/pl041.hx | 81 + hw/audio/sb16.c | 1435 +++ hw/audio/wm8750.c | 716 ++ hw/audiodev.h | 20 - hw/axis_dev88.c | 365 - hw/baum.c | 627 -- hw/baum.h | 26 - hw/bitbang_i2c.c | 245 - hw/bitbang_i2c.h | 14 - hw/blizzard.c | 997 -- hw/blizzard_template.h | 136 - hw/block-common.c | 64 - hw/block-common.h | 79 - hw/block/Makefile.objs | 15 + hw/block/block.c | 62 + hw/block/cdrom.c | 155 + hw/block/dataplane/Makefile.objs | 1 + hw/block/dataplane/ioq.c | 117 + hw/block/dataplane/ioq.h | 57 + hw/block/dataplane/virtio-blk.c | 542 + hw/block/dataplane/virtio-blk.h | 29 + hw/block/ecc.c | 91 + hw/block/fdc.c | 2328 +++++ hw/block/hd-geometry.c | 157 + hw/block/m25p80.c | 703 ++ hw/block/nand.c | 800 ++ hw/block/nvme.c | 887 ++ hw/block/nvme.h | 711 ++ hw/block/onenand.c | 854 ++ hw/block/pflash_cfi01.c | 775 ++ hw/block/pflash_cfi02.c | 789 ++ hw/block/tc58128.c | 178 + hw/block/virtio-blk.c | 760 ++ hw/block/xen_blkif.h | 103 + hw/block/xen_disk.c | 988 ++ hw/boards.h | 50 - hw/bonito.c | 847 -- hw/bt-hci-csr.c | 453 - hw/bt-hci.c | 2217 ---- hw/bt-hid.c | 553 - hw/bt-l2cap.c | 1365 --- hw/bt-sdp.c | 967 -- hw/bt.c | 121 - hw/bt.h | 2185 ---- hw/bt/Makefile.objs | 3 + hw/bt/core.c | 121 + hw/bt/hci-csr.c | 454 + hw/bt/hci.c | 2217 ++++ hw/bt/hid.c | 553 + hw/bt/l2cap.c | 1365 +++ hw/bt/sdp.c | 967 ++ hw/cadence_gem.c | 1233 --- hw/cadence_ttc.c | 489 - hw/cadence_uart.c | 516 - hw/cbus.c | 618 -- hw/ccid-card-emulated.c | 602 -- hw/ccid-card-passthru.c | 351 - hw/ccid.h | 65 - hw/cdrom.c | 155 - hw/char/Makefile.objs | 27 + hw/char/cadence_uart.c | 522 + hw/char/debugcon.c | 140 + hw/char/escc.c | 941 ++ hw/char/etraxfs_ser.c | 252 + hw/char/exynos4210_uart.c | 680 ++ hw/char/grlib_apbuart.c | 298 + hw/char/imx_serial.c | 473 + hw/char/ipack.c | 116 + hw/char/ipack.h | 79 + hw/char/ipoctal232.c | 606 ++ hw/char/lm32_juart.c | 162 + hw/char/lm32_uart.c | 302 + hw/char/mcf_uart.c | 307 + hw/char/milkymist-uart.c | 249 + hw/char/omap_uart.c | 187 + hw/char/parallel.c | 625 ++ hw/char/pl011.c | 332 + hw/char/sclpconsole.c | 289 + hw/char/serial-isa.c | 138 + hw/char/serial-pci.c | 269 + hw/char/serial.c | 775 ++ hw/char/sh_serial.c | 410 + hw/char/spapr_vty.c | 241 + hw/char/tpci200.c | 672 ++ hw/char/virtio-console.c | 207 + hw/char/virtio-serial-bus.c | 1044 ++ hw/char/xen_console.c | 305 + hw/char/xilinx_uartlite.c | 235 + hw/cirrus_vga.c | 3011 ------ hw/cirrus_vga_rop.h | 208 - hw/cirrus_vga_rop2.h | 281 - hw/cirrus_vga_template.h | 102 - hw/collie.c | 72 - hw/core/Makefile.objs | 13 + hw/core/empty_slot.c | 102 + hw/core/irq.c | 136 + hw/core/loader.c | 884 ++ hw/core/null-machine.c | 36 + hw/core/ptimer.c | 231 + hw/core/qdev-properties-system.c | 391 + hw/core/qdev-properties.c | 1198 +++ hw/core/qdev.c | 907 ++ hw/core/stream.c | 32 + hw/core/sysbus.c | 301 + hw/core/uboot_image.h | 158 + hw/cpu/Makefile.objs | 5 + hw/cpu/a15mpcore.c | 122 + hw/cpu/a9mpcore.c | 145 + hw/cpu/arm11mpcore.c | 291 + hw/cpu/icc_bus.c | 127 + hw/cris-boot.c | 98 - hw/cris-boot.h | 11 - hw/cris/Makefile.objs | 14 +- hw/cris/axis_dev88.c | 366 + hw/cris/boot.c | 98 + hw/cris/boot.h | 15 + hw/cris/pic_cpu.c | 47 + hw/cris_pic_cpu.c | 45 - hw/cs4231.c | 181 - hw/cs4231a.c | 697 -- hw/cuda.c | 752 -- hw/debugcon.c | 117 - hw/dec_pci.c | 151 - hw/dec_pci.h | 10 - hw/device-hotplug.c | 92 - hw/devices.h | 70 - hw/display/Makefile.objs | 35 + hw/display/ads7846.c | 177 + hw/display/blizzard.c | 995 ++ hw/display/blizzard_template.h | 136 + hw/display/cirrus_vga.c | 3025 ++++++ hw/display/cirrus_vga_rop.h | 208 + hw/display/cirrus_vga_rop2.h | 281 + hw/display/cirrus_vga_template.h | 102 + hw/display/exynos4210_fimd.c | 1947 ++++ hw/display/framebuffer.c | 113 + hw/display/framebuffer.h | 25 + hw/display/g364fb.c | 557 + hw/display/jazz_led.c | 311 + hw/display/milkymist-tmu2.c | 495 + hw/display/milkymist-vgafb.c | 345 + hw/display/milkymist-vgafb_template.h | 74 + hw/display/omap_dss.c | 1086 ++ hw/display/omap_lcd_template.h | 175 + hw/display/omap_lcdc.c | 412 + hw/display/pl110.c | 532 + hw/display/pl110_template.h | 395 + hw/display/pxa2xx_lcd.c | 1061 ++ hw/display/pxa2xx_template.h | 435 + hw/display/qxl-logger.c | 275 + hw/display/qxl-render.c | 280 + hw/display/qxl.c | 2369 +++++ hw/display/qxl.h | 165 + hw/display/sm501.c | 1452 +++ hw/display/sm501_template.h | 145 + hw/display/ssd0303.c | 325 + hw/display/ssd0323.c | 376 + hw/display/tc6393xb.c | 593 ++ hw/display/tc6393xb_template.h | 68 + hw/display/tcx.c | 627 ++ hw/display/vga-isa-mm.c | 142 + hw/display/vga-isa.c | 105 + hw/display/vga-pci.c | 216 + hw/display/vga.c | 2396 +++++ hw/display/vga.h | 159 + hw/display/vga_int.h | 214 + hw/display/vga_template.h | 459 + hw/display/vmware_vga.c | 1324 +++ hw/display/xenfb.c | 1000 ++ hw/dma.c | 565 -- hw/dma/Makefile.objs | 13 + hw/dma/etraxfs_dma.c | 781 ++ hw/dma/i82374.c | 177 + hw/dma/i8257.c | 600 ++ hw/dma/omap_dma.c | 2102 ++++ hw/dma/pl080.c | 410 + hw/dma/pl330.c | 1654 +++ hw/dma/puv3_dma.c | 113 + hw/dma/pxa2xx_dma.c | 578 ++ hw/dma/rc4030.c | 825 ++ hw/dma/soc_dma.c | 366 + hw/dma/sparc32_dma.c | 321 + hw/dma/sun4m_iommu.c | 391 + hw/dma/xilinx_axidma.c | 668 ++ hw/dp8393x.c | 913 -- hw/ds1225y.c | 165 - hw/ds1338.c | 193 - hw/dummy_m68k.c | 83 - hw/e1000.c | 1337 --- hw/e1000_hw.h | 893 -- hw/ecc.c | 91 - hw/eccmemctl.c | 340 - hw/eepro100.c | 2115 ---- hw/eeprom93xx.c | 337 - hw/eeprom93xx.h | 40 - hw/elf_ops.h | 306 - hw/empty_slot.c | 98 - hw/empty_slot.h | 2 - hw/es1370.c | 1089 -- hw/escc.c | 938 -- hw/escc.h | 8 - hw/esp-pci.c | 518 - hw/esp.c | 727 -- hw/esp.h | 132 - hw/etraxfs.h | 46 - hw/etraxfs_dma.c | 781 -- hw/etraxfs_dma.h | 29 - hw/etraxfs_eth.c | 645 -- hw/etraxfs_pic.c | 180 - hw/etraxfs_ser.c | 248 - hw/etraxfs_timer.c | 351 - hw/exynos4210.c | 338 - hw/exynos4210.h | 137 - hw/exynos4210_combiner.c | 455 - hw/exynos4210_fimd.c | 1928 ---- hw/exynos4210_gic.c | 462 - hw/exynos4210_i2c.c | 334 - hw/exynos4210_mct.c | 1482 --- hw/exynos4210_pmu.c | 499 - hw/exynos4210_pwm.c | 422 - hw/exynos4210_rtc.c | 592 -- hw/exynos4210_uart.c | 676 -- hw/exynos4_boards.c | 168 - hw/fdc.c | 2284 ----- hw/fdc.h | 24 - hw/fifo.c | 78 - hw/fifo.h | 99 - hw/firmware_abi.h | 73 - hw/flash.h | 59 - hw/fmopl.c | 1395 --- hw/fmopl.h | 174 - hw/framebuffer.c | 110 - hw/framebuffer.h | 25 - hw/fw_cfg.c | 589 -- hw/fw_cfg.h | 70 - hw/g364fb.c | 612 -- hw/gpio/Makefile.objs | 6 + hw/gpio/max7310.c | 213 + hw/gpio/omap_gpio.c | 806 ++ hw/gpio/pl061.c | 336 + hw/gpio/puv3_gpio.c | 145 + hw/gpio/zaurus.c | 297 + hw/grackle_pci.c | 165 - hw/grlib.h | 126 - hw/grlib_apbuart.c | 271 - hw/grlib_gptimer.c | 404 - hw/grlib_irqmp.c | 385 - hw/gt64xxx.c | 1188 --- hw/gumstix.c | 139 - hw/gus.c | 332 - hw/gusemu.h | 105 - hw/gusemu_hal.c | 554 - hw/gusemu_mixer.c | 240 - hw/gustate.h | 132 - hw/hd-geometry.c | 157 - hw/hda-audio.c | 1098 -- hw/heathrow_pic.c | 215 - hw/hid.c | 467 - hw/hid.h | 82 - hw/highbank.c | 338 - hw/hpet.c | 760 -- hw/hpet_emul.h | 74 - hw/hw.h | 70 - hw/i2c.c | 246 - hw/i2c.h | 92 - hw/i2c/Makefile.objs | 7 + hw/i2c/bitbang_i2c.c | 252 + hw/i2c/bitbang_i2c.h | 14 + hw/i2c/core.c | 247 + hw/i2c/exynos4210_i2c.c | 336 + hw/i2c/omap_i2c.c | 498 + hw/i2c/pm_smbus.c | 207 + hw/i2c/smbus.c | 335 + hw/i2c/smbus_eeprom.c | 156 + hw/i2c/smbus_ich9.c | 127 + hw/i2c/versatile_i2c.c | 113 + hw/i386/Makefile.objs | 19 +- hw/i386/kvm/Makefile.objs | 1 + hw/i386/kvm/apic.c | 209 + hw/i386/kvm/clock.c | 145 + hw/i386/kvm/i8254.c | 336 + hw/i386/kvm/i8259.c | 162 + hw/i386/kvm/ioapic.c | 166 + hw/i386/kvm/pci-assign.c | 1946 ++++ hw/i386/kvmvapic.c | 838 ++ hw/i386/multiboot.c | 347 + hw/i386/multiboot.h | 14 + hw/i386/pc.c | 1364 +++ hw/i386/pc_piix.c | 782 ++ hw/i386/pc_q35.c | 283 + hw/i386/pc_sysfw.c | 188 + hw/i386/smbios.c | 246 + hw/i386/xen_domainbuild.c | 299 + hw/i386/xen_domainbuild.h | 13 + hw/i386/xen_machine_pv.c | 110 + hw/i82374.c | 168 - hw/i82378.c | 277 - hw/i8254.c | 362 - hw/i8254.h | 68 - hw/i8254_common.c | 311 - hw/i8254_internal.h | 85 - hw/i8259.c | 496 - hw/i8259_common.c | 161 - hw/i8259_internal.h | 82 - hw/i82801b11.c | 125 - hw/ich9.h | 207 - hw/ide.h | 39 - hw/ide/Makefile.objs | 2 + hw/ide/ahci.c | 188 +- hw/ide/ahci.h | 34 +- hw/ide/atapi.c | 2 +- hw/ide/cmd646.c | 93 +- hw/ide/core.c | 1344 ++-- hw/ide/ich.c | 59 +- hw/ide/internal.h | 15 +- hw/ide/isa.c | 64 +- hw/ide/macio.c | 338 +- hw/ide/microdrive.c | 6 +- hw/ide/mmio.c | 98 +- hw/ide/pci.c | 42 +- hw/ide/pci.h | 8 +- hw/ide/piix.c | 59 +- hw/ide/qdev.c | 34 +- hw/ide/via.c | 41 +- hw/imx.h | 34 - hw/imx_avic.c | 408 - hw/imx_ccm.c | 321 - hw/imx_serial.c | 467 - hw/imx_timer.c | 689 -- hw/input/Makefile.objs | 13 + hw/input/adb.c | 581 ++ hw/input/hid.c | 498 + hw/input/lm832x.c | 521 + hw/input/milkymist-softusb.c | 338 + hw/input/pckbd.c | 542 + hw/input/pl050.c | 205 + hw/input/ps2.c | 676 ++ hw/input/pxa2xx_keypad.c | 335 + hw/input/stellaris_input.c | 89 + hw/input/tsc2005.c | 593 ++ hw/input/tsc210x.c | 1293 +++ hw/input/vmmouse.c | 303 + hw/intc/Makefile.objs | 25 + hw/intc/apic.c | 911 ++ hw/intc/apic_common.c | 408 + hw/intc/arm_gic.c | 725 ++ hw/intc/arm_gic_common.c | 176 + hw/intc/arm_gic_kvm.c | 169 + hw/intc/armv7m_nvic.c | 559 ++ hw/intc/etraxfs_pic.c | 187 + hw/intc/exynos4210_combiner.c | 460 + hw/intc/exynos4210_gic.c | 473 + hw/intc/gic_internal.h | 141 + hw/intc/grlib_irqmp.c | 372 + hw/intc/heathrow_pic.c | 215 + hw/intc/i8259.c | 522 + hw/intc/i8259_common.c | 157 + hw/intc/imx_avic.c | 416 + hw/intc/ioapic.c | 259 + hw/intc/ioapic_common.c | 118 + hw/intc/lm32_pic.c | 204 + hw/intc/omap_intc.c | 662 ++ hw/intc/openpic.c | 1663 +++ hw/intc/openpic_kvm.c | 264 + hw/intc/pl190.c | 293 + hw/intc/puv3_intc.c | 140 + hw/intc/realview_gic.c | 81 + hw/intc/sh_intc.c | 512 + hw/intc/slavio_intctl.c | 473 + hw/intc/xics.c | 708 ++ hw/intc/xilinx_intc.c | 200 + hw/integratorcp.c | 565 -- hw/intel-hda-defs.h | 717 -- hw/intel-hda.c | 1302 --- hw/intel-hda.h | 72 - hw/ioapic.c | 259 - hw/ioapic.h | 27 - hw/ioapic_common.c | 120 - hw/ioapic_internal.h | 102 - hw/ioh3420.c | 250 - hw/ioh3420.h | 10 - hw/irq.c | 136 - hw/irq.h | 57 - hw/isa-bus.c | 267 - hw/isa.h | 103 - hw/isa/Makefile.objs | 8 + hw/isa/apm.c | 102 + hw/isa/i82378.c | 149 + hw/isa/isa-bus.c | 261 + hw/isa/lpc_ich9.c | 629 ++ hw/isa/pc87312.c | 400 + hw/isa/piix4.c | 132 + hw/isa/vt82c686.c | 502 + hw/isa_mmio.c | 81 - hw/ivshmem.c | 821 -- hw/jazz_led.c | 291 - hw/kvm/Makefile.objs | 1 - hw/kvm/apic.c | 209 - hw/kvm/clock.c | 143 - hw/kvm/clock.h | 24 - hw/kvm/i8254.c | 317 - hw/kvm/i8259.c | 138 - hw/kvm/ioapic.c | 165 - hw/kvm/pci-assign.c | 1918 ---- hw/kvmvapic.c | 821 -- hw/kzm.c | 156 - hw/lan9118.c | 1399 --- hw/lance.c | 170 - hw/leon3.c | 223 - hw/lm32.h | 25 - hw/lm32/Makefile.objs | 20 - hw/lm32/lm32.h | 29 + hw/lm32/lm32_boards.c | 309 + hw/lm32/lm32_hwsetup.h | 178 + hw/lm32/milkymist-hw.h | 207 + hw/lm32/milkymist.c | 219 + hw/lm32_boards.c | 307 - hw/lm32_hwsetup.h | 178 - hw/lm32_juart.c | 159 - hw/lm32_juart.h | 11 - hw/lm32_pic.c | 199 - hw/lm32_pic.h | 14 - hw/lm32_sys.c | 172 - hw/lm32_timer.c | 230 - hw/lm32_uart.c | 296 - hw/lm4549.c | 336 - hw/lm4549.h | 43 - hw/lm832x.c | 521 - hw/loader.c | 801 -- hw/loader.h | 49 - hw/lpc_ich9.c | 525 - hw/lsi53c895a.c | 2141 ---- hw/m25p80.c | 651 -- hw/m48t59.c | 778 -- hw/m68k/Makefile.objs | 4 +- hw/m68k/an5206.c | 100 + hw/m68k/dummy_m68k.c | 84 + hw/m68k/mcf5206.c | 548 + hw/m68k/mcf5208.c | 306 + hw/m68k/mcf_intc.c | 154 + hw/mac_dbdma.c | 854 -- hw/mac_dbdma.h | 44 - hw/mac_nvram.c | 178 - hw/macio.c | 140 - hw/mainstone.c | 189 - hw/marvell_88w8618_audio.c | 303 - hw/max111x.c | 193 - hw/max7310.c | 213 - hw/mc146818rtc.c | 913 -- hw/mc146818rtc.h | 11 - hw/mc146818rtc_regs.h | 67 - hw/mcf.h | 30 - hw/mcf5206.c | 548 - hw/mcf5208.c | 302 - hw/mcf_fec.c | 480 - hw/mcf_intc.c | 154 - hw/mcf_uart.c | 306 - hw/megasas.c | 2213 ---- hw/mfi.h | 1249 --- hw/microblaze/Makefile.objs | 12 +- hw/microblaze/boot.c | 164 + hw/microblaze/boot.h | 10 + hw/microblaze/petalogix_ml605_mmu.c | 197 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 127 + hw/microblaze/pic_cpu.c | 47 + hw/microblaze/pic_cpu.h | 8 + hw/microblaze_boot.c | 177 - hw/microblaze_boot.h | 10 - hw/microblaze_pic_cpu.c | 44 - hw/microblaze_pic_cpu.h | 8 - hw/milkymist-ac97.c | 344 - hw/milkymist-hpdmc.c | 170 - hw/milkymist-hw.h | 223 - hw/milkymist-memcard.c | 303 - hw/milkymist-minimac2.c | 550 - hw/milkymist-pfpu.c | 544 - hw/milkymist-softusb.c | 331 - hw/milkymist-sysctl.c | 338 - hw/milkymist-tmu2.c | 490 - hw/milkymist-uart.c | 243 - hw/milkymist-vgafb.c | 334 - hw/milkymist-vgafb_template.h | 74 - hw/milkymist.c | 218 - hw/mips-bios.h | 8 - hw/mips.h | 29 - hw/mips/Makefile.objs | 10 +- hw/mips/addr.c | 34 + hw/mips/cputimer.c | 147 + hw/mips/gt64xxx_pci.c | 1189 +++ hw/mips/mips_fulong2e.c | 414 + hw/mips/mips_int.c | 67 + hw/mips/mips_jazz.c | 347 + hw/mips/mips_malta.c | 1153 +++ hw/mips/mips_mipssim.c | 243 + hw/mips/mips_r4k.c | 317 + hw/mips_addr.c | 34 - hw/mips_cpudevs.h | 15 - hw/mips_fulong2e.c | 410 - hw/mips_int.c | 65 - hw/mips_jazz.c | 343 - hw/mips_malta.c | 1033 -- hw/mips_mipssim.c | 238 - hw/mips_r4k.c | 312 - hw/mips_timer.c | 147 - hw/mipsnet.c | 284 - hw/misc/Makefile.objs | 43 + hw/misc/a9scu.c | 165 + hw/misc/applesmc.c | 281 + hw/misc/arm_l2x0.c | 199 + hw/misc/arm_sysctl.c | 656 ++ hw/misc/cbus.c | 618 ++ hw/misc/debugexit.c | 76 + hw/misc/eccmemctl.c | 345 + hw/misc/exynos4210_pmu.c | 503 + hw/misc/imx_ccm.c | 326 + hw/misc/ivshmem.c | 839 ++ hw/misc/lm32_sys.c | 176 + hw/misc/macio/Makefile.objs | 3 + hw/misc/macio/cuda.c | 740 ++ hw/misc/macio/mac_dbdma.c | 764 ++ hw/misc/macio/macio.c | 402 + hw/misc/max111x.c | 193 + hw/misc/milkymist-hpdmc.c | 175 + hw/misc/milkymist-pfpu.c | 549 + hw/misc/mst_fpga.c | 267 + hw/misc/omap_clk.c | 1264 +++ hw/misc/omap_gpmc.c | 894 ++ hw/misc/omap_l4.c | 162 + hw/misc/omap_sdrc.c | 168 + hw/misc/omap_tap.c | 116 + hw/misc/pc-testdev.c | 207 + hw/misc/pci-testdev.c | 334 + hw/misc/puv3_pm.c | 153 + hw/misc/pvpanic.c | 147 + hw/misc/pxa2xx_pcmcia.c | 207 + hw/misc/sga.c | 67 + hw/misc/slavio_misc.c | 517 + hw/misc/tmp105.c | 269 + hw/misc/tmp105.h | 47 + hw/misc/vfio.c | 3322 ++++++ hw/misc/vmport.c | 180 + hw/misc/zynq_slcr.c | 539 + hw/moxie/Makefile.objs | 2 + hw/moxie/moxiesim.c | 174 + hw/mpc8544_guts.c | 143 - hw/msi.c | 395 - hw/msi.h | 50 - hw/msix.c | 562 -- hw/msix.h | 41 - hw/msmouse.c | 78 - hw/msmouse.h | 2 - hw/mst_fpga.c | 263 - hw/multiboot.c | 349 - hw/multiboot.h | 12 - hw/musicpal.c | 1697 ---- hw/nand.c | 789 -- hw/ne2000-isa.c | 112 - hw/ne2000.c | 788 -- hw/ne2000.h | 35 - hw/net/Makefile.objs | 33 + hw/net/cadence_gem.c | 1224 +++ hw/net/dp8393x.c | 914 ++ hw/net/e1000.c | 1422 +++ hw/net/e1000_regs.h | 893 ++ hw/net/eepro100.c | 2116 ++++ hw/net/etraxfs_eth.c | 663 ++ hw/net/lan9118.c | 1406 +++ hw/net/lance.c | 178 + hw/net/mcf_fec.c | 480 + hw/net/milkymist-minimac2.c | 551 + hw/net/mipsnet.c | 290 + hw/net/ne2000-isa.c | 116 + hw/net/ne2000.c | 790 ++ hw/net/ne2000.h | 40 + hw/net/opencores_eth.c | 740 ++ hw/net/pcnet-pci.c | 384 + hw/net/pcnet.c | 1772 ++++ hw/net/pcnet.h | 70 + hw/net/rtl8139.c | 3581 +++++++ hw/net/smc91c111.c | 814 ++ hw/net/spapr_llan.c | 557 + hw/net/stellaris_enet.c | 462 + hw/net/vhost_net.c | 331 + hw/net/virtio-net.c | 1667 +++ hw/net/vmware_utils.h | 143 + hw/net/vmxnet3.c | 2472 +++++ hw/net/vmxnet3.h | 757 ++ hw/net/vmxnet_debug.h | 115 + hw/net/vmxnet_rx_pkt.c | 187 + hw/net/vmxnet_rx_pkt.h | 174 + hw/net/vmxnet_tx_pkt.c | 567 ++ hw/net/vmxnet_tx_pkt.h | 148 + hw/net/xen_nic.c | 439 + hw/net/xgmac.c | 440 + hw/net/xilinx_axienet.c | 1071 ++ hw/net/xilinx_ethlite.c | 269 + hw/nseries.c | 1428 --- hw/null-machine.c | 35 - hw/nvram.h | 34 - hw/nvram/Makefile.objs | 5 + hw/nvram/ds1225y.c | 170 + hw/nvram/eeprom93xx.c | 337 + hw/nvram/fw_cfg.c | 598 ++ hw/nvram/mac_nvram.c | 196 + hw/nvram/spapr_nvram.c | 200 + hw/omap.h | 1015 -- hw/omap1.c | 4053 -------- hw/omap2.c | 2684 ----- hw/omap_clk.c | 1264 --- hw/omap_dma.c | 2089 ---- hw/omap_dss.c | 1086 -- hw/omap_gpio.c | 792 -- hw/omap_gpmc.c | 894 -- hw/omap_gptimer.c | 488 - hw/omap_i2c.c | 492 - hw/omap_intc.c | 649 -- hw/omap_l4.c | 162 - hw/omap_lcd_template.h | 175 - hw/omap_lcdc.c | 489 - hw/omap_mmc.c | 641 -- hw/omap_sdrc.c | 168 - hw/omap_spi.c | 349 - hw/omap_sx1.c | 236 - hw/omap_synctimer.c | 102 - hw/omap_tap.c | 116 - hw/omap_uart.c | 187 - hw/onenand.c | 841 -- hw/opencores_eth.c | 733 -- hw/openpic.c | 1710 ---- hw/openpic.h | 18 - hw/openrisc/Makefile.objs | 5 +- hw/openrisc/cputimer.c | 103 + hw/openrisc/openrisc_sim.c | 150 + hw/openrisc/pic_cpu.c | 61 + hw/openrisc_pic.c | 60 - hw/openrisc_sim.c | 149 - hw/openrisc_timer.c | 101 - hw/palm.c | 290 - hw/pam.c | 87 - hw/pam.h | 97 - hw/parallel.c | 614 -- hw/pc.c | 1109 -- hw/pc.h | 189 - hw/pc_piix.c | 646 -- hw/pc_q35.c | 223 - hw/pc_sysfw.c | 266 - hw/pci-bridge/Makefile.objs | 5 + hw/pci-bridge/dec.c | 156 + hw/pci-bridge/dec.h | 10 + hw/pci-bridge/i82801b11.c | 130 + hw/pci-bridge/ioh3420.c | 236 + hw/pci-bridge/ioh3420.h | 10 + hw/pci-bridge/pci_bridge_dev.c | 165 + hw/pci-bridge/xio3130_downstream.c | 203 + hw/pci-bridge/xio3130_downstream.h | 11 + hw/pci-bridge/xio3130_upstream.c | 183 + hw/pci-bridge/xio3130_upstream.h | 10 + hw/pci-host/Makefile.objs | 17 + hw/pci-host/apb.c | 580 ++ hw/pci-host/bonito.c | 842 ++ hw/pci-host/grackle.c | 165 + hw/pci-host/pam.c | 89 + hw/pci-host/piix.c | 744 ++ hw/pci-host/ppce500.c | 428 + hw/pci-host/prep.c | 235 + hw/pci-host/q35.c | 390 + hw/pci-host/uninorth.c | 492 + hw/pci-host/versatile.c | 532 + hw/pci-hotplug.c | 293 - hw/pci-stub.c | 47 - hw/pci.c | 2168 ---- hw/pci.h | 684 -- hw/pci/Makefile.objs | 11 + hw/pci/msi.c | 395 + hw/pci/msix.c | 604 ++ hw/pci/pci-hotplug-old.c | 337 + hw/pci/pci-stub.c | 47 + hw/pci/pci.c | 2264 +++++ hw/pci/pci_bridge.c | 420 + hw/pci/pci_host.c | 181 + hw/pci/pcie.c | 571 ++ hw/pci/pcie_aer.c | 1031 ++ hw/pci/pcie_host.c | 162 + hw/pci/pcie_port.c | 170 + hw/pci/shpc.c | 682 ++ hw/pci/slotid_cap.c | 45 + hw/pci_bridge.c | 363 - hw/pci_bridge.h | 66 - hw/pci_bridge_dev.c | 171 - hw/pci_host.c | 180 - hw/pci_host.h | 62 - hw/pci_ids.h | 147 - hw/pci_internals.h | 78 - hw/pci_regs.h | 717 -- hw/pcie.c | 555 - hw/pcie.h | 142 - hw/pcie_aer.c | 1032 -- hw/pcie_aer.h | 106 - hw/pcie_host.c | 161 - hw/pcie_host.h | 54 - hw/pcie_port.c | 114 - hw/pcie_port.h | 51 - hw/pcie_regs.h | 156 - hw/pckbd.c | 527 - hw/pcmcia.h | 51 - hw/pcnet-pci.c | 376 - hw/pcnet.c | 1767 ---- hw/pcnet.h | 65 - hw/pcspk.c | 201 - hw/pcspk.h | 45 - hw/petalogix_ml605_mmu.c | 184 - hw/petalogix_s3adsp1800_mmu.c | 126 - hw/pflash_cfi01.c | 754 -- hw/pflash_cfi02.c | 786 -- hw/piix4.c | 132 - hw/piix_pci.c | 584 -- hw/pixel_ops.h | 53 - hw/pl011.c | 330 - hw/pl022.c | 308 - hw/pl031.c | 265 - hw/pl041.c | 647 -- hw/pl041.h | 135 - hw/pl041.hx | 81 - hw/pl050.c | 200 - hw/pl061.c | 336 - hw/pl080.c | 421 - hw/pl110.c | 532 - hw/pl110_template.h | 395 - hw/pl181.c | 515 - hw/pl190.c | 289 - hw/pm_smbus.c | 176 - hw/pm_smbus.h | 21 - hw/ppc-viosrp.h | 216 - hw/ppc.c | 1317 --- hw/ppc.h | 92 - hw/ppc/Makefile.objs | 41 +- hw/ppc/e500-ccsr.h | 17 + hw/ppc/e500.c | 409 +- hw/ppc/e500.h | 4 + hw/ppc/e500plat.c | 19 +- hw/ppc/mac.h | 184 + hw/ppc/mac_newworld.c | 488 + hw/ppc/mac_oldworld.c | 361 + hw/ppc/mpc8544_guts.c | 140 + hw/ppc/mpc8544ds.c | 9 +- hw/ppc/ppc.c | 1364 +++ hw/ppc/ppc405.h | 81 + hw/ppc/ppc405_boards.c | 662 ++ hw/ppc/ppc405_uc.c | 2548 +++++ hw/ppc/ppc440_bamboo.c | 307 + hw/ppc/ppc4xx_devs.c | 721 ++ hw/ppc/ppc4xx_pci.c | 414 + hw/ppc/ppc_booke.c | 326 + hw/ppc/ppce500_spin.c | 224 + hw/ppc/prep.c | 702 ++ hw/ppc/spapr.c | 1336 +++ hw/ppc/spapr_events.c | 321 + hw/ppc/spapr_hcall.c | 739 ++ hw/ppc/spapr_iommu.c | 336 + hw/ppc/spapr_pci.c | 868 ++ hw/ppc/spapr_rtas.c | 327 + hw/ppc/spapr_vio.c | 675 ++ hw/ppc/virtex_ml507.c | 256 + hw/ppc405.h | 81 - hw/ppc405_boards.c | 660 -- hw/ppc405_uc.c | 2540 ----- hw/ppc440_bamboo.c | 305 - hw/ppc4xx.h | 64 - hw/ppc4xx_devs.c | 721 -- hw/ppc4xx_pci.c | 414 - hw/ppc_booke.c | 254 - hw/ppc_mac.h | 81 - hw/ppc_newworld.c | 431 - hw/ppc_oldworld.c | 351 - hw/ppc_prep.c | 704 -- hw/ppce500_pci.c | 393 - hw/ppce500_spin.c | 227 - hw/prep_pci.c | 208 - hw/primecell.h | 12 - hw/ps2.c | 676 -- hw/ps2.h | 38 - hw/ptimer.c | 231 - hw/ptimer.h | 39 - hw/puv3.c | 133 - hw/puv3.h | 49 - hw/puv3_dma.c | 109 - hw/puv3_gpio.c | 141 - hw/puv3_intc.c | 135 - hw/puv3_ost.c | 151 - hw/puv3_pm.c | 149 - hw/pxa.h | 191 - hw/pxa2xx.c | 2291 ----- hw/pxa2xx_dma.c | 574 -- hw/pxa2xx_gpio.c | 349 - hw/pxa2xx_keypad.c | 335 - hw/pxa2xx_lcd.c | 1051 -- hw/pxa2xx_mmci.c | 553 - hw/pxa2xx_pcmcia.c | 207 - hw/pxa2xx_pic.c | 334 - hw/pxa2xx_template.h | 435 - hw/pxa2xx_timer.c | 536 - hw/q35.c | 309 - hw/q35.h | 150 - hw/qdev-addr.c | 77 - hw/qdev-addr.h | 5 - hw/qdev-core.h | 233 - hw/qdev-dma.h | 10 - hw/qdev-monitor.c | 616 -- hw/qdev-monitor.h | 16 - hw/qdev-properties.c | 1281 --- hw/qdev-properties.h | 130 - hw/qdev.c | 798 -- hw/qdev.h | 9 - hw/qxl-logger.c | 275 - hw/qxl-render.c | 278 - hw/qxl.c | 2340 ----- hw/qxl.h | 160 - hw/r2d.c | 357 - hw/rc4030.c | 825 -- hw/realview.c | 400 - hw/realview_gic.c | 74 - hw/rtl8139.c | 3554 ------- hw/s390-virtio-bus.c | 571 -- hw/s390-virtio-bus.h | 102 - hw/s390-virtio.c | 354 - hw/s390x/Makefile.objs | 9 +- hw/s390x/css.c | 1280 +++ hw/s390x/css.h | 100 + hw/s390x/event-facility.c | 12 +- hw/s390x/event-facility.h | 96 - hw/s390x/ipl.c | 199 + hw/s390x/s390-virtio-bus.c | 738 ++ hw/s390x/s390-virtio-bus.h | 187 + hw/s390x/s390-virtio-ccw.c | 137 + hw/s390x/s390-virtio-hcall.c | 36 + hw/s390x/s390-virtio.c | 304 + hw/s390x/s390-virtio.h | 29 + hw/s390x/sclp.c | 8 +- hw/s390x/sclp.h | 118 - hw/s390x/sclpconsole.c | 306 - hw/s390x/sclpquiesce.c | 8 +- hw/s390x/virtio-ccw.c | 1342 +++ hw/s390x/virtio-ccw.h | 184 + hw/sb16.c | 1424 --- hw/sbi.c | 156 - hw/scsi-bus.c | 1881 ---- hw/scsi-defs.h | 303 - hw/scsi-disk.c | 2501 ----- hw/scsi-generic.c | 516 - hw/scsi.h | 255 - hw/scsi/Makefile.objs | 13 + hw/scsi/esp-pci.c | 533 + hw/scsi/esp.c | 738 ++ hw/scsi/lsi53c895a.c | 2159 ++++ hw/scsi/megasas.c | 2232 ++++ hw/scsi/mfi.h | 1249 +++ hw/scsi/scsi-bus.c | 1907 ++++ hw/scsi/scsi-disk.c | 2546 +++++ hw/scsi/scsi-generic.c | 520 + hw/scsi/spapr_vscsi.c | 1109 ++ hw/scsi/srp.h | 240 + hw/scsi/vhost-scsi.c | 289 + hw/scsi/viosrp.h | 216 + hw/scsi/virtio-scsi.c | 711 ++ hw/scsi/vmw_pvscsi.c | 1217 +++ hw/scsi/vmw_pvscsi.h | 434 + hw/sd.c | 1764 ---- hw/sd.h | 80 - hw/sd/Makefile.objs | 8 + hw/sd/milkymist-memcard.c | 307 + hw/sd/omap_mmc.c | 641 ++ hw/sd/pl181.c | 520 + hw/sd/pxa2xx_mmci.c | 553 + hw/sd/sd.c | 1771 ++++ hw/sd/sdhci.c | 1300 +++ hw/sd/sdhci.h | 312 + hw/sd/ssi-sd.c | 274 + hw/serial-isa.c | 130 - hw/serial-pci.c | 252 - hw/serial.c | 797 -- hw/serial.h | 99 - hw/sga.c | 63 - hw/sh.h | 57 - hw/sh4/Makefile.objs | 7 +- hw/sh4/r2d.c | 367 + hw/sh4/sh7750.c | 843 ++ hw/sh4/sh7750_regnames.c | 97 + hw/sh4/sh7750_regnames.h | 6 + hw/sh4/sh7750_regs.h | 1277 +++ hw/sh4/sh_pci.c | 198 + hw/sh4/shix.c | 107 + hw/sh7750.c | 838 -- hw/sh7750_regnames.c | 97 - hw/sh7750_regnames.h | 6 - hw/sh7750_regs.h | 1277 --- hw/sh_intc.c | 511 - hw/sh_intc.h | 83 - hw/sh_pci.c | 186 - hw/sh_serial.c | 408 - hw/sh_timer.c | 333 - hw/sharpsl.h | 17 - hw/shix.c | 102 - hw/shpc.c | 681 -- hw/shpc.h | 48 - hw/slavio_intctl.c | 471 - hw/slavio_misc.c | 508 - hw/slavio_timer.c | 435 - hw/slotid_cap.c | 44 - hw/slotid_cap.h | 11 - hw/sm501.c | 1447 --- hw/sm501_template.h | 145 - hw/smbios.c | 241 - hw/smbios.h | 162 - hw/smbus.c | 335 - hw/smbus.h | 83 - hw/smbus_eeprom.c | 156 - hw/smbus_ich9.c | 159 - hw/smc91c111.c | 805 -- hw/soc_dma.c | 366 - hw/soc_dma.h | 110 - hw/spapr.c | 937 -- hw/spapr.h | 356 - hw/spapr_events.c | 321 - hw/spapr_hcall.c | 745 -- hw/spapr_iommu.c | 287 - hw/spapr_llan.c | 523 - hw/spapr_pci.c | 771 -- hw/spapr_pci.h | 86 - hw/spapr_rtas.c | 332 - hw/spapr_vio.c | 666 -- hw/spapr_vio.h | 136 - hw/spapr_vscsi.c | 983 -- hw/spapr_vty.c | 221 - hw/sparc/Makefile.objs | 9 +- hw/sparc/leon3.c | 227 + hw/sparc/sun4m.c | 1506 +++ hw/sparc32_dma.c | 315 - hw/sparc32_dma.h | 12 - hw/sparc64/Makefile.objs | 5 +- hw/sparc64/sun4u.c | 1028 ++ hw/spitz.c | 1134 --- hw/srp.h | 240 - hw/ssd0303.c | 321 - hw/ssd0323.c | 372 - hw/ssi-sd.c | 274 - hw/ssi.c | 174 - hw/ssi.h | 93 - hw/ssi/Makefile.objs | 6 + hw/ssi/omap_spi.c | 373 + hw/ssi/pl022.c | 313 + hw/ssi/ssi.c | 174 + hw/ssi/xilinx_spi.c | 391 + hw/ssi/xilinx_spips.c | 772 ++ hw/stellaris.c | 1399 --- hw/stellaris_enet.c | 449 - hw/stellaris_input.c | 89 - hw/stream.c | 23 - hw/stream.h | 31 - hw/strongarm.c | 1622 --- hw/strongarm.h | 68 - hw/sun4c_intctl.c | 208 - hw/sun4m.c | 1927 ---- hw/sun4m.h | 36 - hw/sun4m_iommu.c | 388 - hw/sun4u.c | 1012 -- hw/sysbus.c | 297 - hw/sysbus.h | 89 - hw/tc58128.c | 178 - hw/tc6393xb.c | 587 -- hw/tc6393xb_template.h | 67 - hw/tcx.c | 730 -- hw/timer/Makefile.objs | 29 + hw/timer/arm_mptimer.c | 316 + hw/timer/arm_timer.c | 411 + hw/timer/cadence_ttc.c | 495 + hw/timer/ds1338.c | 236 + hw/timer/etraxfs_timer.c | 357 + hw/timer/exynos4210_mct.c | 1486 +++ hw/timer/exynos4210_pwm.c | 426 + hw/timer/exynos4210_rtc.c | 596 ++ hw/timer/grlib_gptimer.c | 410 + hw/timer/hpet.c | 773 ++ hw/timer/i8254.c | 377 + hw/timer/i8254_common.c | 302 + hw/timer/imx_epit.c | 432 + hw/timer/imx_gpt.c | 557 + hw/timer/lm32_timer.c | 235 + hw/timer/m48t59.c | 795 ++ hw/timer/mc146818rtc.c | 924 ++ hw/timer/milkymist-sysctl.c | 342 + hw/timer/omap_gptimer.c | 488 + hw/timer/omap_synctimer.c | 102 + hw/timer/pl031.c | 269 + hw/timer/puv3_ost.c | 155 + hw/timer/pxa2xx_timer.c | 599 ++ hw/timer/sh_timer.c | 333 + hw/timer/slavio_timer.c | 440 + hw/timer/tusb6010.c | 819 ++ hw/timer/twl92230.c | 882 ++ hw/timer/xilinx_timer.c | 260 + hw/tmp105.c | 253 - hw/tosa.c | 301 - hw/tpm/Makefile.objs | 2 + hw/tpm/tpm_int.h | 67 + hw/tpm/tpm_passthrough.c | 552 + hw/tpm/tpm_tis.c | 931 ++ hw/tpm/tpm_tis.h | 75 + hw/tsc2005.c | 593 -- hw/tsc210x.c | 1293 --- hw/tusb6010.c | 813 -- hw/twl92230.c | 882 -- hw/unicore32/Makefile.objs | 2 - hw/unicore32/puv3.c | 139 + hw/unin_pci.c | 492 - hw/usb.h | 547 - hw/usb/Makefile.objs | 38 +- hw/usb/bus.c | 58 +- hw/usb/ccid-card-emulated.c | 612 ++ hw/usb/ccid-card-passthru.c | 413 + hw/usb/ccid.h | 65 + hw/usb/combined-packet.c | 2 +- hw/usb/core.c | 43 +- hw/usb/desc.c | 17 +- hw/usb/dev-audio.c | 4 +- hw/usb/dev-bluetooth.c | 7 +- hw/usb/dev-hid.c | 113 +- hw/usb/dev-hub.c | 23 +- hw/usb/dev-network.c | 36 +- hw/usb/dev-serial.c | 21 +- hw/usb/dev-smartcard-reader.c | 258 +- hw/usb/dev-storage.c | 131 +- hw/usb/dev-uas.c | 260 +- hw/usb/dev-wacom.c | 9 +- hw/usb/hcd-ehci-pci.c | 70 +- hw/usb/hcd-ehci-sysbus.c | 179 +- hw/usb/hcd-ehci.c | 481 +- hw/usb/hcd-ehci.h | 85 +- hw/usb/hcd-musb.c | 4 +- hw/usb/hcd-ohci.c | 286 +- hw/usb/hcd-uhci.c | 217 +- hw/usb/hcd-xhci.c | 784 ++- hw/usb/host-bsd.c | 13 +- hw/usb/host-legacy.c | 144 + hw/usb/host-libusb.c | 1528 +++ hw/usb/host-linux.c | 157 +- hw/usb/host-stub.c | 11 +- hw/usb/host.h | 44 + hw/usb/libhw.c | 8 +- hw/usb/quirks-ftdi-ids.h | 1255 +++ hw/usb/quirks-pl2303-ids.h | 150 + hw/usb/quirks.c | 53 + hw/usb/quirks.h | 910 ++ hw/usb/redirect.c | 525 +- hw/versatile_i2c.c | 107 - hw/versatile_pci.c | 164 - hw/versatilepb.c | 401 - hw/vexpress.c | 498 - hw/vfio_pci.c | 2138 ---- hw/vga-isa-mm.c | 143 - hw/vga-isa.c | 101 - hw/vga-pci.c | 215 - hw/vga.c | 2450 ----- hw/vga.h | 159 - hw/vga_int.h | 214 - hw/vga_template.h | 459 - hw/vhost.c | 964 -- hw/vhost.h | 56 - hw/vhost_net.c | 237 - hw/vhost_net.h | 20 - hw/virtex_ml507.c | 274 - hw/virtio-balloon.c | 274 - hw/virtio-balloon.h | 55 - hw/virtio-blk.c | 658 -- hw/virtio-blk.h | 114 - hw/virtio-console.c | 182 - hw/virtio-net.c | 1103 -- hw/virtio-net.h | 190 - hw/virtio-pci.c | 1131 --- hw/virtio-pci.h | 62 - hw/virtio-rng.c | 205 - hw/virtio-rng.h | 28 - hw/virtio-scsi.c | 744 -- hw/virtio-scsi.h | 43 - hw/virtio-serial-bus.c | 1045 -- hw/virtio-serial.h | 208 - hw/virtio.c | 1058 -- hw/virtio.h | 247 - hw/virtio/Makefile.objs | 8 + hw/virtio/dataplane/Makefile.objs | 1 + hw/virtio/dataplane/hostmem.c | 183 + hw/virtio/dataplane/vring.c | 366 + hw/virtio/vhost.c | 1072 ++ hw/virtio/virtio-balloon.c | 414 + hw/virtio/virtio-bus.c | 190 + hw/virtio/virtio-mmio.c | 425 + hw/virtio/virtio-pci.c | 1562 +++ hw/virtio/virtio-pci.h | 206 + hw/virtio/virtio-rng.c | 236 + hw/virtio/virtio.c | 1199 +++ hw/vmmouse.c | 302 - hw/vmport.c | 170 - hw/vmware_vga.c | 1259 --- hw/vt82c686.c | 559 -- hw/vt82c686.h | 11 - hw/watchdog.c | 147 - hw/watchdog.h | 43 - hw/watchdog/Makefile.objs | 3 + hw/watchdog/watchdog.c | 146 + hw/watchdog/wdt_i6300esb.c | 470 + hw/watchdog/wdt_ib700.c | 156 + hw/wdt_i6300esb.c | 455 - hw/wdt_ib700.c | 145 - hw/wm8750.c | 716 -- hw/xen-host-pci-device.c | 396 - hw/xen-host-pci-device.h | 55 - hw/xen.h | 58 - hw/xen/Makefile.objs | 6 + hw/xen/xen-host-pci-device.c | 396 + hw/xen/xen-host-pci-device.h | 55 + hw/xen/xen_apic.c | 95 + hw/xen/xen_backend.c | 800 ++ hw/xen/xen_devconfig.c | 174 + hw/xen/xen_platform.c | 449 + hw/xen/xen_pt.c | 850 ++ hw/xen/xen_pt.h | 302 + hw/xen/xen_pt_config_init.c | 1882 ++++ hw/xen/xen_pt_msi.c | 621 ++ hw/xen/xen_pvdevice.c | 131 + hw/xen_apic.c | 95 - hw/xen_backend.c | 800 -- hw/xen_backend.h | 110 - hw/xen_blkif.h | 103 - hw/xen_common.h | 160 - hw/xen_console.c | 295 - hw/xen_devconfig.c | 174 - hw/xen_disk.c | 985 -- hw/xen_domainbuild.c | 299 - hw/xen_domainbuild.h | 13 - hw/xen_machine_pv.c | 125 - hw/xen_nic.c | 439 - hw/xen_platform.c | 436 - hw/xen_pt.c | 844 -- hw/xen_pt.h | 302 - hw/xen_pt_config_init.c | 1882 ---- hw/xen_pt_msi.c | 620 -- hw/xenfb.c | 1025 -- hw/xgmac.c | 433 - hw/xics.c | 573 -- hw/xics.h | 39 - hw/xilinx.h | 92 - hw/xilinx_axidma.c | 524 - hw/xilinx_axienet.c | 910 -- hw/xilinx_ethlite.c | 258 - hw/xilinx_intc.c | 190 - hw/xilinx_spi.c | 385 - hw/xilinx_spips.c | 575 -- hw/xilinx_timer.c | 255 - hw/xilinx_uartlite.c | 234 - hw/xilinx_zynq.c | 213 - hw/xio3130_downstream.c | 217 - hw/xio3130_downstream.h | 11 - hw/xio3130_upstream.c | 192 - hw/xio3130_upstream.h | 10 - hw/xtensa/Makefile.objs | 4 +- hw/xtensa/pic_cpu.c | 166 + hw/xtensa/xtensa_bootparam.h | 25 + hw/xtensa/xtensa_lx60.c | 317 + hw/xtensa/xtensa_sim.c | 119 + hw/xtensa_bootparam.h | 25 - hw/xtensa_lx60.c | 312 - hw/xtensa_pic.c | 164 - hw/xtensa_sim.c | 116 - hw/z2.c | 383 - hw/zaurus.c | 292 - hw/zynq_slcr.c | 535 - hwaddr.h | 24 - i386-dis.c | 6562 ------------ i386.ld | 153 - ia64-dis.c |10602 -------------------- ia64.ld | 209 - include/block/aio.h | 254 + include/block/block.h | 445 + include/block/block_int.h | 423 + include/block/blockjob.h | 278 + include/block/coroutine.h | 223 + include/block/coroutine_int.h | 53 + include/block/nbd.h | 101 + include/block/qapi.h | 47 + include/block/scsi.h | 307 + include/block/snapshot.h | 53 + include/block/thread-pool.h | 41 + include/config.h | 2 + include/disas/bfd.h | 485 + include/disas/disas.h | 43 + include/elf.h | 1443 +++ include/exec/address-spaces.h | 41 + include/exec/cpu-all.h | 494 + include/exec/cpu-common.h | 124 + include/exec/cpu-defs.h | 184 + include/exec/cputlb.h | 48 + include/exec/def-helper.h | 275 + include/exec/exec-all.h | 453 + include/exec/gdbstub.h | 98 + include/exec/gen-icount.h | 65 + include/exec/hwaddr.h | 20 + include/exec/ioport.h | 74 + include/exec/memory-internal.h | 124 + include/exec/memory.h | 1061 ++ include/exec/poison.h | 62 + include/exec/softmmu-semi.h | 79 + include/exec/softmmu_defs.h | 37 + include/exec/softmmu_exec.h | 163 + include/exec/softmmu_header.h | 213 + include/exec/softmmu_template.h | 328 + include/exec/spinlock.h | 49 + include/exec/user/abitypes.h | 70 + include/exec/user/thunk.h | 189 + include/fpu/softfloat.h | 641 ++ include/glib-compat.h | 27 + include/hw/acpi/acpi.h | 170 + include/hw/acpi/ich9.h | 52 + include/hw/arm/arm.h | 74 + include/hw/arm/exynos4210.h | 137 + include/hw/arm/imx.h | 34 + include/hw/arm/omap.h | 1015 ++ include/hw/arm/primecell.h | 12 + include/hw/arm/pxa.h | 191 + include/hw/arm/sharpsl.h | 17 + include/hw/arm/soc_dma.h | 116 + include/hw/audio/audio.h | 10 + include/hw/audio/pcspk.h | 47 + include/hw/block/block.h | 79 + include/hw/block/fdc.h | 26 + include/hw/block/flash.h | 64 + include/hw/boards.h | 56 + include/hw/bt.h | 2190 ++++ include/hw/char/escc.h | 14 + include/hw/char/lm32_juart.h | 13 + include/hw/char/serial.h | 97 + include/hw/cpu/icc_bus.h | 82 + include/hw/cris/etraxfs.h | 51 + include/hw/cris/etraxfs_dma.h | 34 + include/hw/devices.h | 70 + include/hw/elf_ops.h | 309 + include/hw/empty_slot.h | 7 + include/hw/hw.h | 75 + include/hw/i2c/i2c.h | 88 + include/hw/i2c/pm_smbus.h | 20 + include/hw/i2c/smbus.h | 83 + include/hw/i386/apic-msidef.h | 30 + include/hw/i386/apic.h | 32 + include/hw/i386/apic_internal.h | 147 + include/hw/i386/ich9.h | 219 + include/hw/i386/ioapic.h | 28 + include/hw/i386/ioapic_internal.h | 102 + include/hw/i386/pc.h | 319 + include/hw/i386/smbios.h | 162 + include/hw/ide.h | 32 + include/hw/input/adb.h | 87 + include/hw/input/hid.h | 84 + include/hw/input/ps2.h | 38 + include/hw/irq.h | 57 + include/hw/isa/apm.h | 25 + include/hw/isa/i8259_internal.h | 83 + include/hw/isa/isa.h | 106 + include/hw/isa/pc87312.h | 68 + include/hw/isa/vt82c686.h | 11 + include/hw/kvm/clock.h | 24 + include/hw/lm32/lm32_pic.h | 14 + include/hw/loader.h | 66 + include/hw/m68k/mcf.h | 30 + include/hw/mips/bios.h | 8 + include/hw/mips/cpudevs.h | 15 + include/hw/mips/mips.h | 32 + include/hw/misc/tmp105_regs.h | 50 + include/hw/nvram/eeprom93xx.h | 40 + include/hw/nvram/fw_cfg.h | 80 + include/hw/nvram/openbios_firmware_abi.h | 73 + include/hw/pci-host/apb.h | 10 + include/hw/pci-host/pam.h | 97 + include/hw/pci-host/ppce500.h | 9 + include/hw/pci-host/q35.h | 159 + include/hw/pci-host/spapr.h | 93 + include/hw/pci/msi.h | 50 + include/hw/pci/msix.h | 57 + include/hw/pci/pci.h | 729 ++ include/hw/pci/pci_bridge.h | 66 + include/hw/pci/pci_bus.h | 83 + include/hw/pci/pci_host.h | 73 + include/hw/pci/pci_ids.h | 156 + include/hw/pci/pci_regs.h | 717 ++ include/hw/pci/pcie.h | 143 + include/hw/pci/pcie_aer.h | 106 + include/hw/pci/pcie_host.h | 54 + include/hw/pci/pcie_port.h | 61 + include/hw/pci/pcie_regs.h | 156 + include/hw/pci/shpc.h | 48 + include/hw/pci/slotid_cap.h | 11 + include/hw/pcmcia.h | 56 + include/hw/ppc/mac_dbdma.h | 172 + include/hw/ppc/openpic.h | 32 + include/hw/ppc/ppc.h | 98 + include/hw/ppc/ppc4xx.h | 64 + include/hw/ppc/ppc_e500.h | 6 + include/hw/ppc/spapr.h | 377 + include/hw/ppc/spapr_vio.h | 142 + include/hw/ppc/xics.h | 103 + include/hw/ptimer.h | 39 + include/hw/qdev-core.h | 327 + include/hw/qdev-dma.h | 10 + include/hw/qdev-properties.h | 198 + include/hw/qdev.h | 8 + include/hw/s390x/event-facility.h | 96 + include/hw/s390x/sclp.h | 118 + include/hw/scsi/esp.h | 132 + include/hw/scsi/scsi.h | 257 + include/hw/sd.h | 80 + include/hw/sh4/sh.h | 57 + include/hw/sh4/sh_intc.h | 83 + include/hw/sparc/grlib.h | 126 + include/hw/sparc/sparc32_dma.h | 12 + include/hw/sparc/sun4m.h | 38 + include/hw/ssi.h | 93 + include/hw/stream.h | 57 + include/hw/sysbus.h | 96 + include/hw/timer/hpet.h | 74 + include/hw/timer/i8254.h | 75 + include/hw/timer/i8254_internal.h | 84 + include/hw/timer/m48t59.h | 37 + include/hw/timer/mc146818rtc.h | 13 + include/hw/timer/mc146818rtc_regs.h | 67 + include/hw/unicore32/puv3.h | 49 + include/hw/usb.h | 572 ++ include/hw/virtio/dataplane/hostmem.h | 58 + include/hw/virtio/dataplane/vring.h | 62 + include/hw/virtio/vhost-scsi.h | 73 + include/hw/virtio/vhost.h | 71 + include/hw/virtio/virtio-9p.h | 24 + include/hw/virtio/virtio-balloon.h | 72 + include/hw/virtio/virtio-blk.h | 153 + include/hw/virtio/virtio-bus.h | 101 + include/hw/virtio/virtio-net.h | 277 + include/hw/virtio/virtio-rng.h | 59 + include/hw/virtio/virtio-scsi.h | 192 + include/hw/virtio/virtio-serial.h | 254 + include/hw/virtio/virtio.h | 252 + include/hw/xen/xen.h | 57 + include/hw/xen/xen_backend.h | 109 + include/hw/xen/xen_common.h | 160 + include/hw/xilinx.h | 96 + include/migration/block.h | 23 + include/migration/migration.h | 165 + include/migration/page_cache.h | 80 + include/migration/qemu-file.h | 266 + include/migration/vmstate.h | 740 ++ include/monitor/monitor.h | 104 + include/monitor/qdev.h | 15 + include/monitor/readline.h | 55 + include/net/checksum.h | 53 + include/net/eth.h | 347 + include/net/net.h | 201 + include/net/queue.h | 58 + include/net/slirp.h | 47 + include/net/tap.h | 69 + include/net/vhost_net.h | 23 + include/qapi/dealloc-visitor.h | 26 + include/qapi/error.h | 85 + include/qapi/opts-visitor.h | 31 + include/qapi/qmp-input-visitor.h | 29 + include/qapi/qmp-output-visitor.h | 28 + include/qapi/qmp/dispatch.h | 55 + include/qapi/qmp/json-lexer.h | 51 + include/qapi/qmp/json-parser.h | 24 + include/qapi/qmp/json-streamer.h | 40 + include/qapi/qmp/qbool.h | 29 + include/qapi/qmp/qdict.h | 70 + include/qapi/qmp/qerror.h | 249 + include/qapi/qmp/qfloat.h | 29 + include/qapi/qmp/qint.h | 28 + include/qapi/qmp/qjson.h | 29 + include/qapi/qmp/qlist.h | 63 + include/qapi/qmp/qobject.h | 113 + include/qapi/qmp/qstring.h | 36 + include/qapi/qmp/types.h | 25 + include/qapi/string-input-visitor.h | 25 + include/qapi/string-output-visitor.h | 26 + include/qapi/visitor-impl.h | 69 + include/qapi/visitor.h | 64 + include/qemu-common.h | 478 + include/qemu-io.h | 46 + include/qemu/acl.h | 74 + include/qemu/aes.h | 45 + include/qemu/atomic.h | 202 + include/qemu/bitmap.h | 222 + include/qemu/bitops.h | 326 + include/qemu/bswap.h | 478 + include/qemu/cache-utils.h | 44 + include/qemu/compatfd.h | 44 + include/qemu/compiler.h | 55 + include/qemu/config-file.h | 24 + include/qemu/cpu.h | 140 - include/qemu/crc32c.h | 35 + include/qemu/envlist.h | 22 + include/qemu/error-report.h | 46 + include/qemu/event_notifier.h | 46 + include/qemu/fifo8.h | 99 + include/qemu/hbitmap.h | 209 + include/qemu/host-utils.h | 322 + include/qemu/int128.h | 144 + include/qemu/iov.h | 115 + include/qemu/log.h | 184 + include/qemu/main-loop.h | 311 + include/qemu/module.h | 40 + include/qemu/notify.h | 72 + include/qemu/object.h | 1003 -- include/qemu/option.h | 160 + include/qemu/option_int.h | 54 + include/qemu/osdep.h | 218 + include/qemu/page_cache.h | 79 - include/qemu/qom-qobject.h | 42 - include/qemu/queue.h | 414 + include/qemu/range.h | 45 + include/qemu/rng-random.h | 22 - include/qemu/rng.h | 93 - include/qemu/sockets.h | 83 + include/qemu/thread-posix.h | 28 + include/qemu/thread-win32.h | 29 + include/qemu/thread.h | 56 + include/qemu/timer.h | 305 + include/qemu/tls.h | 52 + include/qemu/typedefs.h | 69 + include/qemu/uri.h | 113 + include/qemu/xattr.h | 30 + include/qom/cpu.h | 524 + include/qom/object.h | 1137 +++ include/qom/qom-qobject.h | 42 + include/sysemu/arch_init.h | 40 + include/sysemu/balloon.h | 29 + include/sysemu/blockdev.h | 69 + include/sysemu/bt.h | 20 + include/sysemu/char.h | 301 + include/sysemu/cpus.h | 29 + include/sysemu/device_tree.h | 113 + include/sysemu/dma.h | 219 + include/sysemu/dump.h | 28 + include/sysemu/kvm.h | 317 + include/sysemu/memory_mapping.h | 82 + include/sysemu/os-posix.h | 52 + include/sysemu/os-win32.h | 114 + include/sysemu/qtest.h | 53 + include/sysemu/rng-random.h | 22 + include/sysemu/rng.h | 93 + include/sysemu/seccomp.h | 22 + include/sysemu/sysemu.h | 199 + include/sysemu/tpm.h | 23 + include/sysemu/tpm_backend.h | 210 + include/sysemu/tpm_backend_int.h | 45 + include/sysemu/watchdog.h | 43 + include/sysemu/xen-mapcache.h | 56 + include/trace.h | 6 + include/ui/console.h | 344 + include/ui/pixel_ops.h | 53 + include/ui/qemu-pixman.h | 56 + include/ui/qemu-spice.h | 88 + include/ui/spice-display.h | 137 + input.c | 530 - int128.h | 116 - iohandler.c | 47 +- ioport.c | 387 +- ioport.h | 78 - iorange.h | 31 - iov.c | 356 - iov.h | 97 - json-lexer.c | 373 - json-lexer.h | 51 - json-parser.c | 704 -- json-parser.h | 24 - json-streamer.c | 122 - json-streamer.h | 40 - kvm-all.c | 476 +- kvm-stub.c | 55 +- kvm.h | 280 - libcacard/Makefile | 64 +- libcacard/cac.c | 80 +- libcacard/cac.h | 8 + libcacard/event.c | 2 +- libcacard/libcacard.syms | 77 + libcacard/vcard_emul_nss.c | 71 +- libcacard/vcardt.c | 40 + libcacard/vcardt.h | 5 - libcacard/vcardt_internal.h | 6 + libcacard/vreader.c | 81 +- libcacard/vscclient.c | 521 +- libfdt_env.h | 36 - linux-headers/asm-arm/kvm.h | 180 + linux-headers/asm-arm/kvm_para.h | 1 + linux-headers/asm-generic/kvm_para.h | 4 + linux-headers/asm-mips/kvm.h | 138 + linux-headers/asm-mips/kvm_para.h | 1 + linux-headers/asm-powerpc/epapr_hcalls.h | 98 + linux-headers/asm-powerpc/kvm.h | 186 +- linux-headers/asm-powerpc/kvm_para.h | 13 +- linux-headers/asm-x86/kvm.h | 1 - linux-headers/linux/kvm.h | 110 +- linux-headers/linux/kvm_para.h | 6 +- linux-headers/linux/vfio.h | 16 +- linux-headers/linux/vhost.h | 28 + linux-headers/linux/virtio_config.h | 6 +- linux-headers/linux/virtio_ring.h | 6 +- linux-user/alpha/target_cpu.h | 36 + linux-user/arm/nwfpe/double_cpdo.c | 2 +- linux-user/arm/nwfpe/extended_cpdo.c | 2 +- linux-user/arm/nwfpe/fpa11.h | 2 +- linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +- linux-user/arm/nwfpe/fpa11_cprt.c | 2 +- linux-user/arm/nwfpe/fpopcode.c | 2 +- linux-user/arm/nwfpe/single_cpdo.c | 2 +- linux-user/arm/syscall.h | 2 + linux-user/arm/syscall_nr.h | 4 +- linux-user/arm/target_cpu.h | 35 + linux-user/cpu-uname.c | 10 +- linux-user/cris/syscall.h | 7 + linux-user/cris/target_cpu.h | 36 + linux-user/elfload.c | 198 +- linux-user/i386/syscall.h | 2 + linux-user/i386/syscall_nr.h | 4 +- linux-user/i386/target_cpu.h | 48 + linux-user/ioctls.h | 6 +- linux-user/linuxload.c | 3 +- linux-user/m68k/target_cpu.h | 38 + linux-user/main.c | 528 +- linux-user/microblaze/syscall.h | 8 + linux-user/microblaze/target_cpu.h | 35 + linux-user/mips/syscall.h | 2 + linux-user/mips/target_cpu.h | 36 + linux-user/mips64/syscall.h | 20 +- linux-user/mips64/syscall_nr.h | 920 ++- linux-user/mips64/target_cpu.h | 1 + linux-user/mipsn32/syscall.h | 224 - linux-user/mipsn32/syscall_nr.h | 311 - linux-user/mipsn32/target_signal.h | 29 - linux-user/mipsn32/termbits.h | 245 - linux-user/mmap.c | 15 +- linux-user/openrisc/target_cpu.h | 38 + linux-user/ppc/syscall.h | 2 + linux-user/ppc/target_cpu.h | 41 + linux-user/qemu-types.h | 36 - linux-user/qemu.h | 94 +- linux-user/s390x/syscall.h | 4 +- linux-user/s390x/target_cpu.h | 39 + linux-user/sh4/target_cpu.h | 35 + linux-user/signal.c | 348 +- linux-user/socket.h | 450 +- linux-user/sparc/syscall.h | 7 + linux-user/sparc/syscall_nr.h | 6 +- linux-user/sparc/target_cpu.h | 44 + linux-user/sparc64/syscall.h | 7 + linux-user/sparc64/target_cpu.h | 1 + linux-user/strace.c | 107 +- linux-user/strace.list | 6 - linux-user/syscall.c | 915 +- linux-user/syscall_defs.h | 80 +- linux-user/unicore32/syscall_nr.h | 4 +- linux-user/unicore32/target_cpu.h | 27 + linux-user/x86_64/target_cpu.h | 1 + lm32-dis.c | 361 - m68k-dis.c | 5051 ---------- m68k.ld | 175 - main-loop.c | 215 +- main-loop.h | 306 - memory-internal.h | 141 - memory.c | 736 +- memory.h | 882 -- memory_mapping-stub.c | 33 - memory_mapping.c | 154 +- memory_mapping.h | 64 - microblaze-dis.c | 1100 -- migration-exec.c | 49 +- migration-fd.c | 60 +- migration-rdma.c | 3430 +++++++ migration-tcp.c | 41 +- migration-unix.c | 41 +- migration.c | 416 +- migration.h | 131 - mips-dis.c | 4873 --------- mips.ld | 222 - module.c | 81 - module.h | 40 - monitor.c | 482 +- monitor.h | 102 - nbd.c | 67 +- nbd.h | 100 - net.c | 1055 -- net.h | 186 - net/Makefile.objs | 3 +- net/checksum.c | 42 +- net/checksum.h | 29 - net/clients.h | 2 +- net/dump.c | 6 +- net/eth.c | 217 + net/hub.c | 22 +- net/hub.h | 3 +- net/net.c | 1250 +++ net/queue.c | 19 +- net/queue.h | 58 - net/slirp.c | 22 +- net/slirp.h | 47 - net/socket.c | 54 +- net/tap-aix.c | 21 +- net/tap-bsd.c | 27 +- net/tap-haiku.c | 20 +- net/tap-linux.c | 92 +- net/tap-linux.h | 31 +- net/tap-solaris.c | 24 +- net/tap-win32.c | 34 +- net/tap.c | 368 +- net/tap.h | 58 - net/tap_int.h | 50 + net/util.c | 2 +- net/vde.c | 8 +- notify.c | 41 - notify.h | 43 - os-posix.c | 14 +- os-win32.c | 31 +- osdep.c | 402 - osdep.h | 178 - oslib-posix.c | 228 - oslib-win32.c | 152 - page_cache.c | 28 +- path.c | 181 - pc-bios/README | 8 +- pc-bios/acpi-dsdt.aml | Bin 4521 -> 4407 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/efi-e1000.rom | Bin 0 -> 173568 bytes pc-bios/efi-eepro100.rom | Bin 0 -> 174592 bytes pc-bios/efi-ne2k_pci.rom | Bin 0 -> 173056 bytes pc-bios/efi-pcnet.rom | Bin 0 -> 173056 bytes pc-bios/efi-rtl8139.rom | Bin 0 -> 176640 bytes pc-bios/efi-virtio.rom | Bin 0 -> 171008 bytes pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/openbios-ppc | Bin 729908 -> 733976 bytes pc-bios/openbios-sparc32 | Bin 381764 -> 381484 bytes pc-bios/openbios-sparc64 | Bin 1598648 -> 1598328 bytes pc-bios/optionrom/multiboot.S | 75 +- pc-bios/optionrom/optionrom.h | 2 +- pc-bios/palcode-clipper | Bin 185703 -> 133550 bytes pc-bios/q35-acpi-dsdt.aml | Bin 7458 -> 7344 bytes pc-bios/qemu-nsis.bmp | Bin 0 -> 154542 bytes pc-bios/qemu-nsis.ico | Bin 0 -> 4846 bytes pc-bios/qemu_logo_no_text.svg | 976 ++ pc-bios/s390-ccw.img | Bin 0 -> 9432 bytes pc-bios/s390-ccw/Makefile | 26 + pc-bios/s390-ccw/bootmap.c | 235 + pc-bios/s390-ccw/cio.h | 342 + pc-bios/s390-ccw/main.c | 80 + pc-bios/s390-ccw/s390-ccw.h | 135 + pc-bios/s390-ccw/sclp-ascii.c | 81 + pc-bios/s390-ccw/sclp.h | 107 + pc-bios/s390-ccw/start.S | 33 + pc-bios/s390-ccw/virtio.c | 321 + pc-bios/s390-ccw/virtio.h | 163 + pc-bios/slof.bin | Bin 878640 -> 909720 bytes pci-ids.txt | 31 - po/Makefile | 49 + po/de_DE.po | 64 + po/fr_FR.po | 62 + po/hu.po | 63 + po/it.po | 64 + po/messages.po | 61 + po/tr.po | 62 + poison.h | 64 - ppc-dis.c | 5412 ---------- ppc.ld | 237 - ppc64.ld | 230 - qapi-schema-guest.json | 517 - qapi-schema-test.json | 38 - qapi-schema.json | 889 ++- qapi/Makefile.objs | 8 +- qapi/opts-visitor.c | 10 +- qapi/opts-visitor.h | 31 - qapi/qapi-dealloc-visitor.c | 7 +- qapi/qapi-dealloc-visitor.h | 26 - qapi/qapi-types-core.h | 21 - qapi/qapi-visit-core.c | 42 +- qapi/qapi-visit-core.h | 95 - qapi/qapi-visit-impl.h | 23 - qapi/qmp-core.h | 55 - qapi/qmp-dispatch.c | 10 +- qapi/qmp-input-visitor.c | 57 +- qapi/qmp-input-visitor.h | 29 - qapi/qmp-output-visitor.c | 10 +- qapi/qmp-output-visitor.h | 28 - qapi/qmp-registry.c | 6 +- qapi/string-input-visitor.c | 6 +- qapi/string-input-visitor.h | 25 - qapi/string-output-visitor.c | 6 +- qapi/string-output-visitor.h | 26 - qbool.c | 68 - qbool.h | 29 - qdev-monitor.c | 716 ++ qdict.c | 456 - qdict.h | 67 - qemu-aio.h | 243 - qemu-barrier.h | 67 - qemu-bridge-helper.c | 20 +- qemu-char.c | 2184 +++-- qemu-char.h | 254 - qemu-common.h | 471 - qemu-config.c | 939 -- qemu-config.h | 29 - qemu-coroutine-int.h | 49 - qemu-coroutine-io.c | 29 +- qemu-coroutine-lock.c | 87 +- qemu-coroutine-sleep.c | 4 +- qemu-coroutine.c | 68 +- qemu-coroutine.h | 211 - qemu-doc.texi | 103 +- qemu-error.c | 215 - qemu-error.h | 41 - qemu-file.h | 241 - qemu-ga.c | 901 -- qemu-img-cmds.hx | 34 +- qemu-img.c | 873 ++- qemu-img.texi | 61 +- qemu-io-cmds.c | 2118 ++++ qemu-io.c | 1890 +---- qemu-lock.h | 49 - qemu-log.c | 57 +- qemu-log.h | 160 - qemu-nbd.c | 24 +- qemu-nbd.texi | 11 +- qemu-objects.h | 25 - qemu-option-internal.h | 53 - qemu-option.c | 1112 -- qemu-option.h | 156 - qemu-options.hx | 937 +- qemu-os-posix.h | 51 - qemu-os-win32.h | 99 - qemu-pixman.c | 80 - qemu-pixman.h | 39 - qemu-progress.c | 150 - qemu-queue.h | 414 - qemu-seccomp.c | 27 +- qemu-seccomp.h | 22 - qemu-sockets.c | 970 -- qemu-thread-posix.c | 326 - qemu-thread-posix.h | 28 - qemu-thread-win32.c | 371 - qemu-thread-win32.h | 29 - qemu-thread.h | 56 - qemu-timer-common.c | 63 - qemu-timer.c | 35 +- qemu-timer.h | 310 - qemu-tls.h | 52 - qemu-tool.c | 115 - qemu-user.c | 37 - qemu-x509.h | 9 - qemu-xattr.h | 30 - qemu.nsi | 250 + qemu.sasl | 2 +- qemu_socket.h | 77 - qerror.c | 156 - qerror.h | 252 - qfloat.c | 68 - qfloat.h | 29 - qga/Makefile.objs | 2 +- qga/channel-posix.c | 21 +- qga/channel-win32.c | 4 +- qga/commands-posix.c | 750 ++- qga/commands-win32.c | 75 +- qga/commands.c | 4 +- qga/guest-agent-core.h | 4 +- qga/main.c | 1195 +++ qga/qapi-schema.json | 640 ++ qga/service-win32.c | 118 +- qga/service-win32.h | 3 +- qint.c | 67 - qint.h | 28 - qjson.c | 294 - qjson.h | 29 - qlist.c | 170 - qlist.h | 65 - qmp-commands.hx | 539 +- qmp.c | 14 +- qobject.h | 112 - qobject/Makefile.objs | 3 + qobject/json-lexer.c | 373 + qobject/json-parser.c | 724 ++ qobject/json-streamer.c | 122 + qobject/qbool.c | 68 + qobject/qdict.c | 529 + qobject/qerror.c | 156 + qobject/qfloat.c | 68 + qobject/qint.c | 67 + qobject/qjson.c | 284 + qobject/qlist.c | 170 + qobject/qstring.c | 149 + qom/Makefile.objs | 6 +- qom/container.c | 6 +- qom/cpu.c | 234 +- qom/object.c | 165 +- qom/qom-qobject.c | 6 +- qstring.c | 141 - qstring.h | 35 - qtest.c | 118 +- qtest.h | 53 - range.h | 29 - readline.c | 27 +- readline.h | 55 - roms/Makefile | 49 + roms/SLOF | 2 +- roms/config.ipxe.general.h | 2 + roms/ipxe | 2 +- roms/openbios | 2 +- roms/qemu-palcode | 2 +- roms/seabios | 2 +- rules.mak | 51 +- s390-dis.c | 1796 ---- s390.ld | 201 - savevm.c | 896 +- scripts/cleanup-trace-events.pl | 51 + scripts/create_config | 26 +- scripts/feature_to_c.sh | 2 +- scripts/get_maintainer.pl | 25 +- scripts/kvm/vmxcap | 27 +- scripts/make_device_config.sh | 4 +- scripts/qapi-commands.py | 32 +- scripts/qapi-types.py | 120 +- scripts/qapi-visit.py | 222 +- scripts/qapi.py | 295 +- scripts/qemu-guest-agent/fsfreeze-hook | 33 + .../fsfreeze-hook.d/mysql-flush.sh.sample | 56 + scripts/tracetool.py | 22 +- scripts/tracetool/backend/__init__.py | 16 +- scripts/tracetool/backend/dtrace.py | 5 +- scripts/tracetool/backend/events.py | 23 + scripts/tracetool/backend/ftrace.py | 54 + scripts/tracetool/backend/simple.py | 22 +- scripts/tracetool/backend/stderr.py | 28 +- scripts/tracetool/backend/ust.py | 3 + scripts/tracetool/format/events_c.py | 39 + scripts/tracetool/format/events_h.py | 50 + scripts/tracetool/format/h.py | 13 +- scripts/update-linux-headers.sh | 3 + sh4-dis.c | 2077 ---- slirp/bootp.h | 4 + slirp/if.c | 2 +- slirp/ip_icmp.c | 2 +- slirp/ip_input.c | 2 +- slirp/libslirp.h | 6 +- slirp/main.h | 5 +- slirp/mbuf.h | 51 +- slirp/misc.c | 10 +- slirp/misc.h | 14 - slirp/sbuf.c | 2 +- slirp/slirp.c | 685 +- slirp/slirp.h | 5 +- slirp/socket.c | 14 +- slirp/socket.h | 2 + slirp/tcp_input.c | 26 +- slirp/tcp_subr.c | 157 +- slirp/tftp.h | 4 + slirp/udp.c | 2 +- softmmu-semi.h | 73 - softmmu_defs.h | 37 - softmmu_exec.h | 163 - softmmu_header.h | 213 - softmmu_template.h | 354 - sparc-dis.c | 3275 ------ sparc.ld | 150 - sparc64.ld | 138 - spice-qemu-char.c | 282 +- stubs/Makefile.objs | 20 + stubs/arch-query-cpu-def.c | 4 +- stubs/clock-warp.c | 7 + stubs/cpu-get-clock.c | 7 + stubs/cpu-get-icount.c | 9 + stubs/cpus.c | 10 + stubs/dump.c | 29 + stubs/fd-register.c | 2 +- stubs/fdset-add-fd.c | 2 +- stubs/fdset-find-fd.c | 2 +- stubs/fdset-get-fd.c | 2 +- stubs/fdset-remove-fd.c | 2 +- stubs/gdbstub.c | 5 + stubs/get-fd.c | 2 +- stubs/get-vm-name.c | 7 + stubs/iothread-lock.c | 10 + stubs/migr-blocker.c | 10 + stubs/mon-is-qmp.c | 7 + stubs/mon-print-filename.c | 6 + stubs/mon-printf.c | 10 + stubs/mon-protocol-event.c | 6 + stubs/mon-set-error.c | 8 + stubs/pci-drive-hot-add.c | 10 + stubs/reset.c | 13 + stubs/set-fd-handler.c | 2 +- stubs/slirp.c | 15 + stubs/sysbus.c | 6 + stubs/vm-stop.c | 7 + stubs/vmstate.c | 19 + sysemu.h | 188 - target-alpha/Makefile.objs | 1 + target-alpha/cpu-qom.h | 21 +- target-alpha/cpu.c | 253 +- target-alpha/cpu.h | 65 +- target-alpha/fpu_helper.c | 2 +- target-alpha/gdbstub.c | 93 + target-alpha/helper.c | 31 +- target-alpha/helper.h | 8 +- target-alpha/int_helper.c | 9 +- target-alpha/machine.c | 28 +- target-alpha/mem_helper.c | 28 +- target-alpha/sys_helper.c | 17 +- target-alpha/translate.c | 149 +- target-arm/Makefile.objs | 3 + target-arm/arm-semi.c | 19 +- target-arm/cpu-qom.h | 48 +- target-arm/cpu.c | 106 +- target-arm/cpu.h | 126 +- target-arm/gdbstub.c | 102 + target-arm/helper.c | 489 +- target-arm/helper.h | 9 +- target-arm/iwmmxt_helper.c | 2 +- target-arm/kvm-stub.c | 23 + target-arm/kvm.c | 649 ++ target-arm/kvm_arm.h | 65 + target-arm/machine.c | 454 +- target-arm/neon_helper.c | 2 +- target-arm/op_helper.c | 52 +- target-arm/translate.c | 1199 ++- target-cris/Makefile.objs | 1 + target-cris/cpu-qom.h | 22 +- target-cris/cpu.c | 214 +- target-cris/cpu.h | 33 +- target-cris/crisv32-decode.h | 4 + target-cris/gdbstub.c | 130 + target-cris/helper.c | 415 +- target-cris/helper.h | 4 +- target-cris/op_helper.c | 24 +- target-cris/translate.c | 155 +- target-cris/translate_v10.c | 5 +- target-i386/Makefile.objs | 1 + target-i386/arch_dump.c | 67 +- target-i386/arch_memory_mapping.c | 43 +- target-i386/cc_helper.c | 262 +- target-i386/cc_helper_template.h | 261 +- target-i386/cpu-qom.h | 50 +- target-i386/cpu.c | 1520 ++- target-i386/cpu.h | 188 +- target-i386/excp_helper.c | 6 +- target-i386/fpu_helper.c | 4 +- target-i386/gdbstub.c | 231 + target-i386/helper.c | 212 +- target-i386/helper.h | 19 +- target-i386/int_helper.c | 175 +- target-i386/ioport-user.c | 2 +- target-i386/kvm.c | 426 +- target-i386/kvm_i386.h | 2 +- target-i386/machine.c | 298 +- target-i386/mem_helper.c | 36 +- target-i386/misc_helper.c | 121 +- target-i386/ops_sse.h | 175 +- target-i386/ops_sse_header.h | 11 + target-i386/seg_helper.c | 218 +- target-i386/shift_helper_template.h | 12 +- target-i386/smm_helper.c | 74 +- target-i386/svm_helper.c | 73 +- target-i386/topology.h | 134 + target-i386/translate.c | 2873 +++--- target-lm32/Makefile.objs | 1 + target-lm32/cpu-qom.h | 18 +- target-lm32/cpu.c | 51 +- target-lm32/cpu.h | 43 +- target-lm32/gdbstub.c | 92 + target-lm32/helper.c | 30 +- target-lm32/helper.h | 4 +- target-lm32/machine.c | 25 +- target-lm32/op_helper.c | 46 +- target-lm32/translate.c | 70 +- target-m68k/Makefile.objs | 2 +- target-m68k/cpu-qom.h | 14 +- target-m68k/cpu.c | 81 +- target-m68k/cpu.h | 45 +- target-m68k/gdbstub.c | 75 + target-m68k/helper.c | 70 +- target-m68k/helpers.h | 4 +- target-m68k/m68k-semi.c | 11 +- target-m68k/op_helper.c | 32 +- target-m68k/qregs.def | 1 - target-m68k/translate.c | 54 +- target-microblaze/Makefile.objs | 3 +- target-microblaze/cpu-qom.h | 15 +- target-microblaze/cpu.c | 60 +- target-microblaze/cpu.h | 41 +- target-microblaze/gdbstub.c | 56 + target-microblaze/helper.c | 41 +- target-microblaze/helper.h | 4 +- target-microblaze/machine.c | 11 - target-microblaze/mmu.c | 2 +- target-microblaze/op_helper.c | 35 +- target-microblaze/translate.c | 82 +- target-mips/Makefile.objs | 1 + target-mips/cpu-qom.h | 14 +- target-mips/cpu.c | 60 + target-mips/cpu.h | 45 +- target-mips/dsp_helper.c | 913 +-- target-mips/gdbstub.c | 155 + target-mips/helper.c | 18 +- target-mips/helper.h | 19 +- target-mips/op_helper.c | 199 +- target-mips/translate.c | 1308 ++-- target-mips/translate_init.c | 7 +- target-moxie/Makefile.objs | 2 + target-moxie/cpu.c | 180 + target-moxie/cpu.h | 163 + target-moxie/helper.c | 173 + target-moxie/helper.h | 9 + target-moxie/machine.c | 18 + target-moxie/machine.h | 1 + target-moxie/mmu.c | 36 + target-moxie/mmu.h | 19 + target-moxie/translate.c | 929 ++ target-openrisc/Makefile.objs | 1 + target-openrisc/cpu.c | 97 +- target-openrisc/cpu.h | 46 +- target-openrisc/exception_helper.c | 2 +- target-openrisc/fpu_helper.c | 32 +- target-openrisc/gdbstub.c | 83 + target-openrisc/helper.h | 4 +- target-openrisc/int_helper.c | 4 +- target-openrisc/interrupt.c | 8 +- target-openrisc/interrupt_helper.c | 5 +- target-openrisc/machine.c | 27 +- target-openrisc/mmu.c | 13 +- target-openrisc/mmu_helper.c | 20 +- target-openrisc/sys_helper.c | 7 +- target-openrisc/translate.c | 49 +- target-ppc/Makefile.objs | 14 +- target-ppc/cpu-models.c | 1421 +++ target-ppc/cpu-models.h | 741 ++ target-ppc/cpu-qom.h | 43 +- target-ppc/cpu.h | 213 +- target-ppc/excp_helper.c | 76 +- target-ppc/fpu_helper.c | 76 +- target-ppc/gdbstub.c | 131 + target-ppc/helper.c | 50 - target-ppc/helper.h | 15 +- target-ppc/helper_regs.h | 11 +- target-ppc/int_helper.c | 73 +- target-ppc/kvm-stub.c | 18 + target-ppc/kvm.c | 846 ++- target-ppc/kvm_ppc.c | 4 +- target-ppc/kvm_ppc.h | 77 +- target-ppc/machine.c | 539 +- target-ppc/mem_helper.c | 69 +- target-ppc/misc_helper.c | 6 - target-ppc/mmu-hash32.c | 560 ++ target-ppc/mmu-hash32.h | 102 + target-ppc/mmu-hash64.c | 546 + target-ppc/mmu-hash64.h | 124 + target-ppc/mmu_helper.c | 940 +-- target-ppc/mpic_helper.c | 35 - target-ppc/translate.c | 1286 ++-- target-ppc/translate_init.c | 6276 ++++-------- target-ppc/user_only_helper.c | 44 + target-s390x/Makefile.objs | 3 +- target-s390x/arch_dump.c | 213 + target-s390x/cc_helper.c | 335 +- target-s390x/cpu-qom.h | 19 +- target-s390x/cpu.c | 124 +- target-s390x/cpu.h | 590 +- target-s390x/fpu_helper.c | 962 +- target-s390x/gdbstub.c | 88 + target-s390x/helper.c | 326 +- target-s390x/helper.h | 223 +- target-s390x/insn-data.def | 813 ++ target-s390x/insn-format.def | 55 + target-s390x/int_helper.c | 175 +- target-s390x/interrupt.c | 7 +- target-s390x/ioinst.c | 782 ++ target-s390x/ioinst.h | 233 + target-s390x/kvm.c | 567 +- target-s390x/machine.c | 30 - target-s390x/mem_helper.c | 378 +- target-s390x/misc_helper.c | 191 +- target-s390x/translate.c | 8723 ++++++++--------- target-sh4/Makefile.objs | 2 +- target-sh4/cpu-qom.h | 27 +- target-sh4/cpu.c | 239 +- target-sh4/cpu.h | 39 +- target-sh4/gdbstub.c | 146 + target-sh4/helper.c | 22 +- target-sh4/helper.h | 4 +- target-sh4/op_helper.c | 37 +- target-sh4/translate.c | 160 +- target-sparc/Makefile.objs | 1 + target-sparc/cpu-qom.h | 14 +- target-sparc/cpu.c | 205 +- target-sparc/cpu.h | 47 +- target-sparc/gdbstub.c | 208 + target-sparc/helper.c | 29 +- target-sparc/helper.h | 5 +- target-sparc/int32_helper.c | 8 +- target-sparc/int64_helper.c | 6 +- target-sparc/ldst_helper.c | 69 +- target-sparc/machine.c | 2 +- target-sparc/mmu_helper.c | 27 +- target-sparc/translate.c | 125 +- target-unicore32/Makefile.objs | 2 +- target-unicore32/cpu-qom.h | 13 +- target-unicore32/cpu.c | 75 +- target-unicore32/cpu.h | 33 +- target-unicore32/helper.c | 27 +- target-unicore32/helper.h | 4 +- target-unicore32/machine.c | 23 - target-unicore32/op_helper.c | 17 +- target-unicore32/softmmu.c | 13 +- target-unicore32/translate.c | 128 +- target-xtensa/Makefile.objs | 2 +- target-xtensa/core-dc232b.c | 6 +- target-xtensa/core-dc233c.c | 6 +- target-xtensa/core-fsf.c | 6 +- target-xtensa/cpu-qom.h | 17 +- target-xtensa/cpu.c | 75 +- target-xtensa/cpu.h | 31 +- target-xtensa/gdbstub.c | 109 + target-xtensa/helper.c | 149 +- target-xtensa/helper.h | 5 +- target-xtensa/machine.c | 38 - target-xtensa/op_helper.c | 95 +- target-xtensa/overlay_tool.h | 12 +- target-xtensa/translate.c | 526 +- target-xtensa/xtensa-semi.c | 16 +- tcg-runtime.c | 16 +- tcg/README | 44 +- tcg/aarch64/tcg-target.c | 1554 +++ tcg/aarch64/tcg-target.h | 101 + tcg/arm/tcg-target.c | 1589 ++-- tcg/arm/tcg-target.h | 19 +- tcg/hppa/tcg-target.c | 39 +- tcg/hppa/tcg-target.h | 5 + tcg/i386/tcg-target.c | 131 +- tcg/i386/tcg-target.h | 16 +- tcg/ia64/tcg-target.c | 2 +- tcg/ia64/tcg-target.h | 13 + tcg/mips/tcg-target.c | 18 +- tcg/mips/tcg-target.h | 5 + tcg/optimize.c | 217 +- tcg/ppc/tcg-target.c | 16 +- tcg/ppc/tcg-target.h | 7 +- tcg/ppc64/tcg-target.c | 1379 ++- tcg/ppc64/tcg-target.h | 67 +- tcg/s390/tcg-target.c | 552 +- tcg/s390/tcg-target.h | 27 +- tcg/sparc/tcg-target.c | 45 +- tcg/sparc/tcg-target.h | 13 + tcg/tcg-op.h | 264 +- tcg/tcg-opc.h | 48 +- tcg/tcg-runtime.h | 2 + tcg/tcg.c | 73 +- tcg/tcg.h | 89 +- tcg/tci/README | 2 +- tcg/tci/tcg-target.c | 27 +- tcg/tci/tcg-target.h | 23 +- tci-dis.c | 59 - tci.c | 59 +- tests/.gitignore | 8 + tests/Makefile | 186 +- tests/boot-order-test.c | 209 + tests/check-qdict.c | 6 +- tests/check-qfloat.c | 2 +- tests/check-qint.c | 2 +- tests/check-qjson.c | 738 ++- tests/check-qlist.c | 4 +- tests/check-qstring.c | 2 +- tests/endianness-test.c | 316 + tests/fdc-test.c | 2 +- tests/fw_cfg-test.c | 141 + tests/hd-geo-test.c | 8 +- tests/i440fx-test.c | 285 + tests/ide-test.c | 506 + tests/libqos/fw_cfg.c | 107 + tests/libqos/fw_cfg.h | 43 + tests/libqos/i2c-omap.c | 173 + tests/libqos/i2c.c | 22 + tests/libqos/i2c.h | 30 + tests/libqos/malloc-pc.c | 71 + tests/libqos/malloc-pc.h | 20 + tests/libqos/malloc.h | 38 + tests/libqos/pci-pc.c | 239 + tests/libqos/pci-pc.h | 20 + tests/libqos/pci.c | 151 + tests/libqos/pci.h | 80 + tests/libqtest.c | 98 +- tests/libqtest.h | 382 +- tests/m48t59-test.c | 14 +- tests/qapi-schema/comments.exit | 1 + tests/qapi-schema/comments.json | 4 + tests/qapi-schema/comments.out | 3 + tests/qapi-schema/empty.exit | 1 + tests/qapi-schema/empty.out | 3 + tests/qapi-schema/funny-char.err | 1 + tests/qapi-schema/funny-char.exit | 1 + tests/qapi-schema/funny-char.json | 2 + tests/qapi-schema/indented-expr.exit | 1 + tests/qapi-schema/indented-expr.json | 2 + tests/qapi-schema/indented-expr.out | 3 + tests/qapi-schema/missing-colon.err | 1 + tests/qapi-schema/missing-colon.exit | 1 + tests/qapi-schema/missing-colon.json | 2 + tests/qapi-schema/missing-comma-list.err | 1 + tests/qapi-schema/missing-comma-list.exit | 1 + tests/qapi-schema/missing-comma-list.json | 2 + tests/qapi-schema/missing-comma-object.err | 1 + tests/qapi-schema/missing-comma-object.exit | 1 + tests/qapi-schema/missing-comma-object.json | 2 + tests/qapi-schema/non-objects.err | 1 + tests/qapi-schema/non-objects.exit | 1 + tests/qapi-schema/non-objects.json | 2 + tests/qapi-schema/qapi-schema-test.exit | 1 + tests/qapi-schema/qapi-schema-test.json | 53 + tests/qapi-schema/qapi-schema-test.out | 19 + tests/qapi-schema/quoted-structural-chars.err | 1 + tests/qapi-schema/quoted-structural-chars.exit | 1 + tests/qapi-schema/quoted-structural-chars.json | 1 + tests/qapi-schema/test-qapi.py | 27 + tests/qapi-schema/trailing-comma-list.err | 1 + tests/qapi-schema/trailing-comma-list.exit | 1 + tests/qapi-schema/trailing-comma-list.json | 2 + tests/qapi-schema/trailing-comma-object.err | 1 + tests/qapi-schema/trailing-comma-object.exit | 1 + tests/qapi-schema/trailing-comma-object.json | 2 + tests/qapi-schema/unclosed-list.err | 1 + tests/qapi-schema/unclosed-list.exit | 1 + tests/qapi-schema/unclosed-list.json | 1 + tests/qapi-schema/unclosed-object.err | 1 + tests/qapi-schema/unclosed-object.exit | 1 + tests/qapi-schema/unclosed-object.json | 1 + tests/qapi-schema/unclosed-string.err | 1 + tests/qapi-schema/unclosed-string.exit | 1 + tests/qapi-schema/unclosed-string.json | 2 + tests/qemu-iotests/002 | 13 + tests/qemu-iotests/002.out | 26 + tests/qemu-iotests/007 | 7 +- tests/qemu-iotests/017 | 4 +- tests/qemu-iotests/017.out | 2 +- tests/qemu-iotests/018 | 4 +- tests/qemu-iotests/018.out | 2 +- tests/qemu-iotests/026 | 6 +- tests/qemu-iotests/030 | 99 +- tests/qemu-iotests/036 | 3 +- tests/qemu-iotests/038.out | 10 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/041 | 298 +- tests/qemu-iotests/041.out | 4 +- tests/qemu-iotests/042 | 2 +- tests/qemu-iotests/043 | 2 +- tests/qemu-iotests/044.out | 2 + tests/qemu-iotests/045 | 129 + tests/qemu-iotests/045.out | 5 + tests/qemu-iotests/046 | 262 + tests/qemu-iotests/046.out | 239 + tests/qemu-iotests/047 | 75 + tests/qemu-iotests/047.out | 22 + tests/qemu-iotests/048 | 78 + tests/qemu-iotests/048.out | 31 + tests/qemu-iotests/049 | 123 + tests/qemu-iotests/049.out | 212 + tests/qemu-iotests/050 | 75 + tests/qemu-iotests/050.out | 17 + tests/qemu-iotests/051 | 167 + tests/qemu-iotests/051.out | 229 + tests/qemu-iotests/052 | 61 + tests/qemu-iotests/052.out | 13 + tests/qemu-iotests/053 | 73 + tests/qemu-iotests/053.out | 17 + tests/qemu-iotests/054 | 58 + tests/qemu-iotests/054.out | 10 + tests/qemu-iotests/055 | 294 + tests/qemu-iotests/055.out | 5 + tests/qemu-iotests/056 | 94 + tests/qemu-iotests/056.out | 5 + tests/qemu-iotests/059 | 72 + tests/qemu-iotests/059.out | 20 + tests/qemu-iotests/check | 3 +- tests/qemu-iotests/common | 5 + tests/qemu-iotests/common.filter | 7 + tests/qemu-iotests/common.rc | 19 +- tests/qemu-iotests/group | 13 + tests/qemu-iotests/iotests.py | 72 +- tests/qemu-iotests/qcow2.py | 17 + tests/rtc-test.c | 250 +- tests/tcg/cris/crisutils.h | 5 + tests/tcg/linux-test.c | 1 - tests/tcg/lm32/test_cmpgei.S | 15 + tests/tcg/lm32/test_cmpgeui.S | 15 + tests/tcg/lm32/test_cmpgi.S | 15 + tests/tcg/lm32/test_cmpgui.S | 17 +- tests/tcg/mips/mips32-dsp/dpaq_sa_l_w.c | 64 +- tests/tcg/mips/mips32-dsp/dpsq_s_w_ph.c | 10 +- tests/tcg/mips/mips32-dsp/dpsq_sa_l_w.c | 4 +- tests/tcg/mips/mips32-dsp/extp.c | 18 + tests/tcg/mips/mips32-dsp/extpdp.c | 18 + tests/tcg/mips/mips32-dsp/extr_r_w.c | 46 + tests/tcg/mips/mips32-dsp/extr_rs_w.c | 69 + tests/tcg/mips/mips32-dsp/extr_s_h.c | 23 + tests/tcg/mips/mips32-dsp/extr_w.c | 46 + tests/tcg/mips/mips32-dsp/extrv_r_w.c | 25 + tests/tcg/mips/mips32-dsp/extrv_rs_w.c | 25 + tests/tcg/mips/mips32-dsp/extrv_s_h.c | 17 + tests/tcg/mips/mips32-dsp/extrv_w.c | 26 + tests/tcg/mips/mips32-dsp/insv.c | 13 + tests/tcg/mips/mips32-dsp/maq_s_w_phl.c | 16 +- tests/tcg/mips/mips32-dsp/maq_s_w_phr.c | 24 +- tests/tcg/mips/mips32-dsp/maq_sa_w_phl.c | 12 +- tests/tcg/mips/mips32-dsp/maq_sa_w_phr.c | 24 +- tests/tcg/mips/mips32-dsp/mthlip.c | 2 +- tests/tcg/mips/mips32-dsp/mulq_rs_ph.c | 19 +- tests/tcg/mips/mips32-dsp/precrq_rs_ph_w.c | 24 +- tests/tcg/mips/mips32-dsp/rddsp.c | 32 +- tests/tcg/mips/mips32-dsp/shll_ph.c | 33 +- tests/tcg/mips/mips32-dsp/shll_qb.c | 23 +- tests/tcg/mips/mips32-dsp/subq_s_ph.c | 22 +- tests/tcg/mips/mips32-dsp/subq_s_w.c | 36 +- tests/tcg/mips/mips32-dsp/wrdsp.c | 32 +- tests/tcg/mips/mips32-dspr2/dpa_w_ph.c | 4 +- tests/tcg/mips/mips32-dspr2/dpaqx_sa_w_ph.c | 12 +- tests/tcg/mips/mips32-dspr2/dpax_w_ph.c | 17 + tests/tcg/mips/mips32-dspr2/dps_w_ph.c | 17 + tests/tcg/mips/mips32-dspr2/dpsqx_s_w_ph.c | 8 +- tests/tcg/mips/mips32-dspr2/dpsx_w_ph.c | 4 +- tests/tcg/mips/mips32-dspr2/mulq_rs_w.c | 2 +- tests/tcg/mips/mips32-dspr2/mulq_s_ph.c | 15 + tests/tcg/mips/mips32-dspr2/mulq_s_w.c | 2 +- tests/tcg/test-i386-fprem.c | 4 +- tests/tcg/test-i386.c | 12 +- tests/tcg/xtensa/Makefile | 23 +- tests/tcg/xtensa/macros.inc | 2 +- tests/tcg/xtensa/test_extui.S | 26 + tests/tcg/xtensa/test_s32c1i.S | 39 + tests/tcg/xtensa/test_sr.S | 90 + tests/test-aio.c | 33 +- tests/test-bitops.c | 75 + tests/test-coroutine.c | 4 +- tests/test-cutils.c | 251 + tests/test-hbitmap.c | 401 + tests/test-int128.c | 212 + tests/test-iov.c | 154 +- tests/test-mul64.c | 70 + tests/test-qmp-commands.c | 7 +- tests/test-qmp-input-strict.c | 3 +- tests/test-qmp-input-visitor.c | 361 +- tests/test-qmp-output-visitor.c | 340 +- tests/test-string-input-visitor.c | 52 +- tests/test-string-output-visitor.c | 3 +- tests/test-thread-pool.c | 70 +- tests/test-visitor-serialization.c | 503 +- tests/test-x86-cpuid.c | 110 + tests/test-xbzrle.c | 196 + tests/tmp105-test.c | 76 + thread-pool.c | 257 +- thread-pool.h | 34 - thunk.c | 2 +- thunk.h | 189 - tpm.c | 358 + trace-events | 348 +- trace/Makefile.objs | 81 + trace/control-internal.h | 67 + trace/control.c | 106 +- trace/control.h | 190 +- trace/default.c | 5 +- trace/event-internal.h | 33 + trace/ftrace.c | 102 + trace/ftrace.h | 10 + trace/simple.c | 96 +- trace/simple.h | 6 +- trace/stderr.c | 34 +- trace/stderr.h | 11 - translate-all.c | 1697 ++++- translate-all.h | 34 + uboot_image.h | 158 - ui/Makefile.objs | 10 +- ui/cocoa.m | 109 +- ui/console.c | 2020 ++++ ui/curses.c | 49 +- ui/curses_keys.h | 5 + ui/cursor.c | 211 + ui/cursor_hidden.xpm | 37 + ui/cursor_left_ptr.xpm | 39 + ui/d3des.h | 4 + ui/gtk.c | 1533 +++ ui/input.c | 559 ++ ui/keymaps.c | 18 +- ui/qemu-pixman.c | 135 + ui/qemu-spice.h | 80 - ui/qemu-x509.h | 9 + ui/sdl.c | 176 +- ui/sdl_zoom.c | 11 +- ui/sdl_zoom_template.h | 16 +- ui/spice-core.c | 145 +- ui/spice-display.c | 98 +- ui/spice-display.h | 134 - ui/spice-input.c | 4 +- ui/vgafont.h | 4611 +++++++++ ui/vnc-auth-sasl.h | 2 +- ui/vnc-enc-tight.c | 11 +- ui/vnc-jobs.c | 3 +- ui/vnc-palette.c | 2 + ui/vnc-palette.h | 4 +- ui/vnc-tls.c | 69 +- ui/vnc-tls.h | 2 +- ui/vnc-ws.c | 348 + ui/vnc-ws.h | 89 + ui/vnc.c | 589 +- ui/vnc.h | 43 +- ui/vnc_keysym.h | 4 + uri.c | 2249 ----- uri.h | 113 - user-exec.c | 48 +- util/Makefile.objs | 13 + util/acl.c | 187 + util/aes.c | 1309 +++ util/bitmap.c | 256 + util/bitops.c | 158 + util/cache-utils.c | 97 + util/compatfd.c | 138 + util/crc32c.c | 115 + util/cutils.c | 532 + util/envlist.c | 241 + util/error.c | 120 + util/event_notifier-posix.c | 121 + util/event_notifier-win32.c | 59 + util/fifo8.c | 79 + util/hbitmap.c | 402 + util/hexdump.c | 37 + util/host-utils.c | 89 + util/iov.c | 432 + util/module.c | 81 + util/notify.c | 71 + util/osdep.c | 474 + util/oslib-posix.c | 243 + util/oslib-win32.c | 184 + util/path.c | 179 + util/qemu-config.c | 283 + util/qemu-error.c | 225 + util/qemu-openpty.c | 135 + util/qemu-option.c | 1149 +++ util/qemu-progress.c | 150 + util/qemu-sockets.c | 970 ++ util/qemu-thread-posix.c | 331 + util/qemu-thread-win32.c | 359 + util/qemu-timer-common.c | 61 + util/unicode.c | 100 + util/uri.c | 2249 +++++ vgafont.h | 4611 --------- vl.c | 1187 ++- vmstate.h | 639 -- x86_64.ld | 180 - xbzrle.c | 173 + xen-all.c | 62 +- xen-mapcache.c | 8 +- xen-mapcache.h | 56 - xen-stub.c | 9 +- 2838 files changed, 502314 insertions(+), 410765 deletions(-) diff --git a/.gitignore b/.gitignore index bd6ba1c..0fe114d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ config-devices.* config-all-devices.* +config-all-disas.* config-host.* config-target.* -trace.h -trace.c -trace-dtrace.h -trace-dtrace.dtrace +trace/generated-tracers.h +trace/generated-tracers.c +trace/generated-tracers-dtrace.h +trace/generated-tracers.dtrace +trace/generated-events.h +trace/generated-events.c +libcacard/trace/generated-tracers.c *-timestamp *-softmmu *-darwin-user @@ -47,6 +51,7 @@ test-qmp-output-visitor test-string-input-visitor test-string-output-visitor test-visitor-serialization +fsdev/virtfs-proxy-helper fsdev/virtfs-proxy-helper.1 fsdev/virtfs-proxy-helper.pod .gdbinit @@ -68,6 +73,7 @@ fsdev/virtfs-proxy-helper.pod *.tp *.vr *.d +!scripts/qemu-guest-agent/fsfreeze-hook.d *.o *.lo *.la @@ -76,18 +82,25 @@ fsdev/virtfs-proxy-helper.pod *.swp *.orig .pc +*.gcda +*.gcno patches pc-bios/bios-pq/status pc-bios/vgabios-pq/status +pc-bios/optionrom/linuxboot.asm pc-bios/optionrom/linuxboot.bin pc-bios/optionrom/linuxboot.raw pc-bios/optionrom/linuxboot.img +pc-bios/optionrom/multiboot.asm pc-bios/optionrom/multiboot.bin pc-bios/optionrom/multiboot.raw pc-bios/optionrom/multiboot.img +pc-bios/optionrom/kvmvapic.asm pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.img +pc-bios/s390-ccw/s390-ccw.elf +pc-bios/s390-ccw/s390-ccw.img .stgit-* cscope.* tags diff --git a/.gitmodules b/.gitmodules index cfa2af9..d7e3f3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,10 +15,13 @@ url = git://git.qemu.org/openbios.git [submodule "roms/qemu-palcode"] path = roms/qemu-palcode - url = git://repo.or.cz/qemu-palcode.git + url = git://github.com/rth7680/qemu-palcode.git [submodule "roms/sgabios"] path = roms/sgabios url = git://git.qemu.org/sgabios.git [submodule "pixman"] path = pixman url = git://anongit.freedesktop.org/pixman +[submodule "dtc"] + path = dtc + url = git://git.qemu.org/dtc.git diff --git a/HACKING b/HACKING index 89a6b3a..12fbc8a 100644 --- a/HACKING +++ b/HACKING @@ -40,8 +40,23 @@ speaking, the size of guest memory can always fit into ram_addr_t but it would not be correct to store an actual guest physical address in a ram_addr_t. -Use target_ulong (or abi_ulong) for CPU virtual addresses, however -devices should not need to use target_ulong. +For CPU virtual addresses there are several possible types. +vaddr is the best type to use to hold a CPU virtual address in +target-independent code. It is guaranteed to be large enough to hold a +virtual address for any target, and it does not change size from target +to target. It is always unsigned. +target_ulong is a type the size of a virtual address on the CPU; this means +it may be 32 or 64 bits depending on which target is being built. It should +therefore be used only in target-specific code, and in some +performance-critical built-per-target core code such as the TLB code. +There is also a signed version, target_long. +abi_ulong is for the *-user targets, and represents a type the size of +'void *' in that target's ABI. (This may not be the same as the size of a +full CPU virtual address in the case of target ABIs which use 32 bit pointers +on 64 bit CPUs, like sparc32plus.) Definitions of structures that must match +the target's ABI must use this type for anything that on the target is defined +to be an 'unsigned long' or a pointer type. +There is also a signed version, abi_long. Of course, take all of the above with a grain of salt. If you're about to use some system interface that requires a type like size_t, pid_t or @@ -78,16 +93,15 @@ avoided. Use of the malloc/free/realloc/calloc/valloc/memalign/posix_memalign APIs is not allowed in the QEMU codebase. Instead of these routines, use the GLib memory allocation routines g_malloc/g_malloc0/g_new/ -g_new0/g_realloc/g_free or QEMU's qemu_vmalloc/qemu_memalign/qemu_vfree +g_new0/g_realloc/g_free or QEMU's qemu_memalign/qemu_blockalign/qemu_vfree APIs. Please note that g_malloc will exit on allocation failure, so there is no need to test for failure (as you would have to with malloc). Calling g_malloc with a zero size is valid and will return NULL. -Memory allocated by qemu_vmalloc or qemu_memalign must be freed with -qemu_vfree, since breaking this will cause problems on Win32 and user -emulators. +Memory allocated by qemu_memalign or qemu_blockalign must be freed with +qemu_vfree, since breaking this will cause problems on Win32. 4. String manipulation @@ -123,3 +137,23 @@ gcc's printf attribute directive in the prototype. This makes it so gcc's -Wformat and -Wformat-security options can do their jobs and cross-check format strings with the number and types of arguments. + +6. C standard, implementation defined and undefined behaviors + +C code in QEMU should be written to the C99 language specification. A copy _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44: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 1Vk48d-00010o-6g; Sat, 23 Nov 2013 03:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48c-00010j-JC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:06 +0000 Received: from [193.109.254.147:52704] by server-1.bemta-14.messagelabs.com id BB/30-10312-58420925; Sat, 23 Nov 2013 03:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178244!236065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 23 Nov 2013 03:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48Z-0006vg-SX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48Z-0003S5-Ok for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:03 +0000 Date: Sat, 23 Nov 2013 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: Initializing ram_memory under Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c2ab9e2ef5a00395fa770ed61084f47001bb35f Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:52 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 pc: Initializing ram_memory under Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin CC: qemu-stable@nongnu.org (cherry picked from commit 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d) --- hw/i386/pc_piix.c | 2 +- include/hw/xen/xen.h | 4 +--- xen-all.c | 7 ++++--- xen-stub.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6e1e654..3df2ff9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init() != 0) { + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); exit(1); } diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6d42dd1..e1f88bf 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); -int xen_hvm_init(void); +int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -struct MemoryRegion; void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif -struct MemoryRegion; void xen_register_framebuffer(struct MemoryRegion *mr); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 diff --git a/xen-all.c b/xen-all.c index 21246e0..e1d0694 100644 --- a/xen-all.c +++ b/xen-all.c @@ -154,7 +154,7 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size) +static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; @@ -168,6 +168,7 @@ static void xen_ram_init(ram_addr_t ram_size) block_len += HVM_BELOW_4G_MMIO_LENGTH; } memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { @@ -1059,7 +1060,7 @@ static void xen_read_physmap(XenIOState *state) free(entries); } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1134,7 +1135,7 @@ int xen_hvm_init(void) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size); + xen_ram_init(ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); diff --git a/xen-stub.c b/xen-stub.c index 47c8e73..ad189a6 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -64,7 +64,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { return 0; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44: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 1Vk48d-00010o-6g; Sat, 23 Nov 2013 03:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48c-00010j-JC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:06 +0000 Received: from [193.109.254.147:52704] by server-1.bemta-14.messagelabs.com id BB/30-10312-58420925; Sat, 23 Nov 2013 03:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178244!236065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 504 invoked from network); 23 Nov 2013 03:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48Z-0006vg-SX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48Z-0003S5-Ok for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:03 +0000 Date: Sat, 23 Nov 2013 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: Initializing ram_memory under Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c2ab9e2ef5a00395fa770ed61084f47001bb35f Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:52 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 pc: Initializing ram_memory under Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin CC: qemu-stable@nongnu.org (cherry picked from commit 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d) --- hw/i386/pc_piix.c | 2 +- include/hw/xen/xen.h | 4 +--- xen-all.c | 7 ++++--- xen-stub.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6e1e654..3df2ff9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init() != 0) { + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); exit(1); } diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6d42dd1..e1f88bf 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); -int xen_hvm_init(void); +int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -struct MemoryRegion; void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif -struct MemoryRegion; void xen_register_framebuffer(struct MemoryRegion *mr); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 diff --git a/xen-all.c b/xen-all.c index 21246e0..e1d0694 100644 --- a/xen-all.c +++ b/xen-all.c @@ -154,7 +154,7 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size) +static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; @@ -168,6 +168,7 @@ static void xen_ram_init(ram_addr_t ram_size) block_len += HVM_BELOW_4G_MMIO_LENGTH; } memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { @@ -1059,7 +1060,7 @@ static void xen_read_physmap(XenIOState *state) free(entries); } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1134,7 +1135,7 @@ int xen_hvm_init(void) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size); + xen_ram_init(ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); diff --git a/xen-stub.c b/xen-stub.c index 47c8e73..ad189a6 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -64,7 +64,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { return 0; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48n-00011e-9R; Sat, 23 Nov 2013 03:44:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48m-00011X-LE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:16 +0000 Received: from [85.158.137.68:29179] by server-16.bemta-3.messagelabs.com id 8A/AF-26128-F8420925; Sat, 23 Nov 2013 03:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1385178254!3273047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32022 invoked from network); 23 Nov 2013 03:44:15 -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; 23 Nov 2013 03:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48k-0006vm-2e for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48j-0003ST-Vm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:14 +0000 Date: Sat, 23 Nov 2013 03:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc_q35: Initialize Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b40187fc0ce1c0ffad51cd0f149a4e5bed332653 Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:53 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 pc_q35: Initialize Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin (cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511) --- hw/i386/pc_q35.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..dd13130 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -81,6 +81,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); object_property_add_child(qdev_get_machine(), "icc-bridge", OBJECT(icc_bridge), NULL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48n-00011e-9R; Sat, 23 Nov 2013 03:44:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48m-00011X-LE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:16 +0000 Received: from [85.158.137.68:29179] by server-16.bemta-3.messagelabs.com id 8A/AF-26128-F8420925; Sat, 23 Nov 2013 03:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1385178254!3273047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32022 invoked from network); 23 Nov 2013 03:44:15 -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; 23 Nov 2013 03:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48k-0006vm-2e for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48j-0003ST-Vm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:14 +0000 Date: Sat, 23 Nov 2013 03:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc_q35: Initialize Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b40187fc0ce1c0ffad51cd0f149a4e5bed332653 Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:53 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 pc_q35: Initialize Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin (cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511) --- hw/i386/pc_q35.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..dd13130 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -81,6 +81,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); object_property_add_child(qdev_get_machine(), "icc-bridge", OBJECT(icc_bridge), NULL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48y-00012o-CH; Sat, 23 Nov 2013 03:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48w-00012e-SZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:27 +0000 Received: from [193.109.254.147:42569] by server-12.bemta-14.messagelabs.com id 62/C7-25062-A9420925; Sat, 23 Nov 2013 03:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385178264!236593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23409 invoked from network); 23 Nov 2013 03:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48u-0006vs-Dx for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48u-0003Sp-6U for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:24 +0000 Date: Sat, 23 Nov 2013 03:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Fix vcpu initialization. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1f3f10d8d3e6498b8c55b1e0908e4a1b7adae12 Author: Anthony PERARD AuthorDate: Wed Sep 25 16:41:48 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 xen: Fix vcpu initialization. Each vcpu need a evtchn binded in qemu, even those that are offline at QEMU initialisation. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini (cherry picked from commit 1cd25a889687ab199944b98c1bdc59216ea81487) --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index e1d0694..3b480b7 100644 --- a/xen-all.c +++ b/xen-all.c @@ -613,13 +613,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == smp_cpus) { + if (i == max_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1106,10 +1106,10 @@ int xen_hvm_init(MemoryRegion **ram_memory) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48y-00012o-CH; Sat, 23 Nov 2013 03:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48w-00012e-SZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:27 +0000 Received: from [193.109.254.147:42569] by server-12.bemta-14.messagelabs.com id 62/C7-25062-A9420925; Sat, 23 Nov 2013 03:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385178264!236593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23409 invoked from network); 23 Nov 2013 03:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk48u-0006vs-Dx for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk48u-0003Sp-6U for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:24 +0000 Date: Sat, 23 Nov 2013 03:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Fix vcpu initialization. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c1f3f10d8d3e6498b8c55b1e0908e4a1b7adae12 Author: Anthony PERARD AuthorDate: Wed Sep 25 16:41:48 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:35 2013 +0100 xen: Fix vcpu initialization. Each vcpu need a evtchn binded in qemu, even those that are offline at QEMU initialisation. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini (cherry picked from commit 1cd25a889687ab199944b98c1bdc59216ea81487) --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index e1d0694..3b480b7 100644 --- a/xen-all.c +++ b/xen-all.c @@ -613,13 +613,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == smp_cpus) { + if (i == max_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1106,10 +1106,10 @@ int xen_hvm_init(MemoryRegion **ram_memory) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk498-00014K-FH; Sat, 23 Nov 2013 03:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk497-000146-9k for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:37 +0000 Received: from [85.158.137.68:29431] by server-9.bemta-3.messagelabs.com id 21/92-13104-4A420925; Sat, 23 Nov 2013 03:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1385178274!3294858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21551 invoked from network); 23 Nov 2013 03:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk494-0006w0-Iw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk494-0003TF-Gf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:34 +0000 Date: Sat, 23 Nov 2013 03:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Enable cpu-hotplug on xenfv machine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e381ccab5afe6b5e808aa550d8bd22b1d0757fde Author: Anthony PERARD AuthorDate: Wed Sep 25 16:43:12 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:55 2013 +0100 xen: Enable cpu-hotplug on xenfv machine. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini (cherry picked from commit 594278d9f251222675f1c24f5fbb1b05560b8711) --- hw/i386/pc_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3df2ff9..5a26135 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -754,6 +754,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, DEFAULT_MACHINE_OPTIONS, }; #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk498-00014K-FH; Sat, 23 Nov 2013 03:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk497-000146-9k for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:37 +0000 Received: from [85.158.137.68:29431] by server-9.bemta-3.messagelabs.com id 21/92-13104-4A420925; Sat, 23 Nov 2013 03:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1385178274!3294858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21551 invoked from network); 23 Nov 2013 03:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk494-0006w0-Iw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk494-0003TF-Gf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:34 +0000 Date: Sat, 23 Nov 2013 03:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Enable cpu-hotplug on xenfv machine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e381ccab5afe6b5e808aa550d8bd22b1d0757fde Author: Anthony PERARD AuthorDate: Wed Sep 25 16:43:12 2013 +0000 Commit: Anthony PERARD CommitDate: Wed Oct 2 17:17:55 2013 +0100 xen: Enable cpu-hotplug on xenfv machine. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini (cherry picked from commit 594278d9f251222675f1c24f5fbb1b05560b8711) --- hw/i386/pc_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3df2ff9..5a26135 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -754,6 +754,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, DEFAULT_MACHINE_OPTIONS, }; #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49J-00016B-IF; Sat, 23 Nov 2013 03: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 1Vk49I-00015z-F6 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:48 +0000 Received: from [85.158.143.35:38101] by server-1.bemta-4.messagelabs.com id 41/99-02132-FA420925; Sat, 23 Nov 2013 03:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1385178286!542095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7818 invoked from network); 23 Nov 2013 03:44:47 -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; 23 Nov 2013 03:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49G-0006w6-2i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49F-0003Zw-Vk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:46 +0000 Date: Sat, 23 Nov 2013 03:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: ensure bdrv_drain_all() works during bdrv_delete() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 670599a08c052f6ef841743731a8f06d4b50ec99 Author: Stefan Hajnoczi AuthorDate: Thu Jun 27 15:32:26 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 16:31:10 2013 -0500 block: ensure bdrv_drain_all() works during bdrv_delete() In bdrv_delete() make sure to call bdrv_make_anon() *after* bdrv_close() so that the device is still seen by bdrv_drain_all() when iterating bdrv_states. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi (cherry picked from commit e1b5c52e04d04bb93546c6e37e8884889d047cb1) Signed-off-by: Michael Roth --- block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 01b66d8..d5ce8d3 100644 --- a/block.c +++ b/block.c @@ -1606,11 +1606,11 @@ void bdrv_delete(BlockDriverState *bs) assert(!bs->job); assert(!bs->in_use); + bdrv_close(bs); + /* remove from list, if necessary */ bdrv_make_anon(bs); - bdrv_close(bs); - g_free(bs); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:44:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49J-00016B-IF; Sat, 23 Nov 2013 03: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 1Vk49I-00015z-F6 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:48 +0000 Received: from [85.158.143.35:38101] by server-1.bemta-4.messagelabs.com id 41/99-02132-FA420925; Sat, 23 Nov 2013 03:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1385178286!542095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7818 invoked from network); 23 Nov 2013 03:44:47 -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; 23 Nov 2013 03:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49G-0006w6-2i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49F-0003Zw-Vk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:46 +0000 Date: Sat, 23 Nov 2013 03:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: ensure bdrv_drain_all() works during bdrv_delete() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 670599a08c052f6ef841743731a8f06d4b50ec99 Author: Stefan Hajnoczi AuthorDate: Thu Jun 27 15:32:26 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 16:31:10 2013 -0500 block: ensure bdrv_drain_all() works during bdrv_delete() In bdrv_delete() make sure to call bdrv_make_anon() *after* bdrv_close() so that the device is still seen by bdrv_drain_all() when iterating bdrv_states. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi (cherry picked from commit e1b5c52e04d04bb93546c6e37e8884889d047cb1) Signed-off-by: Michael Roth --- block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 01b66d8..d5ce8d3 100644 --- a/block.c +++ b/block.c @@ -1606,11 +1606,11 @@ void bdrv_delete(BlockDriverState *bs) assert(!bs->job); assert(!bs->in_use); + bdrv_close(bs); + /* remove from list, if necessary */ bdrv_make_anon(bs); - bdrv_close(bs); - g_free(bs); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49V-00017t-L8; Sat, 23 Nov 2013 03:45:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49U-00017i-5i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:00 +0000 Received: from [85.158.137.68:17859] by server-17.bemta-3.messagelabs.com id 1F/49-15965-BB420925; Sat, 23 Nov 2013 03:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178297!3251207!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21691 invoked from network); 23 Nov 2013 03:44:58 -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; 23 Nov 2013 03:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49R-0006wF-57 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49Q-0003aN-5l for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:57 +0000 Date: Sat, 23 Nov 2013 03:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] gdbstub: Fix gdb_register_coprocessor() register counting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7009021528388699287==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7009021528388699287== Content-Type: text/plain commit c0c080c5d1ce6c236ba8ab5db3a17043c665d0f6 Author: Andreas Färber AuthorDate: Mon Aug 12 18:09:47 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 17:12:22 2013 -0500 gdbstub: Fix gdb_register_coprocessor() register counting Commit a0e372f0c49ac01faeaeb73a6e8f50e8ac615f34 reorganized the register counting for GDB. While it seems correct not to let the total number of registers skyrocket in an SMP scenario through a static variable, the distinction between total register count and 'g' packet register count (last_reg vs. num_g_regs) got lost among the way. Fix this by introducing CPUState::gdb_num_g_regs and using that in gdb_handle_packet(). Reported-by: Aneesh Kumar K.V Cc: qemu-stable@nongnu.org (stable-1.6) Tested-by: Aneesh Kumar K.V Tested-by: Max Filippov Tested-by: Peter Maydell Signed-off-by: Andreas Färber (cherry picked from commit 35143f0164e6933a85c7c2b8a89a040d881a9151) Signed-off-by: Michael Roth --- gdbstub.c | 6 ++++-- include/qom/cpu.h | 2 ++ qom/cpu.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 1af25a6..9d067d6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -621,6 +621,8 @@ void gdb_register_coprocessor(CPUState *cpu, if (g_pos != s->base_reg) { fprintf(stderr, "Error: Bad gdb register numbering for '%s'\n" "Expected %d got %d\n", xml, g_pos, s->base_reg); + } else { + cpu->gdb_num_g_regs = cpu->gdb_num_regs; } } } @@ -902,7 +904,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) case 'g': cpu_synchronize_state(s->g_cpu); len = 0; - for (addr = 0; addr < s->g_cpu->gdb_num_regs; addr++) { + for (addr = 0; addr < s->g_cpu->gdb_num_g_regs; addr++) { reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr); len += reg_size; } @@ -914,7 +916,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) registers = mem_buf; len = strlen(p) / 2; hextomem((uint8_t *)registers, p, len); - for (addr = 0; addr < s->g_cpu->gdb_num_regs && len > 0; addr++) { + for (addr = 0; addr < s->g_cpu->gdb_num_g_regs && len > 0; addr++) { reg_size = gdb_write_register(s->g_cpu, registers, addr); len -= reg_size; registers += reg_size; diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 0d6e95c..3e49936 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -152,6 +152,7 @@ struct kvm_run; * @current_tb: Currently executing TB. * @gdb_regs: Additional GDB registers. * @gdb_num_regs: Number of total registers accessible to GDB. + * @gdb_num_g_regs: Number of registers in GDB 'g' packets. * @next_cpu: Next CPU sharing TB cache. * @kvm_fd: vCPU file descriptor for KVM. * @@ -188,6 +189,7 @@ struct CPUState { struct TranslationBlock *current_tb; struct GDBRegisterState *gdb_regs; int gdb_num_regs; + int gdb_num_g_regs; CPUState *next_cpu; int kvm_fd; diff --git a/qom/cpu.c b/qom/cpu.c index aa95108..e71e57b 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -240,7 +240,7 @@ static void cpu_common_initfn(Object *obj) CPUState *cpu = CPU(obj); CPUClass *cc = CPU_GET_CLASS(obj); - cpu->gdb_num_regs = cc->gdb_num_core_regs; + cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; } static int64_t cpu_common_get_arch_id(CPUState *cpu) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7009021528388699287== 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 --===============7009021528388699287==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:01 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49V-00017t-L8; Sat, 23 Nov 2013 03:45:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49U-00017i-5i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:00 +0000 Received: from [85.158.137.68:17859] by server-17.bemta-3.messagelabs.com id 1F/49-15965-BB420925; Sat, 23 Nov 2013 03:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178297!3251207!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21691 invoked from network); 23 Nov 2013 03:44:58 -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; 23 Nov 2013 03:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49R-0006wF-57 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49Q-0003aN-5l for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:44:57 +0000 Date: Sat, 23 Nov 2013 03:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] gdbstub: Fix gdb_register_coprocessor() register counting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7009021528388699287==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7009021528388699287== Content-Type: text/plain commit c0c080c5d1ce6c236ba8ab5db3a17043c665d0f6 Author: Andreas Färber AuthorDate: Mon Aug 12 18:09:47 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 17:12:22 2013 -0500 gdbstub: Fix gdb_register_coprocessor() register counting Commit a0e372f0c49ac01faeaeb73a6e8f50e8ac615f34 reorganized the register counting for GDB. While it seems correct not to let the total number of registers skyrocket in an SMP scenario through a static variable, the distinction between total register count and 'g' packet register count (last_reg vs. num_g_regs) got lost among the way. Fix this by introducing CPUState::gdb_num_g_regs and using that in gdb_handle_packet(). Reported-by: Aneesh Kumar K.V Cc: qemu-stable@nongnu.org (stable-1.6) Tested-by: Aneesh Kumar K.V Tested-by: Max Filippov Tested-by: Peter Maydell Signed-off-by: Andreas Färber (cherry picked from commit 35143f0164e6933a85c7c2b8a89a040d881a9151) Signed-off-by: Michael Roth --- gdbstub.c | 6 ++++-- include/qom/cpu.h | 2 ++ qom/cpu.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 1af25a6..9d067d6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -621,6 +621,8 @@ void gdb_register_coprocessor(CPUState *cpu, if (g_pos != s->base_reg) { fprintf(stderr, "Error: Bad gdb register numbering for '%s'\n" "Expected %d got %d\n", xml, g_pos, s->base_reg); + } else { + cpu->gdb_num_g_regs = cpu->gdb_num_regs; } } } @@ -902,7 +904,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) case 'g': cpu_synchronize_state(s->g_cpu); len = 0; - for (addr = 0; addr < s->g_cpu->gdb_num_regs; addr++) { + for (addr = 0; addr < s->g_cpu->gdb_num_g_regs; addr++) { reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr); len += reg_size; } @@ -914,7 +916,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) registers = mem_buf; len = strlen(p) / 2; hextomem((uint8_t *)registers, p, len); - for (addr = 0; addr < s->g_cpu->gdb_num_regs && len > 0; addr++) { + for (addr = 0; addr < s->g_cpu->gdb_num_g_regs && len > 0; addr++) { reg_size = gdb_write_register(s->g_cpu, registers, addr); len -= reg_size; registers += reg_size; diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 0d6e95c..3e49936 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -152,6 +152,7 @@ struct kvm_run; * @current_tb: Currently executing TB. * @gdb_regs: Additional GDB registers. * @gdb_num_regs: Number of total registers accessible to GDB. + * @gdb_num_g_regs: Number of registers in GDB 'g' packets. * @next_cpu: Next CPU sharing TB cache. * @kvm_fd: vCPU file descriptor for KVM. * @@ -188,6 +189,7 @@ struct CPUState { struct TranslationBlock *current_tb; struct GDBRegisterState *gdb_regs; int gdb_num_regs; + int gdb_num_g_regs; CPUState *next_cpu; int kvm_fd; diff --git a/qom/cpu.c b/qom/cpu.c index aa95108..e71e57b 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -240,7 +240,7 @@ static void cpu_common_initfn(Object *obj) CPUState *cpu = CPU(obj); CPUClass *cc = CPU_GET_CLASS(obj); - cpu->gdb_num_regs = cc->gdb_num_core_regs; + cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; } static int64_t cpu_common_get_arch_id(CPUState *cpu) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7009021528388699287== 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 --===============7009021528388699287==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45: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 1Vk49f-00019D-Pu; Sat, 23 Nov 2013 03:45:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49e-000193-3I for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:10 +0000 Received: from [193.109.254.147:37923] by server-15.bemta-14.messagelabs.com id 0C/5F-06807-5C420925; Sat, 23 Nov 2013 03:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385178307!236060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28523 invoked from network); 23 Nov 2013 03:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49b-0006xG-BK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49b-0003aw-9G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:07 +0000 Date: Sat, 23 Nov 2013 03:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-ppc: fix bit extraction for FPBF and FPL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f99b02e5ff1004fb3b41846d2c34f190127456 Author: Aurelien Jarno AuthorDate: Thu Aug 15 13:32:38 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 18:46:32 2013 -0500 target-ppc: fix bit extraction for FPBF and FPL Bit extraction for the FP BF and L field of the MTFSFI and MTFSF instructions is wrong and doesn't match the reference manual (which explain the bit number in big endian format). It has been broken in commit 7d08d85645def18eac2a9d672c1868a35e0bcf79. This patch fixes this, which in turn fixes the problem reported by Khem Raj about the floor() function of libm. Reported-by: Khem Raj Signed-off-by: Aurelien Jarno CC: qemu-stable@nongnu.org (1.6) Signed-off-by: Alexander Graf (cherry picked from commit 779f659021d1754117bce1aab9370dc22f37ae07) Signed-off-by: Michael Roth --- target-ppc/translate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index f07d70d..41f4048 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -428,9 +428,9 @@ EXTRACT_HELPER(CRM, 12, 8); EXTRACT_HELPER(SR, 16, 4); /* mtfsf/mtfsfi */ -EXTRACT_HELPER(FPBF, 19, 3); +EXTRACT_HELPER(FPBF, 23, 3); EXTRACT_HELPER(FPIMM, 12, 4); -EXTRACT_HELPER(FPL, 21, 1); +EXTRACT_HELPER(FPL, 25, 1); EXTRACT_HELPER(FPFLM, 17, 8); EXTRACT_HELPER(FPW, 16, 1); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45: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 1Vk49f-00019D-Pu; Sat, 23 Nov 2013 03:45:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49e-000193-3I for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:10 +0000 Received: from [193.109.254.147:37923] by server-15.bemta-14.messagelabs.com id 0C/5F-06807-5C420925; Sat, 23 Nov 2013 03:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385178307!236060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28523 invoked from network); 23 Nov 2013 03:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49b-0006xG-BK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49b-0003aw-9G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:07 +0000 Date: Sat, 23 Nov 2013 03:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-ppc: fix bit extraction for FPBF and FPL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f99b02e5ff1004fb3b41846d2c34f190127456 Author: Aurelien Jarno AuthorDate: Thu Aug 15 13:32:38 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 18:46:32 2013 -0500 target-ppc: fix bit extraction for FPBF and FPL Bit extraction for the FP BF and L field of the MTFSFI and MTFSF instructions is wrong and doesn't match the reference manual (which explain the bit number in big endian format). It has been broken in commit 7d08d85645def18eac2a9d672c1868a35e0bcf79. This patch fixes this, which in turn fixes the problem reported by Khem Raj about the floor() function of libm. Reported-by: Khem Raj Signed-off-by: Aurelien Jarno CC: qemu-stable@nongnu.org (1.6) Signed-off-by: Alexander Graf (cherry picked from commit 779f659021d1754117bce1aab9370dc22f37ae07) Signed-off-by: Michael Roth --- target-ppc/translate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index f07d70d..41f4048 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -428,9 +428,9 @@ EXTRACT_HELPER(CRM, 12, 8); EXTRACT_HELPER(SR, 16, 4); /* mtfsf/mtfsfi */ -EXTRACT_HELPER(FPBF, 19, 3); +EXTRACT_HELPER(FPBF, 23, 3); EXTRACT_HELPER(FPIMM, 12, 4); -EXTRACT_HELPER(FPL, 21, 1); +EXTRACT_HELPER(FPL, 25, 1); EXTRACT_HELPER(FPFLM, 17, 8); EXTRACT_HELPER(FPW, 16, 1); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45: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 1Vk49p-0001Ac-T4; Sat, 23 Nov 2013 03:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49o-0001AO-BJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:20 +0000 Received: from [85.158.139.211:35377] by server-3.bemta-5.messagelabs.com id 41/EB-05884-FC420925; Sat, 23 Nov 2013 03:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385178317!3727587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27913 invoked from network); 23 Nov 2013 03:45: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; 23 Nov 2013 03:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49l-0006xM-Gw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49l-0003bK-Ev for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:17 +0000 Date: Sat, 23 Nov 2013 03:45:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rdma: silly ipv6 bugfix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 260790645e95891cb264c2d657648f43401ac915 Author: Michael R. Hines AuthorDate: Sun Aug 18 22:27:08 2013 -0400 Commit: Michael Roth CommitDate: Tue Sep 24 18:54:58 2013 -0500 rdma: silly ipv6 bugfix My bad - but it's very important for us to warn the user that IPv6 is broken on RoCE in linux right now, until linux releases a fixed version. Signed-off-by: Michael R. Hines Signed-off-by: Michael Tokarev (cherry picked from commit c89aa2f1851b08c3efa8a1070c0a6b9a36e1227f) Signed-off-by: Michael Roth --- migration-rdma.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/migration-rdma.c b/migration-rdma.c index 3d1266f..f5e75d6 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -920,9 +920,11 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp) ret = rdma_resolve_addr(rdma->cm_id, NULL, e->ai_dst_addr, RDMA_RESOLVE_TIMEOUT_MS); if (!ret) { - ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs); - if (ret) { - continue; + if (e->ai_family == AF_INET6) { + ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs); + if (ret) { + continue; + } } goto route; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45: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 1Vk49p-0001Ac-T4; Sat, 23 Nov 2013 03:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49o-0001AO-BJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:20 +0000 Received: from [85.158.139.211:35377] by server-3.bemta-5.messagelabs.com id 41/EB-05884-FC420925; Sat, 23 Nov 2013 03:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385178317!3727587!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27913 invoked from network); 23 Nov 2013 03:45: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; 23 Nov 2013 03:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49l-0006xM-Gw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49l-0003bK-Ev for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:17 +0000 Date: Sat, 23 Nov 2013 03:45:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rdma: silly ipv6 bugfix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 260790645e95891cb264c2d657648f43401ac915 Author: Michael R. Hines AuthorDate: Sun Aug 18 22:27:08 2013 -0400 Commit: Michael Roth CommitDate: Tue Sep 24 18:54:58 2013 -0500 rdma: silly ipv6 bugfix My bad - but it's very important for us to warn the user that IPv6 is broken on RoCE in linux right now, until linux releases a fixed version. Signed-off-by: Michael R. Hines Signed-off-by: Michael Tokarev (cherry picked from commit c89aa2f1851b08c3efa8a1070c0a6b9a36e1227f) Signed-off-by: Michael Roth --- migration-rdma.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/migration-rdma.c b/migration-rdma.c index 3d1266f..f5e75d6 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -920,9 +920,11 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp) ret = rdma_resolve_addr(rdma->cm_id, NULL, e->ai_dst_addr, RDMA_RESOLVE_TIMEOUT_MS); if (!ret) { - ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs); - if (ret) { - continue; + if (e->ai_family == AF_INET6) { + ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs); + if (ret) { + continue; + } } goto route; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49z-0001CW-PB; Sat, 23 Nov 2013 03:45:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49z-0001CJ-2p for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:31 +0000 Received: from [85.158.143.35:38911] by server-2.bemta-4.messagelabs.com id 11/AF-11386-AD420925; Sat, 23 Nov 2013 03:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385178328!552753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30264 invoked from network); 23 Nov 2013 03:45:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49w-0006xU-Mu for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49v-0003bh-KK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:28 +0000 Date: Sat, 23 Nov 2013 03:45:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scripts/qapi.py: Avoid syntax not supported by Python 2.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6dcfd69f8b2aa2cad79486bbadef7d51f7f4e7d Author: Peter Maydell AuthorDate: Tue Aug 20 15:50:15 2013 +0100 Commit: Michael Roth CommitDate: Tue Sep 24 18:56:54 2013 -0500 scripts/qapi.py: Avoid syntax not supported by Python 2.4 The Python "except Foo as x" syntax was only introduced in Python 2.6, but we aim to support Python 2.4 and later. Use the old-style "except Foo, x" syntax instead, thus fixing configure/compile on systems with older Python. Signed-off-by: Peter Maydell Signed-off-by: Luiz Capitulino (cherry picked from commit 21e0043bada1a24ae2ba6cd0051e104c0cbf9634) Signed-off-by: Michael Roth --- scripts/qapi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 0ebea94..1069310 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -161,7 +161,7 @@ class QAPISchema: def parse_schema(fp): try: schema = QAPISchema(fp) - except QAPISchemaError as e: + except QAPISchemaError, e: print >>sys.stderr, e exit(1) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:31 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49z-0001CW-PB; Sat, 23 Nov 2013 03:45:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49z-0001CJ-2p for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:31 +0000 Received: from [85.158.143.35:38911] by server-2.bemta-4.messagelabs.com id 11/AF-11386-AD420925; Sat, 23 Nov 2013 03:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385178328!552753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30264 invoked from network); 23 Nov 2013 03:45:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk49w-0006xU-Mu for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk49v-0003bh-KK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:28 +0000 Date: Sat, 23 Nov 2013 03:45:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scripts/qapi.py: Avoid syntax not supported by Python 2.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6dcfd69f8b2aa2cad79486bbadef7d51f7f4e7d Author: Peter Maydell AuthorDate: Tue Aug 20 15:50:15 2013 +0100 Commit: Michael Roth CommitDate: Tue Sep 24 18:56:54 2013 -0500 scripts/qapi.py: Avoid syntax not supported by Python 2.4 The Python "except Foo as x" syntax was only introduced in Python 2.6, but we aim to support Python 2.4 and later. Use the old-style "except Foo, x" syntax instead, thus fixing configure/compile on systems with older Python. Signed-off-by: Peter Maydell Signed-off-by: Luiz Capitulino (cherry picked from commit 21e0043bada1a24ae2ba6cd0051e104c0cbf9634) Signed-off-by: Michael Roth --- scripts/qapi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 0ebea94..1069310 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -161,7 +161,7 @@ class QAPISchema: def parse_schema(fp): try: schema = QAPISchema(fp) - except QAPISchemaError as e: + except QAPISchemaError, e: print >>sys.stderr, e exit(1) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A9-0001EB-V3; Sat, 23 Nov 2013 03:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A9-0001E0-4R for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:41 +0000 Received: from [85.158.143.35:12846] by server-3.bemta-4.messagelabs.com id F6/FF-32360-4E420925; Sat, 23 Nov 2013 03:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1385178339!547526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6530 invoked from network); 23 Nov 2013 03:45:39 -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; 23 Nov 2013 03:45:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A6-0006xa-SZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4A6-0003c7-Qf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:38 +0000 Date: Sat, 23 Nov 2013 03:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] usb/dev-hid: Modified usb-tablet category from Misc to Input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8414237551972375790==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8414237551972375790== Content-Type: text/plain commit 11b0ab70a58e3e6c06dc1fd1ea318b1c5806d955 Author: Marcel Apfelbaum AuthorDate: Thu Aug 22 20:11:36 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 19:09:19 2013 -0500 usb/dev-hid: Modified usb-tablet category from Misc to Input usb-tablet device was wrongly assigned to Misc category Reported-by: Markus Armbruster Cc: qemu-stable@nongnu.org Signed-off-by: Marcel Apfelbaum Reviewed-by: Andreas Färber Signed-off-by: Gerd Hoffmann (cherry picked from commit 31efd2e883018b4c079ad082105bc161fbb3fef8) Signed-off-by: Michael Roth --- hw/usb/dev-hid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 66c6331..5956720 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -658,7 +658,7 @@ static void usb_tablet_class_initfn(ObjectClass *klass, void *data) uc->product_desc = "QEMU USB Tablet"; dc->vmsd = &vmstate_usb_ptr; dc->props = usb_tablet_properties; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo usb_tablet_info = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============8414237551972375790== 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 --===============8414237551972375790==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:45:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A9-0001EB-V3; Sat, 23 Nov 2013 03:45:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A9-0001E0-4R for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:41 +0000 Received: from [85.158.143.35:12846] by server-3.bemta-4.messagelabs.com id F6/FF-32360-4E420925; Sat, 23 Nov 2013 03:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1385178339!547526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6530 invoked from network); 23 Nov 2013 03:45:39 -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; 23 Nov 2013 03:45:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4A6-0006xa-SZ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4A6-0003c7-Qf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:38 +0000 Date: Sat, 23 Nov 2013 03:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] usb/dev-hid: Modified usb-tablet category from Misc to Input X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8414237551972375790==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8414237551972375790== Content-Type: text/plain commit 11b0ab70a58e3e6c06dc1fd1ea318b1c5806d955 Author: Marcel Apfelbaum AuthorDate: Thu Aug 22 20:11:36 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 19:09:19 2013 -0500 usb/dev-hid: Modified usb-tablet category from Misc to Input usb-tablet device was wrongly assigned to Misc category Reported-by: Markus Armbruster Cc: qemu-stable@nongnu.org Signed-off-by: Marcel Apfelbaum Reviewed-by: Andreas Färber Signed-off-by: Gerd Hoffmann (cherry picked from commit 31efd2e883018b4c079ad082105bc161fbb3fef8) Signed-off-by: Michael Roth --- hw/usb/dev-hid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 66c6331..5956720 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -658,7 +658,7 @@ static void usb_tablet_class_initfn(ObjectClass *klass, void *data) uc->product_desc = "QEMU USB Tablet"; dc->vmsd = &vmstate_usb_ptr; dc->props = usb_tablet_properties; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo usb_tablet_info = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============8414237551972375790== 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 --===============8414237551972375790==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4AL-0001G9-2Q; Sat, 23 Nov 2013 03:45:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AJ-0001Fu-NR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:51 +0000 Received: from [85.158.139.211:27888] by server-9.bemta-5.messagelabs.com id A3/C1-15098-FE420925; Sat, 23 Nov 2013 03:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385178349!3836155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11825 invoked from network); 23 Nov 2013 03:45:50 -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; 23 Nov 2013 03:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AH-0006xg-2I for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4AH-0003cz-0W for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:49 +0000 Date: Sat, 23 Nov 2013 03:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6836934349453380125==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6836934349453380125== Content-Type: text/plain commit 964e0d4ec52ea7400ccc69de69b05ac913bbfff8 Author: Markus Armbruster AuthorDate: Fri Aug 23 18:01:58 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:10:35 2013 -0500 scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial scsi_bus_legacy_add_drive() creates either a scsi-disk or a scsi-generic device. It sets property "serial" to argument serial unless null. Crashes with scsi-generic, because it doesn't have such the property. Only usb_msd_initfn_storage() passes non-null serial. Reproducer: $ qemu-system-x86_64 -nodefaults -display none -S -usb \ -drive if=none,file=/dev/sg1,id=usb-drv0 \ -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123 qemu-system-x86_64: -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123: Property '.serial' not found Aborted (core dumped) Fix by handling exactly like "removable": set the property only when it exists. Cc: qemu-stable@nongnu.org Reviewed-by: Andreas Färber Signed-off-by: Markus Armbruster Signed-off-by: Paolo Bonzini (cherry picked from commit c24e7517ee4a98e90eee5f0f07708a1fa12326b3) Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index fbf9173..8fe4f4c 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -224,7 +224,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, if (object_property_find(OBJECT(dev), "removable", NULL)) { qdev_prop_set_bit(dev, "removable", removable); } - if (serial) { + if (serial && object_property_find(OBJECT(dev), "serial", NULL)) { qdev_prop_set_string(dev, "serial", serial); } if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============6836934349453380125== 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 --===============6836934349453380125==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:45:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4AL-0001G9-2Q; Sat, 23 Nov 2013 03:45:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AJ-0001Fu-NR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:51 +0000 Received: from [85.158.139.211:27888] by server-9.bemta-5.messagelabs.com id A3/C1-15098-FE420925; Sat, 23 Nov 2013 03:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385178349!3836155!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11825 invoked from network); 23 Nov 2013 03:45:50 -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; 23 Nov 2013 03:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AH-0006xg-2I for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4AH-0003cz-0W for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:49 +0000 Date: Sat, 23 Nov 2013 03:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6836934349453380125==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6836934349453380125== Content-Type: text/plain commit 964e0d4ec52ea7400ccc69de69b05ac913bbfff8 Author: Markus Armbruster AuthorDate: Fri Aug 23 18:01:58 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:10:35 2013 -0500 scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial scsi_bus_legacy_add_drive() creates either a scsi-disk or a scsi-generic device. It sets property "serial" to argument serial unless null. Crashes with scsi-generic, because it doesn't have such the property. Only usb_msd_initfn_storage() passes non-null serial. Reproducer: $ qemu-system-x86_64 -nodefaults -display none -S -usb \ -drive if=none,file=/dev/sg1,id=usb-drv0 \ -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123 qemu-system-x86_64: -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123: Property '.serial' not found Aborted (core dumped) Fix by handling exactly like "removable": set the property only when it exists. Cc: qemu-stable@nongnu.org Reviewed-by: Andreas Färber Signed-off-by: Markus Armbruster Signed-off-by: Paolo Bonzini (cherry picked from commit c24e7517ee4a98e90eee5f0f07708a1fa12326b3) Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index fbf9173..8fe4f4c 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -224,7 +224,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, if (object_property_find(OBJECT(dev), "removable", NULL)) { qdev_prop_set_bit(dev, "removable", removable); } - if (serial) { + if (serial && object_property_find(OBJECT(dev), "serial", NULL)) { qdev_prop_set_string(dev, "serial", serial); } if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============6836934349453380125== 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 --===============6836934349453380125==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AW-0001HX-5t; Sat, 23 Nov 2013 03:46:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AU-0001HL-Bc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:02 +0000 Received: from [85.158.137.68:26261] by server-11.bemta-3.messagelabs.com id DA/00-19379-9F420925; Sat, 23 Nov 2013 03:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178359!3251285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22937 invoked from network); 23 Nov 2013 03:46:00 -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; 23 Nov 2013 03:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AR-0006xp-99 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4AR-0003dL-7O for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:59 +0000 Date: Sat, 23 Nov 2013 03:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: fix regression for 64 bit PCI 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 a73c74f63aa8f977ece88c97280a03ea9b1ca395 Author: Michael S. Tsirkin AuthorDate: Tue Aug 27 08:37:26 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 19:12:03 2013 -0500 pc: fix regression for 64 bit PCI memory commit 398489018183d613306ab022653552247d93919f pc: limit 64 bit hole to 2G by default introduced a way for management to control the window allocated to the 64 bit PCI hole. This is useful, but existing management tools do not know how to set this property. As a result, e.g. specifying a large ivshmem device with size > 4G is broken by default. For example this configuration no longer works: -device ivshmem,size=4294967296,chardev=cfoo -chardev socket,path=/tmp/sock,id=cfoo,server,nowait Fix this by detecting that hole size was not specified and defaulting to the backwards-compatible value of 1 << 62. Cc: qemu-stable@nongnu.org Cc: Igor Mammedov Signed-off-by: Michael S. Tsirkin (cherry picked from commit 1466cef32dd5e7ef3c6477e96d85d92302ad02e3) Signed-off-by: Michael Roth --- hw/pci-host/piix.c | 9 ++++++--- hw/pci-host/q35.c | 8 +++++--- include/hw/i386/pc.h | 11 ++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index dc1718f..221d82b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -320,6 +320,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, PCII440FXState *f; unsigned i; I440FXState *i440fx; + uint64_t pci_hole64_size; dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); s = PCI_HOST_BRIDGE(dev); @@ -351,13 +352,15 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, pci_hole_start, pci_hole_size); memory_region_add_subregion(f->system_memory, pci_hole_start, &f->pci_hole); + pci_hole64_size = pci_host_get_hole64_size(i440fx->pci_hole64_size); + pc_init_pci64_hole(&i440fx->pci_info, 0x100000000ULL + above_4g_mem_size, - i440fx->pci_hole64_size); + pci_hole64_size); memory_region_init_alias(&f->pci_hole_64bit, OBJECT(d), "pci-hole64", f->pci_address_space, i440fx->pci_info.w64.begin, - i440fx->pci_hole64_size); - if (i440fx->pci_hole64_size) { + pci_hole64_size); + if (pci_hole64_size) { memory_region_add_subregion(f->system_memory, i440fx->pci_info.w64.begin, &f->pci_hole_64bit); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 12314d8..4febd24 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -320,6 +320,7 @@ static int mch_init(PCIDevice *d) { int i; MCHPCIState *mch = MCH_PCI_DEVICE(d); + uint64_t pci_hole64_size; /* setup pci memory regions */ memory_region_init_alias(&mch->pci_hole, OBJECT(mch), "pci-hole", @@ -329,13 +330,14 @@ static int mch_init(PCIDevice *d) memory_region_add_subregion(mch->system_memory, mch->below_4g_mem_size, &mch->pci_hole); + pci_hole64_size = pci_host_get_hole64_size(mch->pci_hole64_size); pc_init_pci64_hole(&mch->pci_info, 0x100000000ULL + mch->above_4g_mem_size, - mch->pci_hole64_size); + pci_hole64_size); memory_region_init_alias(&mch->pci_hole_64bit, OBJECT(mch), "pci-hole64", mch->pci_address_space, mch->pci_info.w64.begin, - mch->pci_hole64_size); - if (mch->pci_hole64_size) { + pci_hole64_size); + if (pci_hole64_size) { memory_region_add_subregion(mch->system_memory, mch->pci_info.w64.begin, &mch->pci_hole_64bit); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f79d478..475ba9e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -106,7 +106,16 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, #define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" #define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" #define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" -#define DEFAULT_PCI_HOLE64_SIZE (1ULL << 31) +#define DEFAULT_PCI_HOLE64_SIZE (~0x0ULL) + +static inline uint64_t pci_host_get_hole64_size(uint64_t pci_hole64_size) +{ + if (pci_hole64_size == DEFAULT_PCI_HOLE64_SIZE) { + return 1ULL << 62; + } else { + return pci_hole64_size; + } +} void pc_init_pci64_hole(PcPciInfo *pci_info, uint64_t pci_hole64_start, uint64_t pci_hole64_size); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:04 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AW-0001HX-5t; Sat, 23 Nov 2013 03:46:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AU-0001HL-Bc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:02 +0000 Received: from [85.158.137.68:26261] by server-11.bemta-3.messagelabs.com id DA/00-19379-9F420925; Sat, 23 Nov 2013 03:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178359!3251285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22937 invoked from network); 23 Nov 2013 03:46:00 -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; 23 Nov 2013 03:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4AR-0006xp-99 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4AR-0003dL-7O for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:45:59 +0000 Date: Sat, 23 Nov 2013 03:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: fix regression for 64 bit PCI 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 a73c74f63aa8f977ece88c97280a03ea9b1ca395 Author: Michael S. Tsirkin AuthorDate: Tue Aug 27 08:37:26 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 19:12:03 2013 -0500 pc: fix regression for 64 bit PCI memory commit 398489018183d613306ab022653552247d93919f pc: limit 64 bit hole to 2G by default introduced a way for management to control the window allocated to the 64 bit PCI hole. This is useful, but existing management tools do not know how to set this property. As a result, e.g. specifying a large ivshmem device with size > 4G is broken by default. For example this configuration no longer works: -device ivshmem,size=4294967296,chardev=cfoo -chardev socket,path=/tmp/sock,id=cfoo,server,nowait Fix this by detecting that hole size was not specified and defaulting to the backwards-compatible value of 1 << 62. Cc: qemu-stable@nongnu.org Cc: Igor Mammedov Signed-off-by: Michael S. Tsirkin (cherry picked from commit 1466cef32dd5e7ef3c6477e96d85d92302ad02e3) Signed-off-by: Michael Roth --- hw/pci-host/piix.c | 9 ++++++--- hw/pci-host/q35.c | 8 +++++--- include/hw/i386/pc.h | 11 ++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index dc1718f..221d82b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -320,6 +320,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, PCII440FXState *f; unsigned i; I440FXState *i440fx; + uint64_t pci_hole64_size; dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); s = PCI_HOST_BRIDGE(dev); @@ -351,13 +352,15 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, pci_hole_start, pci_hole_size); memory_region_add_subregion(f->system_memory, pci_hole_start, &f->pci_hole); + pci_hole64_size = pci_host_get_hole64_size(i440fx->pci_hole64_size); + pc_init_pci64_hole(&i440fx->pci_info, 0x100000000ULL + above_4g_mem_size, - i440fx->pci_hole64_size); + pci_hole64_size); memory_region_init_alias(&f->pci_hole_64bit, OBJECT(d), "pci-hole64", f->pci_address_space, i440fx->pci_info.w64.begin, - i440fx->pci_hole64_size); - if (i440fx->pci_hole64_size) { + pci_hole64_size); + if (pci_hole64_size) { memory_region_add_subregion(f->system_memory, i440fx->pci_info.w64.begin, &f->pci_hole_64bit); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 12314d8..4febd24 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -320,6 +320,7 @@ static int mch_init(PCIDevice *d) { int i; MCHPCIState *mch = MCH_PCI_DEVICE(d); + uint64_t pci_hole64_size; /* setup pci memory regions */ memory_region_init_alias(&mch->pci_hole, OBJECT(mch), "pci-hole", @@ -329,13 +330,14 @@ static int mch_init(PCIDevice *d) memory_region_add_subregion(mch->system_memory, mch->below_4g_mem_size, &mch->pci_hole); + pci_hole64_size = pci_host_get_hole64_size(mch->pci_hole64_size); pc_init_pci64_hole(&mch->pci_info, 0x100000000ULL + mch->above_4g_mem_size, - mch->pci_hole64_size); + pci_hole64_size); memory_region_init_alias(&mch->pci_hole_64bit, OBJECT(mch), "pci-hole64", mch->pci_address_space, mch->pci_info.w64.begin, - mch->pci_hole64_size); - if (mch->pci_hole64_size) { + pci_hole64_size); + if (pci_hole64_size) { memory_region_add_subregion(mch->system_memory, mch->pci_info.w64.begin, &mch->pci_hole_64bit); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f79d478..475ba9e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -106,7 +106,16 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, #define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" #define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" #define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" -#define DEFAULT_PCI_HOLE64_SIZE (1ULL << 31) +#define DEFAULT_PCI_HOLE64_SIZE (~0x0ULL) + +static inline uint64_t pci_host_get_hole64_size(uint64_t pci_hole64_size) +{ + if (pci_hole64_size == DEFAULT_PCI_HOLE64_SIZE) { + return 1ULL << 62; + } else { + return pci_hole64_size; + } +} void pc_init_pci64_hole(PcPciInfo *pci_info, uint64_t pci_hole64_start, uint64_t pci_hole64_size); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Af-0001Ip-8l; Sat, 23 Nov 2013 03:46:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ae-0001Ie-4a for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:12 +0000 Received: from [85.158.143.35:43719] by server-3.bemta-4.messagelabs.com id 40/10-32360-30520925; Sat, 23 Nov 2013 03:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385178369!544792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6403 invoked from network); 23 Nov 2013 03:46:10 -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; 23 Nov 2013 03:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ab-0006yO-Fr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ab-0003dt-Df for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:09 +0000 Date: Sat, 23 Nov 2013 03:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pseries: Fix stalls on hypervisor virtual console X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3fe494efc5eb107c4c90e96df3e6131f9960f4b9 Author: Anton Blanchard AuthorDate: Tue Aug 13 14:10:04 2013 +1000 Commit: Michael Roth CommitDate: Tue Sep 24 19:23:18 2013 -0500 pseries: Fix stalls on hypervisor virtual console A number of users are reporting stalls when using the pseries hypervisor virtual console. A simple test case is to paste 15 or 17 characters at a time into the console. Pasting 15 characters at a time works fine but pasting 17 characters hangs for a random amount of time. Other activity (network, qemu monitor etc) unblocks it. If qemu-char tries to send more than 16 characters at once, vty_can_receive returns false. At this point we have to wait for the guest to consume that output. Everything is good so far. The problem occurs when the the guest does consume the output. We need to signal back to the qemu-char layer that we are ready for more input. Without this we block until something else kicks us (eg network activity). Signed-off-by: Anton Blanchard Signed-off-by: Alexander Graf (cherry picked from commit 7770b6f78a2d655e03852a5de238f5926c92be6a) Signed-off-by: Michael Roth --- hw/char/spapr_vty.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index a799721..9c2aef8 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -47,6 +47,8 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) buf[n++] = dev->buf[dev->out++ % VTERM_BUFSIZE]; } + qemu_chr_accept_input(dev->chardev); + return n; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:13 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Af-0001Ip-8l; Sat, 23 Nov 2013 03:46:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ae-0001Ie-4a for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:12 +0000 Received: from [85.158.143.35:43719] by server-3.bemta-4.messagelabs.com id 40/10-32360-30520925; Sat, 23 Nov 2013 03:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385178369!544792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6403 invoked from network); 23 Nov 2013 03:46:10 -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; 23 Nov 2013 03:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ab-0006yO-Fr for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ab-0003dt-Df for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:09 +0000 Date: Sat, 23 Nov 2013 03:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pseries: Fix stalls on hypervisor virtual console X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3fe494efc5eb107c4c90e96df3e6131f9960f4b9 Author: Anton Blanchard AuthorDate: Tue Aug 13 14:10:04 2013 +1000 Commit: Michael Roth CommitDate: Tue Sep 24 19:23:18 2013 -0500 pseries: Fix stalls on hypervisor virtual console A number of users are reporting stalls when using the pseries hypervisor virtual console. A simple test case is to paste 15 or 17 characters at a time into the console. Pasting 15 characters at a time works fine but pasting 17 characters hangs for a random amount of time. Other activity (network, qemu monitor etc) unblocks it. If qemu-char tries to send more than 16 characters at once, vty_can_receive returns false. At this point we have to wait for the guest to consume that output. Everything is good so far. The problem occurs when the the guest does consume the output. We need to signal back to the qemu-char layer that we are ready for more input. Without this we block until something else kicks us (eg network activity). Signed-off-by: Anton Blanchard Signed-off-by: Alexander Graf (cherry picked from commit 7770b6f78a2d655e03852a5de238f5926c92be6a) Signed-off-by: Michael Roth --- hw/char/spapr_vty.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index a799721..9c2aef8 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -47,6 +47,8 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) buf[n++] = dev->buf[dev->out++ % VTERM_BUFSIZE]; } + qemu_chr_accept_input(dev->chardev); + return n; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46: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 1Vk4Aq-0001Kj-Dn; Sat, 23 Nov 2013 03:46:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ao-0001KJ-CD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:22 +0000 Received: from [193.109.254.147:61152] by server-2.bemta-14.messagelabs.com id 1D/02-08076-D0520925; Sat, 23 Nov 2013 03:46:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178379!235750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13218 invoked from network); 23 Nov 2013 03:46:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:46:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Al-0006yU-MX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Al-0003eF-K8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:19 +0000 Date: Sat, 23 Nov 2013 03:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 358bb0daa1ce332a18cc996fcd078a3989f77d36 Author: yinyin AuthorDate: Thu Aug 22 14:47:16 2013 +0800 Commit: Michael Roth CommitDate: Tue Sep 24 19:36:15 2013 -0500 virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table virtqueue_get_avail_bytes: when found a indirect desc, we need loop over it. /* loop over the indirect descriptor table */ indirect = 1; max = vring_desc_len(desc_pa, i) / sizeof(VRingDesc); num_bufs = i = 0; desc_pa = vring_desc_addr(desc_pa, i); But, It init i to 0, then use i to update desc_pa. so we will always get: desc_pa = vring_desc_addr(desc_pa, 0); the last two line should swap. Cc: qemu-stable@nongnu.org Signed-off-by: Yin Yin Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael S. Tsirkin (cherry picked from commit 1ae2757c6c4525c9b42f408c86818f843bad7418) Signed-off-by: Michael Roth --- hw/virtio/virtio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index f03c45d..2f1e73b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -377,8 +377,8 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, /* loop over the indirect descriptor table */ indirect = 1; max = vring_desc_len(desc_pa, i) / sizeof(VRingDesc); - num_bufs = i = 0; desc_pa = vring_desc_addr(desc_pa, i); + num_bufs = i = 0; } do { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46: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 1Vk4Aq-0001Kj-Dn; Sat, 23 Nov 2013 03:46:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ao-0001KJ-CD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:22 +0000 Received: from [193.109.254.147:61152] by server-2.bemta-14.messagelabs.com id 1D/02-08076-D0520925; Sat, 23 Nov 2013 03:46:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178379!235750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13218 invoked from network); 23 Nov 2013 03:46:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:46:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Al-0006yU-MX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Al-0003eF-K8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:19 +0000 Date: Sat, 23 Nov 2013 03:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 358bb0daa1ce332a18cc996fcd078a3989f77d36 Author: yinyin AuthorDate: Thu Aug 22 14:47:16 2013 +0800 Commit: Michael Roth CommitDate: Tue Sep 24 19:36:15 2013 -0500 virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table virtqueue_get_avail_bytes: when found a indirect desc, we need loop over it. /* loop over the indirect descriptor table */ indirect = 1; max = vring_desc_len(desc_pa, i) / sizeof(VRingDesc); num_bufs = i = 0; desc_pa = vring_desc_addr(desc_pa, i); But, It init i to 0, then use i to update desc_pa. so we will always get: desc_pa = vring_desc_addr(desc_pa, 0); the last two line should swap. Cc: qemu-stable@nongnu.org Signed-off-by: Yin Yin Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael S. Tsirkin (cherry picked from commit 1ae2757c6c4525c9b42f408c86818f843bad7418) Signed-off-by: Michael Roth --- hw/virtio/virtio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index f03c45d..2f1e73b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -377,8 +377,8 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes, /* loop over the indirect descriptor table */ indirect = 1; max = vring_desc_len(desc_pa, i) / sizeof(VRingDesc); - num_bufs = i = 0; desc_pa = vring_desc_addr(desc_pa, i); + num_bufs = i = 0; } do { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Az-0001MG-KA; Sat, 23 Nov 2013 03:46:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ay-0001M3-F2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:32 +0000 Received: from [193.109.254.147:39558] by server-11.bemta-14.messagelabs.com id D9/25-08419-71520925; Sat, 23 Nov 2013 03:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385178390!234023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7383 invoked from network); 23 Nov 2013 03:46:31 -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 Nov 2013 03:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Av-0006yc-Th for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Av-0003ec-Rk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:29 +0000 Date: Sat, 23 Nov 2013 03:46:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: fix endpoint interval calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0a5eb81b43e56569cfdb9c86fd78930b2765b96 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:39:02 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:51:32 2013 -0500 xhci: fix endpoint interval calculation Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit ca7162782a293f525633e5816470498dd86a51cf) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 58c88b8..3c0ba8e 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1257,7 +1257,7 @@ static void xhci_init_epctx(XHCIEPContext *epctx, epctx->ring.ccs = ctx[2] & 1; } - epctx->interval = 1 << (ctx[0] >> 16) & 0xff; + epctx->interval = 1 << ((ctx[0] >> 16) & 0xff); } static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:33 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Az-0001MG-KA; Sat, 23 Nov 2013 03:46:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ay-0001M3-F2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:32 +0000 Received: from [193.109.254.147:39558] by server-11.bemta-14.messagelabs.com id D9/25-08419-71520925; Sat, 23 Nov 2013 03:46:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1385178390!234023!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7383 invoked from network); 23 Nov 2013 03:46:31 -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 Nov 2013 03:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Av-0006yc-Th for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Av-0003ec-Rk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:29 +0000 Date: Sat, 23 Nov 2013 03:46:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: fix endpoint interval calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0a5eb81b43e56569cfdb9c86fd78930b2765b96 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:39:02 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:51:32 2013 -0500 xhci: fix endpoint interval calculation Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit ca7162782a293f525633e5816470498dd86a51cf) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 58c88b8..3c0ba8e 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1257,7 +1257,7 @@ static void xhci_init_epctx(XHCIEPContext *epctx, epctx->ring.ccs = ctx[2] & 1; } - epctx->interval = 1 << (ctx[0] >> 16) & 0xff; + epctx->interval = 1 << ((ctx[0] >> 16) & 0xff); } static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BA-0001Nh-N4; Sat, 23 Nov 2013 03:46:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4B9-0001NY-JK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:43 +0000 Received: from [85.158.143.35:16168] by server-1.bemta-4.messagelabs.com id B7/E9-02132-22520925; Sat, 23 Nov 2013 03:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1385178401!549261!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26691 invoked from network); 23 Nov 2013 03:46:42 -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; 23 Nov 2013 03:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4B7-0006yi-3i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4B7-0003f1-03 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:41 +0000 Date: Sat, 23 Nov 2013 03:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "usb-hub: report status changes only 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 c09a4634d945df5d7e1fbc394646e78d7d713c67 Author: Gerd Hoffmann AuthorDate: Tue Aug 27 17:00:04 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:53:40 2013 -0500 Revert "usb-hub: report status changes only once" This reverts commit a309ee6e0a256f690760abfba44fceaa52a7c2f3. This isn't in line with the usb specification and adds regressions, win7 fails to drive the usb hub for example. Was added because it "solved" the issue of hubs interacting badly with the xhci host controller. Now with the root cause being fixed in xhci (commit ) we can revert this one. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit bdebd6ee81f4d849aa8541c289203e3992450db0) Signed-off-by: Michael Roth --- hw/usb/dev-hub.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index e865a98..4188a3c 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -33,7 +33,6 @@ typedef struct USBHubPort { USBPort port; uint16_t wPortStatus; uint16_t wPortChange; - uint16_t wPortChange_reported; } USBHubPort; typedef struct USBHubState { @@ -468,11 +467,8 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p) status = 0; for(i = 0; i < NUM_PORTS; i++) { port = &s->ports[i]; - if (port->wPortChange && - port->wPortChange_reported != port->wPortChange) { + if (port->wPortChange) status |= (1 << (i + 1)); - } - port->wPortChange_reported = port->wPortChange; } if (status != 0) { for(i = 0; i < n; i++) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:46:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BA-0001Nh-N4; Sat, 23 Nov 2013 03:46:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4B9-0001NY-JK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:43 +0000 Received: from [85.158.143.35:16168] by server-1.bemta-4.messagelabs.com id B7/E9-02132-22520925; Sat, 23 Nov 2013 03:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1385178401!549261!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26691 invoked from network); 23 Nov 2013 03:46:42 -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; 23 Nov 2013 03:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4B7-0006yi-3i for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4B7-0003f1-03 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:41 +0000 Date: Sat, 23 Nov 2013 03:46:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "usb-hub: report status changes only 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 c09a4634d945df5d7e1fbc394646e78d7d713c67 Author: Gerd Hoffmann AuthorDate: Tue Aug 27 17:00:04 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 19:53:40 2013 -0500 Revert "usb-hub: report status changes only once" This reverts commit a309ee6e0a256f690760abfba44fceaa52a7c2f3. This isn't in line with the usb specification and adds regressions, win7 fails to drive the usb hub for example. Was added because it "solved" the issue of hubs interacting badly with the xhci host controller. Now with the root cause being fixed in xhci (commit ) we can revert this one. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit bdebd6ee81f4d849aa8541c289203e3992450db0) Signed-off-by: Michael Roth --- hw/usb/dev-hub.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index e865a98..4188a3c 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -33,7 +33,6 @@ typedef struct USBHubPort { USBPort port; uint16_t wPortStatus; uint16_t wPortChange; - uint16_t wPortChange_reported; } USBHubPort; typedef struct USBHubState { @@ -468,11 +467,8 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p) status = 0; for(i = 0; i < NUM_PORTS; i++) { port = &s->ports[i]; - if (port->wPortChange && - port->wPortChange_reported != port->wPortChange) { + if (port->wPortChange) status |= (1 << (i + 1)); - } - port->wPortChange_reported = port->wPortChange; } if (status != 0) { for(i = 0; i < n; i++) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4BK-0001Pg-SA; Sat, 23 Nov 2013 03:46:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BK-0001PR-3F for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:54 +0000 Received: from [85.158.139.211:28844] by server-15.bemta-5.messagelabs.com id 28/4F-08490-D2520925; Sat, 23 Nov 2013 03:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1385178411!3805486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14495 invoked from network); 23 Nov 2013 03:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BH-0006yo-9u for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4BH-0003g7-7R for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:51 +0000 Date: Sat, 23 Nov 2013 03:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: expect errors from bdrv_co_is_allocated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da4e203efa76f2d2ee0a17670c241881963d033d Author: Paolo Bonzini AuthorDate: Wed Sep 4 19:00:25 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 20:59:51 2013 -0500 block: expect errors from bdrv_co_is_allocated Some bdrv_is_allocated callers do not expect errors, but the fallback in qcow2.c might make other callers trip on assertion failures or infinite loops. Fix the callers to always look for errors. Cc: qemu-stable@nongnu.org Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi (cherry picked from commit d663640c04f2aab810915c556390211d75457704) Conflicts: block/cow.c *modified to avoid dependency on upstream's e641c1e8 Signed-off-by: Michael Roth --- block.c | 7 +++++-- block/cow.c | 6 +++++- block/qcow2.c | 4 +--- block/stream.c | 2 +- qemu-img.c | 16 ++++++++++++++-- qemu-io-cmds.c | 4 ++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index d5ce8d3..8ce8b91 100644 --- a/block.c +++ b/block.c @@ -1803,8 +1803,11 @@ int bdrv_commit(BlockDriverState *bs) buf = g_malloc(COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE); for (sector = 0; sector < total_sectors; sector += n) { - if (bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n)) { - + ret = bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n); + if (ret < 0) { + goto ro_cleanup; + } + if (ret) { if (bdrv_read(bs, sector, buf, n) != 0) { ret = -EIO; goto ro_cleanup; diff --git a/block/cow.c b/block/cow.c index 1cc2e89..e1b73d6 100644 --- a/block/cow.c +++ b/block/cow.c @@ -189,7 +189,11 @@ static int coroutine_fn cow_read(BlockDriverState *bs, int64_t sector_num, int ret, n; while (nb_sectors > 0) { - if (bdrv_co_is_allocated(bs, sector_num, nb_sectors, &n)) { + ret = bdrv_co_is_allocated(bs, sector_num, nb_sectors, &n); + if (ret < 0) { + return ret; + } + if (ret) { ret = bdrv_pread(bs->file, s->cow_sectors_offset + sector_num * 512, buf, n * 512); diff --git a/block/qcow2.c b/block/qcow2.c index 3376901..7f7282e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -648,13 +648,11 @@ static int coroutine_fn qcow2_co_is_allocated(BlockDriverState *bs, int ret; *pnum = nb_sectors; - /* FIXME We can get errors here, but the bdrv_co_is_allocated interface - * can't pass them on today */ qemu_co_mutex_lock(&s->lock); ret = qcow2_get_cluster_offset(bs, sector_num << 9, pnum, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { - *pnum = 0; + return ret; } return (cluster_offset != 0) || (ret == QCOW2_CLUSTER_ZERO); diff --git a/block/stream.c b/block/stream.c index 7fe9e48..4e8d177 100644 --- a/block/stream.c +++ b/block/stream.c @@ -120,7 +120,7 @@ wait: if (ret == 1) { /* Allocated in the top, no need to copy. */ copy = false; - } else { + } else if (ret >= 0) { /* Copy if allocated in the intermediate images. Limit to the * known-unallocated area [sector_num, sector_num+n). */ ret = bdrv_co_is_allocated_above(bs->backing_hd, base, diff --git a/qemu-img.c b/qemu-img.c index b9a848d..b01998b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1485,8 +1485,15 @@ static int img_convert(int argc, char **argv) are present in both the output's and input's base images (no need to copy them). */ if (out_baseimg) { - if (!bdrv_is_allocated(bs[bs_i], sector_num - bs_offset, - n, &n1)) { + ret = bdrv_is_allocated(bs[bs_i], sector_num - bs_offset, + n, &n1); + if (ret < 0) { + error_report("error while reading metadata for sector " + "%" PRId64 ": %s", + sector_num - bs_offset, strerror(-ret)); + goto out; + } + if (!ret) { sector_num += n1; continue; } @@ -2076,6 +2083,11 @@ static int img_rebase(int argc, char **argv) /* If the cluster is allocated, we don't need to take action */ ret = bdrv_is_allocated(bs, sector, n, &n); + if (ret < 0) { + error_report("error while reading image metadata: %s", + strerror(-ret)); + goto out; + } if (ret) { continue; } diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index ffbcf31..ffe48ad 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1829,6 +1829,10 @@ static int alloc_f(BlockDriverState *bs, int argc, char **argv) sector_num = offset >> 9; while (remaining) { ret = bdrv_is_allocated(bs, sector_num, remaining, &num); + if (ret < 0) { + printf("is_allocated failed: %s\n", strerror(-ret)); + return 0; + } sector_num += num; remaining -= num; if (ret) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:46:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4BK-0001Pg-SA; Sat, 23 Nov 2013 03:46:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BK-0001PR-3F for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:54 +0000 Received: from [85.158.139.211:28844] by server-15.bemta-5.messagelabs.com id 28/4F-08490-D2520925; Sat, 23 Nov 2013 03:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1385178411!3805486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14495 invoked from network); 23 Nov 2013 03:46:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BH-0006yo-9u for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4BH-0003g7-7R for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:46:51 +0000 Date: Sat, 23 Nov 2013 03:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] block: expect errors from bdrv_co_is_allocated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da4e203efa76f2d2ee0a17670c241881963d033d Author: Paolo Bonzini AuthorDate: Wed Sep 4 19:00:25 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 20:59:51 2013 -0500 block: expect errors from bdrv_co_is_allocated Some bdrv_is_allocated callers do not expect errors, but the fallback in qcow2.c might make other callers trip on assertion failures or infinite loops. Fix the callers to always look for errors. Cc: qemu-stable@nongnu.org Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi (cherry picked from commit d663640c04f2aab810915c556390211d75457704) Conflicts: block/cow.c *modified to avoid dependency on upstream's e641c1e8 Signed-off-by: Michael Roth --- block.c | 7 +++++-- block/cow.c | 6 +++++- block/qcow2.c | 4 +--- block/stream.c | 2 +- qemu-img.c | 16 ++++++++++++++-- qemu-io-cmds.c | 4 ++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index d5ce8d3..8ce8b91 100644 --- a/block.c +++ b/block.c @@ -1803,8 +1803,11 @@ int bdrv_commit(BlockDriverState *bs) buf = g_malloc(COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE); for (sector = 0; sector < total_sectors; sector += n) { - if (bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n)) { - + ret = bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n); + if (ret < 0) { + goto ro_cleanup; + } + if (ret) { if (bdrv_read(bs, sector, buf, n) != 0) { ret = -EIO; goto ro_cleanup; diff --git a/block/cow.c b/block/cow.c index 1cc2e89..e1b73d6 100644 --- a/block/cow.c +++ b/block/cow.c @@ -189,7 +189,11 @@ static int coroutine_fn cow_read(BlockDriverState *bs, int64_t sector_num, int ret, n; while (nb_sectors > 0) { - if (bdrv_co_is_allocated(bs, sector_num, nb_sectors, &n)) { + ret = bdrv_co_is_allocated(bs, sector_num, nb_sectors, &n); + if (ret < 0) { + return ret; + } + if (ret) { ret = bdrv_pread(bs->file, s->cow_sectors_offset + sector_num * 512, buf, n * 512); diff --git a/block/qcow2.c b/block/qcow2.c index 3376901..7f7282e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -648,13 +648,11 @@ static int coroutine_fn qcow2_co_is_allocated(BlockDriverState *bs, int ret; *pnum = nb_sectors; - /* FIXME We can get errors here, but the bdrv_co_is_allocated interface - * can't pass them on today */ qemu_co_mutex_lock(&s->lock); ret = qcow2_get_cluster_offset(bs, sector_num << 9, pnum, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { - *pnum = 0; + return ret; } return (cluster_offset != 0) || (ret == QCOW2_CLUSTER_ZERO); diff --git a/block/stream.c b/block/stream.c index 7fe9e48..4e8d177 100644 --- a/block/stream.c +++ b/block/stream.c @@ -120,7 +120,7 @@ wait: if (ret == 1) { /* Allocated in the top, no need to copy. */ copy = false; - } else { + } else if (ret >= 0) { /* Copy if allocated in the intermediate images. Limit to the * known-unallocated area [sector_num, sector_num+n). */ ret = bdrv_co_is_allocated_above(bs->backing_hd, base, diff --git a/qemu-img.c b/qemu-img.c index b9a848d..b01998b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1485,8 +1485,15 @@ static int img_convert(int argc, char **argv) are present in both the output's and input's base images (no need to copy them). */ if (out_baseimg) { - if (!bdrv_is_allocated(bs[bs_i], sector_num - bs_offset, - n, &n1)) { + ret = bdrv_is_allocated(bs[bs_i], sector_num - bs_offset, + n, &n1); + if (ret < 0) { + error_report("error while reading metadata for sector " + "%" PRId64 ": %s", + sector_num - bs_offset, strerror(-ret)); + goto out; + } + if (!ret) { sector_num += n1; continue; } @@ -2076,6 +2083,11 @@ static int img_rebase(int argc, char **argv) /* If the cluster is allocated, we don't need to take action */ ret = bdrv_is_allocated(bs, sector, n, &n); + if (ret < 0) { + error_report("error while reading image metadata: %s", + strerror(-ret)); + goto out; + } if (ret) { continue; } diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index ffbcf31..ffe48ad 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1829,6 +1829,10 @@ static int alloc_f(BlockDriverState *bs, int argc, char **argv) sector_num = offset >> 9; while (remaining) { ret = bdrv_is_allocated(bs, sector_num, remaining, &num); + if (ret < 0) { + printf("is_allocated failed: %s\n", strerror(-ret)); + return 0; + } sector_num += num; remaining -= num; if (ret) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4BU-0001RD-VI; Sat, 23 Nov 2013 03:47:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BU-0001R3-77 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:04 +0000 Received: from [85.158.139.211:29040] by server-15.bemta-5.messagelabs.com id 34/5F-08490-73520925; Sat, 23 Nov 2013 03:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385178421!1866408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21472 invoked from network); 23 Nov 2013 03:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BR-0006yx-I4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4BR-0003gf-Em for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:01 +0000 Date: Sat, 23 Nov 2013 03:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-i386: fix disassembly with PAE=1, PG=0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9fd82ee939d6ee5bff126b125020021e18ce330 Author: Paolo Bonzini AuthorDate: Fri Aug 30 11:58:45 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:05:30 2013 -0500 target-i386: fix disassembly with PAE=1, PG=0 CR4.PAE=1 will not enable paging if CR0.PG=0, but the "if" chain in x86_cpu_get_phys_page_debug says otherwise. Check CR0.PG before everything else. Fixes "-d in_asm" for a code section at the beginning of OVMF. Signed-off-by: Paolo Bonzini Signed-off-by: Richard Henderson Reviewed-by: Max Filippov (cherry picked from commit f2f8560c7a5303065a2a3207ec475dfb3a622a0e) Signed-off-by: Michael Roth --- target-i386/helper.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index bf3e2ac..7f74e5d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -894,7 +894,10 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint32_t page_offset; int page_size; - if (env->cr[4] & CR4_PAE_MASK) { + if (!(env->cr[0] & CR0_PG_MASK)) { + pte = addr & env->a20_mask; + page_size = 4096; + } else if (env->cr[4] & CR4_PAE_MASK) { target_ulong pdpe_addr; uint64_t pde, pdpe; @@ -952,26 +955,21 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { uint32_t pde; - if (!(env->cr[0] & CR0_PG_MASK)) { - pte = addr; - page_size = 4096; + /* page directory entry */ + pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; + pde = ldl_phys(pde_addr); + if (!(pde & PG_PRESENT_MASK)) + return -1; + if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { + pte = pde & ~0x003ff000; /* align to 4MB */ + page_size = 4096 * 1024; } else { /* page directory entry */ - pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; - pde = ldl_phys(pde_addr); - if (!(pde & PG_PRESENT_MASK)) + pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; + pte = ldl_phys(pte_addr); + if (!(pte & PG_PRESENT_MASK)) return -1; - if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { - pte = pde & ~0x003ff000; /* align to 4MB */ - page_size = 4096 * 1024; - } else { - /* page directory entry */ - pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; - pte = ldl_phys(pte_addr); - if (!(pte & PG_PRESENT_MASK)) - return -1; - page_size = 4096; - } + page_size = 4096; } pte = pte & env->a20_mask; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:05 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4BU-0001RD-VI; Sat, 23 Nov 2013 03:47:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BU-0001R3-77 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:04 +0000 Received: from [85.158.139.211:29040] by server-15.bemta-5.messagelabs.com id 34/5F-08490-73520925; Sat, 23 Nov 2013 03:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385178421!1866408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21472 invoked from network); 23 Nov 2013 03:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:47:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4BR-0006yx-I4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4BR-0003gf-Em for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:01 +0000 Date: Sat, 23 Nov 2013 03:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] target-i386: fix disassembly with PAE=1, PG=0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9fd82ee939d6ee5bff126b125020021e18ce330 Author: Paolo Bonzini AuthorDate: Fri Aug 30 11:58:45 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:05:30 2013 -0500 target-i386: fix disassembly with PAE=1, PG=0 CR4.PAE=1 will not enable paging if CR0.PG=0, but the "if" chain in x86_cpu_get_phys_page_debug says otherwise. Check CR0.PG before everything else. Fixes "-d in_asm" for a code section at the beginning of OVMF. Signed-off-by: Paolo Bonzini Signed-off-by: Richard Henderson Reviewed-by: Max Filippov (cherry picked from commit f2f8560c7a5303065a2a3207ec475dfb3a622a0e) Signed-off-by: Michael Roth --- target-i386/helper.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index bf3e2ac..7f74e5d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -894,7 +894,10 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint32_t page_offset; int page_size; - if (env->cr[4] & CR4_PAE_MASK) { + if (!(env->cr[0] & CR0_PG_MASK)) { + pte = addr & env->a20_mask; + page_size = 4096; + } else if (env->cr[4] & CR4_PAE_MASK) { target_ulong pdpe_addr; uint64_t pde, pdpe; @@ -952,26 +955,21 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { uint32_t pde; - if (!(env->cr[0] & CR0_PG_MASK)) { - pte = addr; - page_size = 4096; + /* page directory entry */ + pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; + pde = ldl_phys(pde_addr); + if (!(pde & PG_PRESENT_MASK)) + return -1; + if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { + pte = pde & ~0x003ff000; /* align to 4MB */ + page_size = 4096 * 1024; } else { /* page directory entry */ - pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; - pde = ldl_phys(pde_addr); - if (!(pde & PG_PRESENT_MASK)) + pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; + pte = ldl_phys(pte_addr); + if (!(pte & PG_PRESENT_MASK)) return -1; - if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { - pte = pde & ~0x003ff000; /* align to 4MB */ - page_size = 4096 * 1024; - } else { - /* page directory entry */ - pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; - pte = ldl_phys(pte_addr); - if (!(pte & PG_PRESENT_MASK)) - return -1; - page_size = 4096; - } + page_size = 4096; } pte = pte & env->a20_mask; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Bg-0001St-23; Sat, 23 Nov 2013 03:47:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Be-0001Sg-PJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:14 +0000 Received: from [193.109.254.147:4571] by server-1.bemta-14.messagelabs.com id 64/11-10312-14520925; Sat, 23 Nov 2013 03:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178432!236266!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7810 invoked from network); 23 Nov 2013 03:47:12 -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; 23 Nov 2013 03:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bb-0006zX-Sm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bb-0003h3-NO for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:11 +0000 Date: Sat, 23 Nov 2013 03:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] adlib: sort offsets in portio 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: multipart/mixed; boundary="===============5500190820684475868==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5500190820684475868== Content-Type: text/plain commit 2ffbe03e8bc8f330581e31537190949a9aba80c3 Author: Hervé Poussineau AuthorDate: Wed Aug 14 11:49:04 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:11:51 2013 -0500 adlib: sort offsets in portio registration This fixes the following assert when -device adlib is used: ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed. Signed-off-by: Hervé Poussineau Signed-off-by: Michael Tokarev (cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca) Signed-off-by: Michael Roth --- hw/audio/adlib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 0421d47..db4a953 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s) } static MemoryRegionPortio adlib_portio_list[] = { - { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, }, { 0, 4, 1, .read = adlib_read, .write = adlib_write, }, { 0, 2, 1, .read = adlib_read, .write = adlib_write, }, + { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, }, PORTIO_END_OF_LIST(), }; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5500190820684475868== 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 --===============5500190820684475868==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:16 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Bg-0001St-23; Sat, 23 Nov 2013 03:47:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Be-0001Sg-PJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:14 +0000 Received: from [193.109.254.147:4571] by server-1.bemta-14.messagelabs.com id 64/11-10312-14520925; Sat, 23 Nov 2013 03:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178432!236266!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7810 invoked from network); 23 Nov 2013 03:47:12 -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; 23 Nov 2013 03:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bb-0006zX-Sm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bb-0003h3-NO for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:11 +0000 Date: Sat, 23 Nov 2013 03:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] adlib: sort offsets in portio 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: multipart/mixed; boundary="===============5500190820684475868==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5500190820684475868== Content-Type: text/plain commit 2ffbe03e8bc8f330581e31537190949a9aba80c3 Author: Hervé Poussineau AuthorDate: Wed Aug 14 11:49:04 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:11:51 2013 -0500 adlib: sort offsets in portio registration This fixes the following assert when -device adlib is used: ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed. Signed-off-by: Hervé Poussineau Signed-off-by: Michael Tokarev (cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca) Signed-off-by: Michael Roth --- hw/audio/adlib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 0421d47..db4a953 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s) } static MemoryRegionPortio adlib_portio_list[] = { - { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, }, { 0, 4, 1, .read = adlib_read, .write = adlib_write, }, { 0, 2, 1, .read = adlib_read, .write = adlib_write, }, + { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, }, PORTIO_END_OF_LIST(), }; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5500190820684475868== 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 --===============5500190820684475868==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Bq-0001UX-4v; Sat, 23 Nov 2013 03:47:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bo-0001UL-LR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:24 +0000 Received: from [85.158.143.35:17009] by server-1.bemta-4.messagelabs.com id 8F/F9-02132-C4520925; Sat, 23 Nov 2013 03:47:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178442!537981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4417 invoked from network); 23 Nov 2013 03:47:23 -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; 23 Nov 2013 03:47:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bm-0006zd-4U for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bm-0003hP-0g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:22 +0000 Date: Sat, 23 Nov 2013 03:47:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: fix writing to MMIO area with non-power-of-two length X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fab8e1fe15014a4bd147eeedd2491bcfbba4e59 Author: Paolo Bonzini AuthorDate: Mon Jul 29 14:27:39 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:12:44 2013 -0500 exec: fix writing to MMIO area with non-power-of-two length The problem is introduced by commit 2332616 (exec: Support 64-bit operations in address_space_rw, 2013-07-08). Before that commit, memory_access_size would only return 1/2/4. Since alignment is already handled above, reduce l to the largest power of two that is smaller than l. Cc: qemu-stable@nongnu.org Reported-by: Oleksii Shevchuk Tested-by: Oleksii Shevchuk Signed-off-by: Paolo Bonzini (cherry picked from commit 098178f2749a63fbbb1a626dcc7d939d5cb2bde7) Signed-off-by: Michael Roth --- exec.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index 3ca9381..394f7e2 100644 --- a/exec.c +++ b/exec.c @@ -1928,6 +1928,9 @@ static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr) if (l > access_size_max) { l = access_size_max; } + if (l & (l - 1)) { + l = 1 << (qemu_fls(l) - 1); + } return l; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:26 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Bq-0001UX-4v; Sat, 23 Nov 2013 03:47:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bo-0001UL-LR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:24 +0000 Received: from [85.158.143.35:17009] by server-1.bemta-4.messagelabs.com id 8F/F9-02132-C4520925; Sat, 23 Nov 2013 03:47:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178442!537981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4417 invoked from network); 23 Nov 2013 03:47:23 -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; 23 Nov 2013 03:47:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bm-0006zd-4U for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bm-0003hP-0g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:22 +0000 Date: Sat, 23 Nov 2013 03:47:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: fix writing to MMIO area with non-power-of-two length X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fab8e1fe15014a4bd147eeedd2491bcfbba4e59 Author: Paolo Bonzini AuthorDate: Mon Jul 29 14:27:39 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:12:44 2013 -0500 exec: fix writing to MMIO area with non-power-of-two length The problem is introduced by commit 2332616 (exec: Support 64-bit operations in address_space_rw, 2013-07-08). Before that commit, memory_access_size would only return 1/2/4. Since alignment is already handled above, reduce l to the largest power of two that is smaller than l. Cc: qemu-stable@nongnu.org Reported-by: Oleksii Shevchuk Tested-by: Oleksii Shevchuk Signed-off-by: Paolo Bonzini (cherry picked from commit 098178f2749a63fbbb1a626dcc7d939d5cb2bde7) Signed-off-by: Michael Roth --- exec.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index 3ca9381..394f7e2 100644 --- a/exec.c +++ b/exec.c @@ -1928,6 +1928,9 @@ static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr) if (l > access_size_max) { l = access_size_max; } + if (l & (l - 1)) { + l = 1 << (qemu_fls(l) - 1); + } return l; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4C0-0001WA-89; Sat, 23 Nov 2013 03:47:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4By-0001Vt-Pb for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:34 +0000 Received: from [85.158.143.35:45530] by server-1.bemta-4.messagelabs.com id 4B/0A-02132-65520925; Sat, 23 Nov 2013 03:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385178452!539873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4458 invoked from network); 23 Nov 2013 03:47:33 -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 Nov 2013 03:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bw-0006zl-Bh for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bw-0003hn-8J for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:32 +0000 Date: Sat, 23 Nov 2013 03:47:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio_pci: fix level interrupts with irqfd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1cd7138d492304a76f3b8ae89fc61e05b18205a7 Author: Michael S. Tsirkin AuthorDate: Sun Sep 1 11:03:45 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 22:16:54 2013 -0500 virtio_pci: fix level interrupts with irqfd commit 62c96360ae7f2c7a8b029277fbb7cb082fdef7fd virtio-pci: fix level interrupts only helps systems without irqfd: on systems with irqfd support we passed in flag requesting irqfd even when msix is disabled. As a result, for level interrupts we didn't install an fd handler so unmasking an fd had no effect. Fix this up. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin (cherry picked from commit 23fe2b3f9e7df8da53ac1bc32c6875254911d7f4) Signed-off-by: Michael Roth --- hw/virtio/virtio-pci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index d37037e..41b96ce 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -799,8 +799,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) break; } - r = virtio_pci_set_guest_notifier(d, n, assign, - kvm_msi_via_irqfd_enabled()); + r = virtio_pci_set_guest_notifier(d, n, assign, with_irqfd); if (r < 0) { goto assign_error; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:36 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4C0-0001WA-89; Sat, 23 Nov 2013 03:47:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4By-0001Vt-Pb for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:34 +0000 Received: from [85.158.143.35:45530] by server-1.bemta-4.messagelabs.com id 4B/0A-02132-65520925; Sat, 23 Nov 2013 03:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385178452!539873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4458 invoked from network); 23 Nov 2013 03:47:33 -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 Nov 2013 03:47:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Bw-0006zl-Bh for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Bw-0003hn-8J for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:32 +0000 Date: Sat, 23 Nov 2013 03:47:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio_pci: fix level interrupts with irqfd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1cd7138d492304a76f3b8ae89fc61e05b18205a7 Author: Michael S. Tsirkin AuthorDate: Sun Sep 1 11:03:45 2013 +0300 Commit: Michael Roth CommitDate: Tue Sep 24 22:16:54 2013 -0500 virtio_pci: fix level interrupts with irqfd commit 62c96360ae7f2c7a8b029277fbb7cb082fdef7fd virtio-pci: fix level interrupts only helps systems without irqfd: on systems with irqfd support we passed in flag requesting irqfd even when msix is disabled. As a result, for level interrupts we didn't install an fd handler so unmasking an fd had no effect. Fix this up. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin (cherry picked from commit 23fe2b3f9e7df8da53ac1bc32c6875254911d7f4) Signed-off-by: Michael Roth --- hw/virtio/virtio-pci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index d37037e..41b96ce 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -799,8 +799,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) break; } - r = virtio_pci_set_guest_notifier(d, n, assign, - kvm_msi_via_irqfd_enabled()); + r = virtio_pci_set_guest_notifier(d, n, assign, with_irqfd); if (r < 0) { goto assign_error; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4CA-0001Xs-Ax; Sat, 23 Nov 2013 03:47:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4C9-0001Xc-Bt for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:45 +0000 Received: from [85.158.137.68:32598] by server-6.bemta-3.messagelabs.com id 1F/CC-04868-06520925; Sat, 23 Nov 2013 03:47:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1385178462!3295118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24290 invoked from network); 23 Nov 2013 03:47:43 -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; 23 Nov 2013 03:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4C6-0006zr-IA for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4C6-0003ii-GG for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:42 +0000 Date: Sat, 23 Nov 2013 03:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: always use MADV_DONTFORK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 57ea2d21ae1863fd4002b2aea8ea8db8e206d464 Author: Andrea Arcangeli AuthorDate: Thu Jul 25 12:11:15 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:19:42 2013 -0500 exec: always use MADV_DONTFORK MADV_DONTFORK prevents fork to fail with -ENOMEM if the default overcommit heuristics decides there's too much anonymous virtual memory allocated. If the KVM secondary MMU is synchronized with MMU notifiers or not, doesn't make a difference in that regard. Secondly it's always more efficient to avoid copying the guest physical address space in the fork child (so we avoid to mark all the guest memory readonly in the parent and so we skip the establishment and teardown of lots of pagetables in the child). In the common case we can ignore the error if MADV_DONTFORK is not available. Leave a second invocation that errors out in the KVM path if MMU notifiers are missing and KVM is enabled, to abort in such case. Signed-off-by: Andrea Arcangeli Tested-By: Benoit Canet Acked-by: Paolo Bonzini Signed-off-by: Gleb Natapov (cherry picked from commit 3e469dbfe413c25d48321c3a19ddfae0727dc6e5) Signed-off-by: Michael Roth --- exec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index 394f7e2..2ea8f04 100644 --- a/exec.c +++ b/exec.c @@ -1172,6 +1172,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, qemu_ram_setup_dump(new_block->host, size); qemu_madvise(new_block->host, size, QEMU_MADV_HUGEPAGE); + qemu_madvise(new_block->host, size, QEMU_MADV_DONTFORK); if (kvm_enabled()) kvm_setup_guest_memory(new_block->host, size); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:46 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4CA-0001Xs-Ax; Sat, 23 Nov 2013 03:47:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4C9-0001Xc-Bt for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:45 +0000 Received: from [85.158.137.68:32598] by server-6.bemta-3.messagelabs.com id 1F/CC-04868-06520925; Sat, 23 Nov 2013 03:47:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1385178462!3295118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24290 invoked from network); 23 Nov 2013 03:47:43 -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; 23 Nov 2013 03:47:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4C6-0006zr-IA for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4C6-0003ii-GG for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:42 +0000 Date: Sat, 23 Nov 2013 03:47:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: always use MADV_DONTFORK X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 57ea2d21ae1863fd4002b2aea8ea8db8e206d464 Author: Andrea Arcangeli AuthorDate: Thu Jul 25 12:11:15 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:19:42 2013 -0500 exec: always use MADV_DONTFORK MADV_DONTFORK prevents fork to fail with -ENOMEM if the default overcommit heuristics decides there's too much anonymous virtual memory allocated. If the KVM secondary MMU is synchronized with MMU notifiers or not, doesn't make a difference in that regard. Secondly it's always more efficient to avoid copying the guest physical address space in the fork child (so we avoid to mark all the guest memory readonly in the parent and so we skip the establishment and teardown of lots of pagetables in the child). In the common case we can ignore the error if MADV_DONTFORK is not available. Leave a second invocation that errors out in the KVM path if MMU notifiers are missing and KVM is enabled, to abort in such case. Signed-off-by: Andrea Arcangeli Tested-By: Benoit Canet Acked-by: Paolo Bonzini Signed-off-by: Gleb Natapov (cherry picked from commit 3e469dbfe413c25d48321c3a19ddfae0727dc6e5) Signed-off-by: Michael Roth --- exec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index 394f7e2..2ea8f04 100644 --- a/exec.c +++ b/exec.c @@ -1172,6 +1172,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, qemu_ram_setup_dump(new_block->host, size); qemu_madvise(new_block->host, size, QEMU_MADV_HUGEPAGE); + qemu_madvise(new_block->host, size, QEMU_MADV_DONTFORK); if (kvm_enabled()) kvm_setup_guest_memory(new_block->host, size); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:47: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 1Vk4CM-0001ZR-F4; Sat, 23 Nov 2013 03:47:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CK-0001ZK-N2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:56 +0000 Received: from [193.109.254.147:58101] by server-6.bemta-14.messagelabs.com id 56/B5-19621-C6520925; Sat, 23 Nov 2013 03:47:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1385178472!238810!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6884 invoked from network); 23 Nov 2013 03:47: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; 23 Nov 2013 03:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CG-000700-OU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4CG-0003j4-MV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:52 +0000 Date: Sat, 23 Nov 2013 03:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: reset port when disabling slot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9dbfbb89b204e098f283aca310e4d6f6651d88f4 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:47:09 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:25:14 2013 -0500 xhci: reset port when disabling slot Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit 5c67dd7b4884979a2613a4702ac1ab68b0e6a16e) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 3c0ba8e..a6f55a1 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2076,6 +2076,7 @@ static TRBCCode xhci_disable_slot(XHCIState *xhci, unsigned int slotid) xhci->slots[slotid-1].enabled = 0; xhci->slots[slotid-1].addressed = 0; + xhci->slots[slotid-1].uport = NULL; return CC_SUCCESS; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:47:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:47: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 1Vk4CM-0001ZR-F4; Sat, 23 Nov 2013 03:47:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CK-0001ZK-N2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:56 +0000 Received: from [193.109.254.147:58101] by server-6.bemta-14.messagelabs.com id 56/B5-19621-C6520925; Sat, 23 Nov 2013 03:47:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1385178472!238810!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6884 invoked from network); 23 Nov 2013 03:47: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; 23 Nov 2013 03:47:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CG-000700-OU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4CG-0003j4-MV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:47:52 +0000 Date: Sat, 23 Nov 2013 03:47:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: reset port when disabling slot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9dbfbb89b204e098f283aca310e4d6f6651d88f4 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:47:09 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:25:14 2013 -0500 xhci: reset port when disabling slot Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit 5c67dd7b4884979a2613a4702ac1ab68b0e6a16e) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 3c0ba8e..a6f55a1 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2076,6 +2076,7 @@ static TRBCCode xhci_disable_slot(XHCIState *xhci, unsigned int slotid) xhci->slots[slotid-1].enabled = 0; xhci->slots[slotid-1].addressed = 0; + xhci->slots[slotid-1].uport = NULL; return CC_SUCCESS; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4CV-0001bI-Jj; Sat, 23 Nov 2013 03:48:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CT-0001ax-Nj for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:05 +0000 Received: from [85.158.137.68:36596] by server-13.bemta-3.messagelabs.com id 4A/AB-28603-47520925; Sat, 23 Nov 2013 03:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1385178483!3274830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10159 invoked from network); 23 Nov 2013 03:48: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; 23 Nov 2013 03:48:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CQ-00070Z-VH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4CQ-0003ja-TU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:02 +0000 Date: Sat, 23 Nov 2013 03:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] usb: parallelize usb3 streams X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96b14d0db19b2b80ab3dc35d522671da82101e72 Author: Gerd Hoffmann AuthorDate: Tue Aug 27 15:25:24 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:28:02 2013 -0500 usb: parallelize usb3 streams usb3 bulk endpoints with streams are implicitly pipelined now, so the requests will actually be processed in parallel. Also allow them to complete out-of-order. Fixes stalls in the uas driver. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit c96c41ed0d38d68a6c8b6f84751afebafeae31be) Signed-off-by: Michael Roth --- hw/usb/core.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 05948ca..31960c2 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -403,7 +403,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) p->ep->halted = false; } - if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) { + if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline || p->stream) { usb_process_one(p); if (p->status == USB_RET_ASYNC) { /* hcd drivers cannot handle async for isoc */ @@ -420,7 +420,8 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) * When pipelining is enabled usb-devices must always return async, * otherwise packets can complete out of order! */ - assert(!p->ep->pipeline || QTAILQ_EMPTY(&p->ep->queue)); + assert(p->stream || !p->ep->pipeline || + QTAILQ_EMPTY(&p->ep->queue)); if (p->status != USB_RET_NAK) { usb_packet_set_state(p, USB_PACKET_COMPLETE); } @@ -434,7 +435,7 @@ void usb_packet_complete_one(USBDevice *dev, USBPacket *p) { USBEndpoint *ep = p->ep; - assert(QTAILQ_FIRST(&ep->queue) == p); + assert(p->stream || QTAILQ_FIRST(&ep->queue) == p); assert(p->status != USB_RET_ASYNC && p->status != USB_RET_NAK); if (p->status != USB_RET_SUCCESS || -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4CV-0001bI-Jj; Sat, 23 Nov 2013 03:48:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CT-0001ax-Nj for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:05 +0000 Received: from [85.158.137.68:36596] by server-13.bemta-3.messagelabs.com id 4A/AB-28603-47520925; Sat, 23 Nov 2013 03:48:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1385178483!3274830!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10159 invoked from network); 23 Nov 2013 03:48: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; 23 Nov 2013 03:48:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4CQ-00070Z-VH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4CQ-0003ja-TU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:02 +0000 Date: Sat, 23 Nov 2013 03:48:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] usb: parallelize usb3 streams X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96b14d0db19b2b80ab3dc35d522671da82101e72 Author: Gerd Hoffmann AuthorDate: Tue Aug 27 15:25:24 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:28:02 2013 -0500 usb: parallelize usb3 streams usb3 bulk endpoints with streams are implicitly pipelined now, so the requests will actually be processed in parallel. Also allow them to complete out-of-order. Fixes stalls in the uas driver. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit c96c41ed0d38d68a6c8b6f84751afebafeae31be) Signed-off-by: Michael Roth --- hw/usb/core.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 05948ca..31960c2 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -403,7 +403,7 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) p->ep->halted = false; } - if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline) { + if (QTAILQ_EMPTY(&p->ep->queue) || p->ep->pipeline || p->stream) { usb_process_one(p); if (p->status == USB_RET_ASYNC) { /* hcd drivers cannot handle async for isoc */ @@ -420,7 +420,8 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) * When pipelining is enabled usb-devices must always return async, * otherwise packets can complete out of order! */ - assert(!p->ep->pipeline || QTAILQ_EMPTY(&p->ep->queue)); + assert(p->stream || !p->ep->pipeline || + QTAILQ_EMPTY(&p->ep->queue)); if (p->status != USB_RET_NAK) { usb_packet_set_state(p, USB_PACKET_COMPLETE); } @@ -434,7 +435,7 @@ void usb_packet_complete_one(USBDevice *dev, USBPacket *p) { USBEndpoint *ep = p->ep; - assert(QTAILQ_FIRST(&ep->queue) == p); + assert(p->stream || QTAILQ_FIRST(&ep->queue) == p); assert(p->status != USB_RET_ASYNC && p->status != USB_RET_NAK); if (p->status != USB_RET_SUCCESS || -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4Cf-0001ch-Pn; Sat, 23 Nov 2013 03:48:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cd-0001cS-VK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:16 +0000 Received: from [85.158.137.68:33202] by server-14.bemta-3.messagelabs.com id C9/3A-06105-F7520925; Sat, 23 Nov 2013 03:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178493!3251486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25208 invoked from network); 23 Nov 2013 03:48:14 -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; 23 Nov 2013 03:48:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cb-00070f-55 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cb-0003jy-2P for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:13 +0000 Date: Sat, 23 Nov 2013 03:48:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] w32: Fix access to host devices (regression) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8601a4e3102321d054ce3d641c03ebcd0519357 Author: Stefan Weil AuthorDate: Sun Sep 1 22:59:25 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:30:07 2013 -0500 w32: Fix access to host devices (regression) QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). Those devices use hdev_open which did not use the latest API for options. This resulted in a fatal runtime error: Block protocol 'host_device' doesn't support the option 'filename' Duplicate code from raw_open to fix this. Cc: qemu-stable@nongnu.org Reported-by: David Brenner Signed-off-by: Stefan Weil Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi (cherry picked from commit 68dc036488dfea170627a55e6ee3dfd7f2c2063e) Signed-off-by: Michael Roth --- block/raw-win32.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/block/raw-win32.c b/block/raw-win32.c index 9b5b2af..d2d2d9f 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -535,13 +535,29 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int access_flags, create_flags; + int ret = 0; DWORD overlapped; char device_name[64]; - const char *filename = qdict_get_str(options, "filename"); + + Error *local_err = NULL; + const char *filename; + + QemuOpts *opts = qemu_opts_create_nofail(&raw_runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto done; + } + + filename = qemu_opt_get(opts, "filename"); if (strstart(filename, "/dev/cdrom", NULL)) { - if (find_cdrom(device_name, sizeof(device_name)) < 0) - return -ENOENT; + if (find_cdrom(device_name, sizeof(device_name)) < 0) { + ret = -ENOENT; + goto done; + } filename = device_name; } else { /* transform drive letters into device name */ @@ -564,11 +580,17 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) if (s->hfile == INVALID_HANDLE_VALUE) { int err = GetLastError(); - if (err == ERROR_ACCESS_DENIED) - return -EACCES; - return -1; + if (err == ERROR_ACCESS_DENIED) { + ret = -EACCES; + } else { + ret = -1; + } + goto done; } - return 0; + +done: + qemu_opts_del(opts); + return ret; } static BlockDriver bdrv_host_device = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4Cf-0001ch-Pn; Sat, 23 Nov 2013 03:48:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cd-0001cS-VK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:16 +0000 Received: from [85.158.137.68:33202] by server-14.bemta-3.messagelabs.com id C9/3A-06105-F7520925; Sat, 23 Nov 2013 03:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178493!3251486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25208 invoked from network); 23 Nov 2013 03:48:14 -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; 23 Nov 2013 03:48:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cb-00070f-55 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cb-0003jy-2P for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:13 +0000 Date: Sat, 23 Nov 2013 03:48:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] w32: Fix access to host devices (regression) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8601a4e3102321d054ce3d641c03ebcd0519357 Author: Stefan Weil AuthorDate: Sun Sep 1 22:59:25 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:30:07 2013 -0500 w32: Fix access to host devices (regression) QEMU failed to open host devices like \\.\PhysicalDrive0 (first hard disk) since some time (commit 8a79380b8ef1b02d2abd705dd026a18863b09020?). Those devices use hdev_open which did not use the latest API for options. This resulted in a fatal runtime error: Block protocol 'host_device' doesn't support the option 'filename' Duplicate code from raw_open to fix this. Cc: qemu-stable@nongnu.org Reported-by: David Brenner Signed-off-by: Stefan Weil Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi (cherry picked from commit 68dc036488dfea170627a55e6ee3dfd7f2c2063e) Signed-off-by: Michael Roth --- block/raw-win32.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/block/raw-win32.c b/block/raw-win32.c index 9b5b2af..d2d2d9f 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -535,13 +535,29 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) { BDRVRawState *s = bs->opaque; int access_flags, create_flags; + int ret = 0; DWORD overlapped; char device_name[64]; - const char *filename = qdict_get_str(options, "filename"); + + Error *local_err = NULL; + const char *filename; + + QemuOpts *opts = qemu_opts_create_nofail(&raw_runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto done; + } + + filename = qemu_opt_get(opts, "filename"); if (strstart(filename, "/dev/cdrom", NULL)) { - if (find_cdrom(device_name, sizeof(device_name)) < 0) - return -ENOENT; + if (find_cdrom(device_name, sizeof(device_name)) < 0) { + ret = -ENOENT; + goto done; + } filename = device_name; } else { /* transform drive letters into device name */ @@ -564,11 +580,17 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags) if (s->hfile == INVALID_HANDLE_VALUE) { int err = GetLastError(); - if (err == ERROR_ACCESS_DENIED) - return -EACCES; - return -1; + if (err == ERROR_ACCESS_DENIED) { + ret = -EACCES; + } else { + ret = -1; + } + goto done; } - return 0; + +done: + qemu_opts_del(opts); + return ret; } static BlockDriver bdrv_host_device = { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4Cp-0001fx-Tp; Sat, 23 Nov 2013 03:48:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cn-0001fS-Sq for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:26 +0000 Received: from [85.158.143.35:50690] by server-2.bemta-4.messagelabs.com id FF/20-11386-98520925; Sat, 23 Nov 2013 03:48:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178503!538044!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5454 invoked from network); 23 Nov 2013 03:48:24 -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; 23 Nov 2013 03:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cl-00070l-E6 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cl-0003kK-9N for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:23 +0000 Date: Sat, 23 Nov 2013 03:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] memory: Provide separate handling of unassigned io ports accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ab1044eb1ac2cbc7e65769edf44ced92b85b038 Author: Jan Kiszka AuthorDate: Mon Sep 2 18:43:30 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:31:12 2013 -0500 memory: Provide separate handling of unassigned io ports accesses Accesses to unassigned io ports shall return -1 on read and be ignored on write. Ensure these properties via dedicated ops, decoupling us from the memory core's handling of unassigned accesses. Cc: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 3bb28b7208b349e7a1b326e3c6ef9efac1d462bf) Signed-off-by: Michael Roth --- exec.c | 3 ++- include/exec/ioport.h | 4 ++++ ioport.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 2ea8f04..08eecb3 100644 --- a/exec.c +++ b/exec.c @@ -1821,7 +1821,8 @@ static void memory_map_init(void) address_space_init(&address_space_memory, system_memory, "memory"); system_io = g_malloc(sizeof(*system_io)); - memory_region_init(system_io, NULL, "io", 65536); + memory_region_init_io(system_io, NULL, &unassigned_io_ops, NULL, "io", + 65536); address_space_init(&address_space_io, system_io, "I/O"); memory_listener_register(&core_memory_listener, &address_space_memory); diff --git a/include/exec/ioport.h b/include/exec/ioport.h index bdd4e96..b3848be 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -45,6 +45,10 @@ typedef struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } +#ifndef CONFIG_USER_ONLY +extern const MemoryRegionOps unassigned_io_ops; +#endif + void cpu_outb(pio_addr_t addr, uint8_t val); void cpu_outw(pio_addr_t addr, uint16_t val); void cpu_outl(pio_addr_t addr, uint32_t val); diff --git a/ioport.c b/ioport.c index 79b7f1a..707cce8 100644 --- a/ioport.c +++ b/ioport.c @@ -44,6 +44,22 @@ typedef struct MemoryRegionPortioList { MemoryRegionPortio ports[]; } MemoryRegionPortioList; +static uint64_t unassigned_io_read(void *opaque, hwaddr addr, unsigned size) +{ + return -1ULL; +} + +static void unassigned_io_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ +} + +const MemoryRegionOps unassigned_io_ops = { + .read = unassigned_io_read, + .write = unassigned_io_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + void cpu_outb(pio_addr_t addr, uint8_t val) { LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:27 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4Cp-0001fx-Tp; Sat, 23 Nov 2013 03:48:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cn-0001fS-Sq for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:26 +0000 Received: from [85.158.143.35:50690] by server-2.bemta-4.messagelabs.com id FF/20-11386-98520925; Sat, 23 Nov 2013 03:48:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178503!538044!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5454 invoked from network); 23 Nov 2013 03:48:24 -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; 23 Nov 2013 03:48:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cl-00070l-E6 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cl-0003kK-9N for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:23 +0000 Date: Sat, 23 Nov 2013 03:48:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] memory: Provide separate handling of unassigned io ports accesses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ab1044eb1ac2cbc7e65769edf44ced92b85b038 Author: Jan Kiszka AuthorDate: Mon Sep 2 18:43:30 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:31:12 2013 -0500 memory: Provide separate handling of unassigned io ports accesses Accesses to unassigned io ports shall return -1 on read and be ignored on write. Ensure these properties via dedicated ops, decoupling us from the memory core's handling of unassigned accesses. Cc: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 3bb28b7208b349e7a1b326e3c6ef9efac1d462bf) Signed-off-by: Michael Roth --- exec.c | 3 ++- include/exec/ioport.h | 4 ++++ ioport.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 2ea8f04..08eecb3 100644 --- a/exec.c +++ b/exec.c @@ -1821,7 +1821,8 @@ static void memory_map_init(void) address_space_init(&address_space_memory, system_memory, "memory"); system_io = g_malloc(sizeof(*system_io)); - memory_region_init(system_io, NULL, "io", 65536); + memory_region_init_io(system_io, NULL, &unassigned_io_ops, NULL, "io", + 65536); address_space_init(&address_space_io, system_io, "I/O"); memory_listener_register(&core_memory_listener, &address_space_memory); diff --git a/include/exec/ioport.h b/include/exec/ioport.h index bdd4e96..b3848be 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -45,6 +45,10 @@ typedef struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } +#ifndef CONFIG_USER_ONLY +extern const MemoryRegionOps unassigned_io_ops; +#endif + void cpu_outb(pio_addr_t addr, uint8_t val); void cpu_outw(pio_addr_t addr, uint16_t val); void cpu_outl(pio_addr_t addr, uint32_t val); diff --git a/ioport.c b/ioport.c index 79b7f1a..707cce8 100644 --- a/ioport.c +++ b/ioport.c @@ -44,6 +44,22 @@ typedef struct MemoryRegionPortioList { MemoryRegionPortio ports[]; } MemoryRegionPortioList; +static uint64_t unassigned_io_read(void *opaque, hwaddr addr, unsigned size) +{ + return -1ULL; +} + +static void unassigned_io_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ +} + +const MemoryRegionOps unassigned_io_ops = { + .read = unassigned_io_read, + .write = unassigned_io_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + void cpu_outb(pio_addr_t addr, uint8_t val) { LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Cz-0001j6-0Q; Sat, 23 Nov 2013 03:48:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cy-0001iq-3f for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:36 +0000 Received: from [193.109.254.147:6060] by server-5.bemta-14.messagelabs.com id B4/2F-13525-39520925; Sat, 23 Nov 2013 03:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178513!235888!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17923 invoked from network); 23 Nov 2013 03:48:34 -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 Nov 2013 03:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cv-00070t-Nl for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cv-0003kl-LX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:33 +0000 Date: Sat, 23 Nov 2013 03:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "memory: Return -1 again on reads from unsigned 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 2a93d3dd32386c3522cfa2ee60c9e06a298d1f52 Author: Jan Kiszka AuthorDate: Mon Sep 2 18:43:31 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:31:53 2013 -0500 Revert "memory: Return -1 again on reads from unsigned regions" This reverts commit 9b8c69243585a32d14b9bb9fcd52c37b0b5a1b71. The commit was wrong: We only return -1 on invalid accesses, not on valid but unbacked ones. This broke various corner cases. Cc: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 68a7439a150d6b4da99082ab454b9328b151bc25) Signed-off-by: Michael Roth --- memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/memory.c b/memory.c index 886f838..5a10fd0 100644 --- a/memory.c +++ b/memory.c @@ -872,7 +872,7 @@ static uint64_t unassigned_mem_read(void *opaque, hwaddr addr, if (current_cpu != NULL) { cpu_unassigned_access(current_cpu, addr, false, false, 0, size); } - return -1ULL; + return 0; } static void unassigned_mem_write(void *opaque, hwaddr addr, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Cz-0001j6-0Q; Sat, 23 Nov 2013 03:48:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cy-0001iq-3f for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:36 +0000 Received: from [193.109.254.147:6060] by server-5.bemta-14.messagelabs.com id B4/2F-13525-39520925; Sat, 23 Nov 2013 03:48:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178513!235888!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17923 invoked from network); 23 Nov 2013 03:48:34 -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 Nov 2013 03:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Cv-00070t-Nl for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Cv-0003kl-LX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:33 +0000 Date: Sat, 23 Nov 2013 03:48:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Revert "memory: Return -1 again on reads from unsigned 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 2a93d3dd32386c3522cfa2ee60c9e06a298d1f52 Author: Jan Kiszka AuthorDate: Mon Sep 2 18:43:31 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:31:53 2013 -0500 Revert "memory: Return -1 again on reads from unsigned regions" This reverts commit 9b8c69243585a32d14b9bb9fcd52c37b0b5a1b71. The commit was wrong: We only return -1 on invalid accesses, not on valid but unbacked ones. This broke various corner cases. Cc: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 68a7439a150d6b4da99082ab454b9328b151bc25) Signed-off-by: Michael Roth --- memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/memory.c b/memory.c index 886f838..5a10fd0 100644 --- a/memory.c +++ b/memory.c @@ -872,7 +872,7 @@ static uint64_t unassigned_mem_read(void *opaque, hwaddr addr, if (current_cpu != NULL) { cpu_unassigned_access(current_cpu, addr, false, false, 0, size); } - return -1ULL; + return 0; } static void unassigned_mem_write(void *opaque, hwaddr addr, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4DA-0001sl-4A; Sat, 23 Nov 2013 03:48:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4D8-0001r0-Iw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:46 +0000 Received: from [85.158.139.211:25638] by server-13.bemta-5.messagelabs.com id 96/2B-11357-D9520925; Sat, 23 Nov 2013 03:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1385178524!3725652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22099 invoked from network); 23 Nov 2013 03:48:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:48:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4D5-00070z-V0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4D5-0003lt-Sc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:43 +0000 Date: Sat, 23 Nov 2013 03:48:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: check offset_within_address_space for register subpage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5288711776828211964==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5288711776828211964== Content-Type: text/plain commit 1110014801d368388bca2ed7c28aa695560c4991 Author: Hu Tao AuthorDate: Thu Aug 29 18:21:16 2013 +0800 Commit: Michael Roth CommitDate: Tue Sep 24 22:37:49 2013 -0500 exec: check offset_within_address_space for register subpage If offset_within_address_space falls in a page, then we register a subpage. So check offset_within_address_space rather than offset_within_region. Cc: qemu-stable@nongnu.org Cc: Paolo Bonzini Cc: Richard Henderson Cc: "Andreas Färber" Cc: Peter Maydell Cc: Blue Swirl Signed-off-by: Hu Tao Signed-off-by: Paolo Bonzini (cherry picked from commit 88266249701032211c1d7449460d063fbc01bf12) Signed-off-by: Michael Roth --- exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 08eecb3..f6674e5 100644 --- a/exec.c +++ b/exec.c @@ -869,7 +869,7 @@ static void mem_add(MemoryListener *listener, MemoryRegionSection *section) now = remain; if (int128_lt(remain.size, page_size)) { register_subpage(d, &now); - } else if (remain.offset_within_region & ~TARGET_PAGE_MASK) { + } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) { now.size = page_size; register_subpage(d, &now); } else { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5288711776828211964== 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 --===============5288711776828211964==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4DA-0001sl-4A; Sat, 23 Nov 2013 03:48:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4D8-0001r0-Iw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:46 +0000 Received: from [85.158.139.211:25638] by server-13.bemta-5.messagelabs.com id 96/2B-11357-D9520925; Sat, 23 Nov 2013 03:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1385178524!3725652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22099 invoked from network); 23 Nov 2013 03:48:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:48:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4D5-00070z-V0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4D5-0003lt-Sc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:43 +0000 Date: Sat, 23 Nov 2013 03:48:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] exec: check offset_within_address_space for register subpage X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5288711776828211964==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5288711776828211964== Content-Type: text/plain commit 1110014801d368388bca2ed7c28aa695560c4991 Author: Hu Tao AuthorDate: Thu Aug 29 18:21:16 2013 +0800 Commit: Michael Roth CommitDate: Tue Sep 24 22:37:49 2013 -0500 exec: check offset_within_address_space for register subpage If offset_within_address_space falls in a page, then we register a subpage. So check offset_within_address_space rather than offset_within_region. Cc: qemu-stable@nongnu.org Cc: Paolo Bonzini Cc: Richard Henderson Cc: "Andreas Färber" Cc: Peter Maydell Cc: Blue Swirl Signed-off-by: Hu Tao Signed-off-by: Paolo Bonzini (cherry picked from commit 88266249701032211c1d7449460d063fbc01bf12) Signed-off-by: Michael Roth --- exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 08eecb3..f6674e5 100644 --- a/exec.c +++ b/exec.c @@ -869,7 +869,7 @@ static void mem_add(MemoryListener *listener, MemoryRegionSection *section) now = remain; if (int128_lt(remain.size, page_size)) { register_subpage(d, &now); - } else if (remain.offset_within_region & ~TARGET_PAGE_MASK) { + } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) { now.size = page_size; register_subpage(d, &now); } else { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5288711776828211964== 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 --===============5288711776828211964==-- From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4DJ-0001xL-7H; Sat, 23 Nov 2013 03:48:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DI-0001wr-JN for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:56 +0000 Received: from [193.109.254.147:59081] by server-5.bemta-14.messagelabs.com id 09/3F-13525-7A520925; Sat, 23 Nov 2013 03:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178534!236373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12163 invoked from network); 23 Nov 2013 03:48:55 -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; 23 Nov 2013 03:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DG-000718-59 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4DG-0003mF-2v for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:54 +0000 Date: Sat, 23 Nov 2013 03:48:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ne2000: mark I/O as LITTLE_ENDIAN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1991d05d37ac9054d772b32d8fac70bc31be81a Author: Aurelien Jarno AuthorDate: Mon Sep 2 13:10:34 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:40:40 2013 -0500 ne2000: mark I/O as LITTLE_ENDIAN Now that the memory subsystem is propagating the endianness correctly, the ne2000 device should have its I/O ports marked as LITTLE_ENDIAN, as PCI devices are little endian. This makes the ne2000 NIC to work again on PowerPC. Cc: qemu-stable@nongnu.org Cc: Stefan Hajnoczi Signed-off-by: Aurelien Jarno Signed-off-by: Stefan Hajnoczi (cherry picked from commit 45d883dcf208160e2db308d1b368beb74f37dc7e) Signed-off-by: Michael Roth --- hw/net/ne2000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 31afd28..c961258 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -693,7 +693,7 @@ static void ne2000_write(void *opaque, hwaddr addr, static const MemoryRegionOps ne2000_ops = { .read = ne2000_read, .write = ne2000_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; /***********************************************************/ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:48:57 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:48: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 1Vk4DJ-0001xL-7H; Sat, 23 Nov 2013 03:48:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DI-0001wr-JN for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:56 +0000 Received: from [193.109.254.147:59081] by server-5.bemta-14.messagelabs.com id 09/3F-13525-7A520925; Sat, 23 Nov 2013 03:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178534!236373!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12163 invoked from network); 23 Nov 2013 03:48:55 -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; 23 Nov 2013 03:48:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DG-000718-59 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4DG-0003mF-2v for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:48:54 +0000 Date: Sat, 23 Nov 2013 03:48:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ne2000: mark I/O as LITTLE_ENDIAN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1991d05d37ac9054d772b32d8fac70bc31be81a Author: Aurelien Jarno AuthorDate: Mon Sep 2 13:10:34 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:40:40 2013 -0500 ne2000: mark I/O as LITTLE_ENDIAN Now that the memory subsystem is propagating the endianness correctly, the ne2000 device should have its I/O ports marked as LITTLE_ENDIAN, as PCI devices are little endian. This makes the ne2000 NIC to work again on PowerPC. Cc: qemu-stable@nongnu.org Cc: Stefan Hajnoczi Signed-off-by: Aurelien Jarno Signed-off-by: Stefan Hajnoczi (cherry picked from commit 45d883dcf208160e2db308d1b368beb74f37dc7e) Signed-off-by: Michael Roth --- hw/net/ne2000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 31afd28..c961258 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -693,7 +693,7 @@ static void ne2000_write(void *opaque, hwaddr addr, static const MemoryRegionOps ne2000_ops = { .read = ne2000_read, .write = ne2000_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; /***********************************************************/ -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4DU-00021Z-AV; Sat, 23 Nov 2013 03:49:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DT-00021J-2A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:07 +0000 Received: from [85.158.143.35:19260] by server-3.bemta-4.messagelabs.com id EA/A0-32360-2B520925; Sat, 23 Nov 2013 03:49:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178544!538087!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8466 invoked from network); 23 Nov 2013 03:49: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; 23 Nov 2013 03:49:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DQ-00071h-BY for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4DQ-0003mm-9G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:04 +0000 Date: Sat, 23 Nov 2013 03:49:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ehci: save device pointer in EHCIState X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6d163fdd8131285a01fe46e6afdba727e4df9ca Author: Gerd Hoffmann AuthorDate: Mon Sep 9 10:18:17 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:45:32 2013 -0500 ehci: save device pointer in EHCIState We'll need a pointer to the actual pci/sysbus device, stick a pointer to it into the EHCIState struct. https://bugzilla.redhat.com/show_bug.cgi?id=1005495 Signed-off-by: Gerd Hoffmann (cherry picked from commit adbecc89731cf3e0ae656d50ea9fa58c589c4bdc) Signed-off-by: Michael Roth --- hw/usb/hcd-ehci.c | 7 +++---- hw/usb/hcd-ehci.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 010a0d0..e9fb20c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1241,13 +1241,11 @@ static int ehci_init_transfer(EHCIPacket *p) { uint32_t cpage, offset, bytes, plen; dma_addr_t page; - USBBus *bus = &p->queue->ehci->bus; - BusState *qbus = BUS(bus); cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE); bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES); offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK; - qemu_sglist_init(&p->sgl, qbus->parent, 5, p->queue->ehci->as); + qemu_sglist_init(&p->sgl, p->queue->ehci->device, 5, p->queue->ehci->as); while (bytes > 0) { if (cpage > 4) { @@ -1486,7 +1484,7 @@ static int ehci_process_itd(EHCIState *ehci, return -1; } - qemu_sglist_init(&ehci->isgl, DEVICE(ehci), 2, ehci->as); + qemu_sglist_init(&ehci->isgl, ehci->device, 2, ehci->as); if (off + len > 4096) { /* transfer crosses page border */ uint32_t len2 = off + len - 4096; @@ -2529,6 +2527,7 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s); s->async_bh = qemu_bh_new(ehci_frame_timer, s); + s->device = dev; qemu_register_reset(ehci_reset, s); qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s); diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 15a28e8..065c9fa 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -255,6 +255,7 @@ typedef QTAILQ_HEAD(EHCIQueueHead, EHCIQueue) EHCIQueueHead; struct EHCIState { USBBus bus; + DeviceState *device; qemu_irq irq; MemoryRegion mem; AddressSpace *as; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4DU-00021Z-AV; Sat, 23 Nov 2013 03:49:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DT-00021J-2A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:07 +0000 Received: from [85.158.143.35:19260] by server-3.bemta-4.messagelabs.com id EA/A0-32360-2B520925; Sat, 23 Nov 2013 03:49:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178544!538087!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8466 invoked from network); 23 Nov 2013 03:49: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; 23 Nov 2013 03:49:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4DQ-00071h-BY for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4DQ-0003mm-9G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:04 +0000 Date: Sat, 23 Nov 2013 03:49:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ehci: save device pointer in EHCIState X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6d163fdd8131285a01fe46e6afdba727e4df9ca Author: Gerd Hoffmann AuthorDate: Mon Sep 9 10:18:17 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:45:32 2013 -0500 ehci: save device pointer in EHCIState We'll need a pointer to the actual pci/sysbus device, stick a pointer to it into the EHCIState struct. https://bugzilla.redhat.com/show_bug.cgi?id=1005495 Signed-off-by: Gerd Hoffmann (cherry picked from commit adbecc89731cf3e0ae656d50ea9fa58c589c4bdc) Signed-off-by: Michael Roth --- hw/usb/hcd-ehci.c | 7 +++---- hw/usb/hcd-ehci.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 010a0d0..e9fb20c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1241,13 +1241,11 @@ static int ehci_init_transfer(EHCIPacket *p) { uint32_t cpage, offset, bytes, plen; dma_addr_t page; - USBBus *bus = &p->queue->ehci->bus; - BusState *qbus = BUS(bus); cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE); bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES); offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK; - qemu_sglist_init(&p->sgl, qbus->parent, 5, p->queue->ehci->as); + qemu_sglist_init(&p->sgl, p->queue->ehci->device, 5, p->queue->ehci->as); while (bytes > 0) { if (cpage > 4) { @@ -1486,7 +1484,7 @@ static int ehci_process_itd(EHCIState *ehci, return -1; } - qemu_sglist_init(&ehci->isgl, DEVICE(ehci), 2, ehci->as); + qemu_sglist_init(&ehci->isgl, ehci->device, 2, ehci->as); if (off + len > 4096) { /* transfer crosses page border */ uint32_t len2 = off + len - 4096; @@ -2529,6 +2527,7 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) s->frame_timer = qemu_new_timer_ns(vm_clock, ehci_frame_timer, s); s->async_bh = qemu_bh_new(ehci_frame_timer, s); + s->device = dev; qemu_register_reset(ehci_reset, s); qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s); diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 15a28e8..065c9fa 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -255,6 +255,7 @@ typedef QTAILQ_HEAD(EHCIQueueHead, EHCIQueue) EHCIQueueHead; struct EHCIState { USBBus bus; + DeviceState *device; qemu_irq irq; MemoryRegion mem; AddressSpace *as; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4De-000235-DU; Sat, 23 Nov 2013 03:49:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dd-00022t-1X for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:17 +0000 Received: from [85.158.143.35:19469] by server-2.bemta-4.messagelabs.com id 8A/50-11386-CB520925; Sat, 23 Nov 2013 03:49:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385178554!539986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8105 invoked from network); 23 Nov 2013 03:49:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:49:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Da-00071n-HV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Da-0003nA-FR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:14 +0000 Date: Sat, 23 Nov 2013 03:49:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qxl: fix local renderer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc0973b5883df7d822b285119691ade8c84dda9c Author: Gerd Hoffmann AuthorDate: Thu Sep 5 21:57:19 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:46:18 2013 -0500 qxl: fix local renderer The local spice renderer assumes the primary surface is located at the start of the "ram" bar. This used to be a requirement in qxl hardware revision 1. In revision 2+ this is relaxed. Nevertheless guest drivers continued to use the traditional location, for historical and backward compatibility reasons. The qxl kms driver doesn't though as it depends on qxl revision 4+ anyway. Result is that local rendering is hosed for recent linux guests, you'll get pixel garbage with non-spice ui (gtk, sdl, vnc) and when doing screendumps. Fix that by doing a proper mapping of the guest-specified memory location. https://bugzilla.redhat.com/show_bug.cgi?id=948717 Signed-off-by: Gerd Hoffmann (cherry picked from commit c58c7b959b93b864a27fd6b3646ee1465ab8832b) Signed-off-by: Michael Roth --- hw/display/qxl-render.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 269b1a7..d34b0c4 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -31,10 +31,6 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) if (is_buffer_shared(surface)) { return; } - if (!qxl->guest_primary.data) { - trace_qxl_render_blit_guest_primary_initialized(); - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); - } trace_qxl_render_blit(qxl->guest_primary.qxl_stride, rect->left, rect->right, rect->top, rect->bottom); src = qxl->guest_primary.data; @@ -104,7 +100,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) if (qxl->guest_primary.resized) { qxl->guest_primary.resized = 0; - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); + qxl->guest_primary.data = qxl_phys2virt(qxl, + qxl->guest_primary.surface.mem, + MEMSLOT_GROUP_GUEST); + if (!qxl->guest_primary.data) { + return; + } qxl_set_rect_to_surface(qxl, &qxl->dirty[0]); qxl->num_dirty_rects = 1; trace_qxl_render_guest_primary_resized( @@ -128,6 +129,10 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) } dpy_gfx_replace_surface(vga->con, surface); } + + if (!qxl->guest_primary.data) { + return; + } for (i = 0; i < qxl->num_dirty_rects; i++) { if (qemu_spice_rect_is_empty(qxl->dirty+i)) { break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4De-000235-DU; Sat, 23 Nov 2013 03:49:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dd-00022t-1X for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:17 +0000 Received: from [85.158.143.35:19469] by server-2.bemta-4.messagelabs.com id 8A/50-11386-CB520925; Sat, 23 Nov 2013 03:49:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385178554!539986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8105 invoked from network); 23 Nov 2013 03:49:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:49:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Da-00071n-HV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Da-0003nA-FR for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:14 +0000 Date: Sat, 23 Nov 2013 03:49:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qxl: fix local renderer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc0973b5883df7d822b285119691ade8c84dda9c Author: Gerd Hoffmann AuthorDate: Thu Sep 5 21:57:19 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:46:18 2013 -0500 qxl: fix local renderer The local spice renderer assumes the primary surface is located at the start of the "ram" bar. This used to be a requirement in qxl hardware revision 1. In revision 2+ this is relaxed. Nevertheless guest drivers continued to use the traditional location, for historical and backward compatibility reasons. The qxl kms driver doesn't though as it depends on qxl revision 4+ anyway. Result is that local rendering is hosed for recent linux guests, you'll get pixel garbage with non-spice ui (gtk, sdl, vnc) and when doing screendumps. Fix that by doing a proper mapping of the guest-specified memory location. https://bugzilla.redhat.com/show_bug.cgi?id=948717 Signed-off-by: Gerd Hoffmann (cherry picked from commit c58c7b959b93b864a27fd6b3646ee1465ab8832b) Signed-off-by: Michael Roth --- hw/display/qxl-render.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 269b1a7..d34b0c4 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -31,10 +31,6 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) if (is_buffer_shared(surface)) { return; } - if (!qxl->guest_primary.data) { - trace_qxl_render_blit_guest_primary_initialized(); - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); - } trace_qxl_render_blit(qxl->guest_primary.qxl_stride, rect->left, rect->right, rect->top, rect->bottom); src = qxl->guest_primary.data; @@ -104,7 +100,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) if (qxl->guest_primary.resized) { qxl->guest_primary.resized = 0; - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); + qxl->guest_primary.data = qxl_phys2virt(qxl, + qxl->guest_primary.surface.mem, + MEMSLOT_GROUP_GUEST); + if (!qxl->guest_primary.data) { + return; + } qxl_set_rect_to_surface(qxl, &qxl->dirty[0]); qxl->num_dirty_rects = 1; trace_qxl_render_guest_primary_resized( @@ -128,6 +129,10 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) } dpy_gfx_replace_surface(vga->con, surface); } + + if (!qxl->guest_primary.data) { + return; + } for (i = 0; i < qxl->num_dirty_rects; i++) { if (qemu_spice_rect_is_empty(qxl->dirty+i)) { break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4Do-00025R-JY; Sat, 23 Nov 2013 03:49:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dn-00024b-CK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:27 +0000 Received: from [85.158.143.35:55839] by server-3.bemta-4.messagelabs.com id 58/B0-32360-6C520925; Sat, 23 Nov 2013 03:49:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178564!538108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9643 invoked from network); 23 Nov 2013 03:49: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; 23 Nov 2013 03:49:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dk-00071t-Pz for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Dk-0003nW-LK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:24 +0000 Date: Sat, 23 Nov 2013 03:49:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: Initializing ram_memory under Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755ec4ca0f92188458ad7ca549a75161cbdcf6ff Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:52 2013 +0000 Commit: Michael Roth CommitDate: Tue Sep 24 22:47:03 2013 -0500 pc: Initializing ram_memory under Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin CC: qemu-stable@nongnu.org (cherry picked from commit 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d) Signed-off-by: Michael Roth --- hw/i386/pc_piix.c | 2 +- include/hw/xen/xen.h | 4 +--- xen-all.c | 7 ++++--- xen-stub.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6e1e654..3df2ff9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init() != 0) { + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); exit(1); } diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6d42dd1..e1f88bf 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); -int xen_hvm_init(void); +int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -struct MemoryRegion; void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif -struct MemoryRegion; void xen_register_framebuffer(struct MemoryRegion *mr); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 diff --git a/xen-all.c b/xen-all.c index 21246e0..e1d0694 100644 --- a/xen-all.c +++ b/xen-all.c @@ -154,7 +154,7 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size) +static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; @@ -168,6 +168,7 @@ static void xen_ram_init(ram_addr_t ram_size) block_len += HVM_BELOW_4G_MMIO_LENGTH; } memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { @@ -1059,7 +1060,7 @@ static void xen_read_physmap(XenIOState *state) free(entries); } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1134,7 +1135,7 @@ int xen_hvm_init(void) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size); + xen_ram_init(ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); diff --git a/xen-stub.c b/xen-stub.c index 47c8e73..ad189a6 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -64,7 +64,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { return 0; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4Do-00025R-JY; Sat, 23 Nov 2013 03:49:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dn-00024b-CK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:27 +0000 Received: from [85.158.143.35:55839] by server-3.bemta-4.messagelabs.com id 58/B0-32360-6C520925; Sat, 23 Nov 2013 03:49:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178564!538108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9643 invoked from network); 23 Nov 2013 03:49: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; 23 Nov 2013 03:49:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dk-00071t-Pz for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Dk-0003nW-LK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:24 +0000 Date: Sat, 23 Nov 2013 03:49:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: Initializing ram_memory under Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 755ec4ca0f92188458ad7ca549a75161cbdcf6ff Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:52 2013 +0000 Commit: Michael Roth CommitDate: Tue Sep 24 22:47:03 2013 -0500 pc: Initializing ram_memory under Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin CC: qemu-stable@nongnu.org (cherry picked from commit 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d) Signed-off-by: Michael Roth --- hw/i386/pc_piix.c | 2 +- include/hw/xen/xen.h | 4 +--- xen-all.c | 7 ++++--- xen-stub.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6e1e654..3df2ff9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init() != 0) { + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); exit(1); } diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6d42dd1..e1f88bf 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(void); -int xen_hvm_init(void); +int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) -struct MemoryRegion; void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); #endif -struct MemoryRegion; void xen_register_framebuffer(struct MemoryRegion *mr); #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 diff --git a/xen-all.c b/xen-all.c index 21246e0..e1d0694 100644 --- a/xen-all.c +++ b/xen-all.c @@ -154,7 +154,7 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size) +static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; @@ -168,6 +168,7 @@ static void xen_ram_init(ram_addr_t ram_size) block_len += HVM_BELOW_4G_MMIO_LENGTH; } memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { @@ -1059,7 +1060,7 @@ static void xen_read_physmap(XenIOState *state) free(entries); } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1134,7 +1135,7 @@ int xen_hvm_init(void) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size); + xen_ram_init(ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); diff --git a/xen-stub.c b/xen-stub.c index 47c8e73..ad189a6 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -64,7 +64,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(void) +int xen_hvm_init(MemoryRegion **ram_memory) { return 0; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4Dz-0002Bk-Me; Sat, 23 Nov 2013 03:49:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dy-0002BA-Lg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:38 +0000 Received: from [85.158.143.35:19870] by server-1.bemta-4.messagelabs.com id 96/8A-02132-2D520925; Sat, 23 Nov 2013 03:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1385178575!478406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7828 invoked from network); 23 Nov 2013 03:49:36 -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 Nov 2013 03:49:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dv-000721-0F for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Du-0003nx-Ty for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:34 +0000 Date: Sat, 23 Nov 2013 03:49:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc_q35: Initialize Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41900b0857df9bd33e465a6c72d7a3072dc448f4 Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:53 2013 +0000 Commit: Michael Roth CommitDate: Tue Sep 24 22:47:27 2013 -0500 pc_q35: Initialize Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin (cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511) Signed-off-by: Michael Roth --- hw/i386/pc_q35.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..dd13130 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -81,6 +81,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); object_property_add_child(qdev_get_machine(), "icc-bridge", OBJECT(icc_bridge), NULL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:40 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4Dz-0002Bk-Me; Sat, 23 Nov 2013 03:49:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dy-0002BA-Lg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:38 +0000 Received: from [85.158.143.35:19870] by server-1.bemta-4.messagelabs.com id 96/8A-02132-2D520925; Sat, 23 Nov 2013 03:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1385178575!478406!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7828 invoked from network); 23 Nov 2013 03:49:36 -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 Nov 2013 03:49:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Dv-000721-0F for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Du-0003nx-Ty for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:34 +0000 Date: Sat, 23 Nov 2013 03:49:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc_q35: Initialize Xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41900b0857df9bd33e465a6c72d7a3072dc448f4 Author: Anthony PERARD AuthorDate: Mon Sep 9 16:15:53 2013 +0000 Commit: Michael Roth CommitDate: Tue Sep 24 22:47:27 2013 -0500 pc_q35: Initialize Xen. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin (cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511) Signed-off-by: Michael Roth --- hw/i386/pc_q35.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 10e770e..dd13130 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -81,6 +81,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); object_property_add_child(qdev_get_machine(), "icc-bridge", OBJECT(icc_bridge), NULL); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4E9-0002Hm-Pf; Sat, 23 Nov 2013 03:49:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4E8-0002F4-0n for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:48 +0000 Received: from [85.158.137.68:44147] by server-10.bemta-3.messagelabs.com id CA/18-23989-BD520925; Sat, 23 Nov 2013 03:49:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178585!3251612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26501 invoked from network); 23 Nov 2013 03:49:46 -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; 23 Nov 2013 03:49:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4E5-000727-7W for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4E5-0003oy-4b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:45 +0000 Date: Sat, 23 Nov 2013 03:49:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qapi-types.py: Fix enum struct sizes on i686 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b4b3a71fd35d67c5c30652a120c0a59dfab7182 Author: Cole Robinson AuthorDate: Sat Aug 31 18:36:17 2013 -0400 Commit: Michael Roth CommitDate: Tue Sep 24 22:50:13 2013 -0500 qapi-types.py: Fix enum struct sizes on i686 Unlike other list types, enum wasn't adding any padding, which caused a mismatch between the generated struct size and GenericList struct size. More details in a678e26cbe89f7a27cbce794c2c2784571ee9d21 This crashed qemu if calling qmp query-tpm-types for example, which upsets libvirt capabilities probing. Reproducer on i686: (sleep 5; printf '{"execute":"qmp_capabilities"}\n{"execute":"query-tpm-types"}\n') | ./i386-softmmu/qemu-system-i386 -S -nodefaults -nographic -M none -qmp stdio https://bugs.launchpad.net/qemu/+bug/1219207 Cc: qemu-stable@nongnu.org Signed-off-by: Cole Robinson Reviewed-by: Eric Blake Tested-by: Richard W.M. Jones Signed-off-by: Luiz Capitulino (cherry picked from commit 02dc4bf5684d3fb46786fab2ecff98214b1df9fe) Signed-off-by: Michael Roth --- scripts/qapi-types.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5ee46ea..5d31b06 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members): return mcgen(''' typedef struct %(name)sList { - %(name)s value; + union { + %(name)s value; + uint64_t padding; + }; struct %(name)sList *next; } %(name)sList; ''', -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4E9-0002Hm-Pf; Sat, 23 Nov 2013 03:49:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4E8-0002F4-0n for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:48 +0000 Received: from [85.158.137.68:44147] by server-10.bemta-3.messagelabs.com id CA/18-23989-BD520925; Sat, 23 Nov 2013 03:49:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178585!3251612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26501 invoked from network); 23 Nov 2013 03:49:46 -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; 23 Nov 2013 03:49:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4E5-000727-7W for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4E5-0003oy-4b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:45 +0000 Date: Sat, 23 Nov 2013 03:49:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qapi-types.py: Fix enum struct sizes on i686 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b4b3a71fd35d67c5c30652a120c0a59dfab7182 Author: Cole Robinson AuthorDate: Sat Aug 31 18:36:17 2013 -0400 Commit: Michael Roth CommitDate: Tue Sep 24 22:50:13 2013 -0500 qapi-types.py: Fix enum struct sizes on i686 Unlike other list types, enum wasn't adding any padding, which caused a mismatch between the generated struct size and GenericList struct size. More details in a678e26cbe89f7a27cbce794c2c2784571ee9d21 This crashed qemu if calling qmp query-tpm-types for example, which upsets libvirt capabilities probing. Reproducer on i686: (sleep 5; printf '{"execute":"qmp_capabilities"}\n{"execute":"query-tpm-types"}\n') | ./i386-softmmu/qemu-system-i386 -S -nodefaults -nographic -M none -qmp stdio https://bugs.launchpad.net/qemu/+bug/1219207 Cc: qemu-stable@nongnu.org Signed-off-by: Cole Robinson Reviewed-by: Eric Blake Tested-by: Richard W.M. Jones Signed-off-by: Luiz Capitulino (cherry picked from commit 02dc4bf5684d3fb46786fab2ecff98214b1df9fe) Signed-off-by: Michael Roth --- scripts/qapi-types.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5ee46ea..5d31b06 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members): return mcgen(''' typedef struct %(name)sList { - %(name)s value; + union { + %(name)s value; + uint64_t padding; + }; struct %(name)sList *next; } %(name)sList; ''', -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4EJ-0002NR-Sb; Sat, 23 Nov 2013 03:49:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EI-0002NC-5y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:58 +0000 Received: from [85.158.139.211:32894] by server-12.bemta-5.messagelabs.com id F8/73-30017-5E520925; Sat, 23 Nov 2013 03:49:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1385178595!1863786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10647 invoked from network); 23 Nov 2013 03:49:56 -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 Nov 2013 03:49:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EF-00072G-E1 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4EF-0003pP-BJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:55 +0000 Date: Sat, 23 Nov 2013 03:49:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76f698948781a148d336ff9032159f6c7c9eccd2 Author: Aurelien Jarno AuthorDate: Wed Aug 28 14:17:39 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:51:04 2013 -0500 pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN Now that the memory subsystem is propagating the endianness correctly, the pcnet-pci device should have its I/O ports and MMIO memory marked as LITTLE_ENDIAN, as PCI devices are little endian. This makes the pcnet-pci NIC to work again on big endian MIPS Malta (default NIC). Cc: qemu-stable@nongnu.org Signed-off-by: Aurelien Jarno Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi (cherry picked from commit a26405b350c0d31d5ef53f3b459aeb6eaaf50db0) Signed-off-by: Michael Roth --- hw/net/pcnet-pci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 2c2301c..23fc33c 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -134,7 +134,7 @@ static void pcnet_ioport_write(void *opaque, hwaddr addr, static const MemoryRegionOps pcnet_io_ops = { .read = pcnet_ioport_read, .write = pcnet_ioport_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void pcnet_mmio_writeb(void *opaque, hwaddr addr, uint32_t val) @@ -256,7 +256,7 @@ static const MemoryRegionOps pcnet_mmio_ops = { .read = { pcnet_mmio_readb, pcnet_mmio_readw, pcnet_mmio_readl }, .write = { pcnet_mmio_writeb, pcnet_mmio_writew, pcnet_mmio_writel }, }, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void pci_physical_memory_write(void *dma_opaque, hwaddr addr, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:49:59 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:49: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 1Vk4EJ-0002NR-Sb; Sat, 23 Nov 2013 03:49:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EI-0002NC-5y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:58 +0000 Received: from [85.158.139.211:32894] by server-12.bemta-5.messagelabs.com id F8/73-30017-5E520925; Sat, 23 Nov 2013 03:49:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1385178595!1863786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10647 invoked from network); 23 Nov 2013 03:49:56 -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 Nov 2013 03:49:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EF-00072G-E1 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4EF-0003pP-BJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:49:55 +0000 Date: Sat, 23 Nov 2013 03:49:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76f698948781a148d336ff9032159f6c7c9eccd2 Author: Aurelien Jarno AuthorDate: Wed Aug 28 14:17:39 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:51:04 2013 -0500 pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN Now that the memory subsystem is propagating the endianness correctly, the pcnet-pci device should have its I/O ports and MMIO memory marked as LITTLE_ENDIAN, as PCI devices are little endian. This makes the pcnet-pci NIC to work again on big endian MIPS Malta (default NIC). Cc: qemu-stable@nongnu.org Signed-off-by: Aurelien Jarno Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi (cherry picked from commit a26405b350c0d31d5ef53f3b459aeb6eaaf50db0) Signed-off-by: Michael Roth --- hw/net/pcnet-pci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 2c2301c..23fc33c 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -134,7 +134,7 @@ static void pcnet_ioport_write(void *opaque, hwaddr addr, static const MemoryRegionOps pcnet_io_ops = { .read = pcnet_ioport_read, .write = pcnet_ioport_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void pcnet_mmio_writeb(void *opaque, hwaddr addr, uint32_t val) @@ -256,7 +256,7 @@ static const MemoryRegionOps pcnet_mmio_ops = { .read = { pcnet_mmio_readb, pcnet_mmio_readw, pcnet_mmio_readl }, .write = { pcnet_mmio_writeb, pcnet_mmio_writew, pcnet_mmio_writel }, }, - .endianness = DEVICE_NATIVE_ENDIAN, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void pci_physical_memory_write(void *dma_opaque, hwaddr addr, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4ET-0002PA-Vl; Sat, 23 Nov 2013 03:50:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4ES-0002Ow-On for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:08 +0000 Received: from [85.158.137.68:41737] by server-2.bemta-3.messagelabs.com id 23/B9-17329-0F520925; Sat, 23 Nov 2013 03:50:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178606!3251636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27435 invoked from network); 23 Nov 2013 03:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EP-00072o-Tw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4EP-0003q2-Lz for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:05 +0000 Date: Sat, 23 Nov 2013 03:50:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] chardev: fix pty_chr_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 4b5b4721464495fe76fe6e2e033cbb61dce78eef Author: Gerd Hoffmann AuthorDate: Thu Aug 22 11:43:58 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:52:23 2013 -0500 chardev: fix pty_chr_timer pty_chr_timer first calls pty_chr_update_read_handler(), then clears timer_tag (because it is a one-shot timer). This is the wrong order though. pty_chr_update_read_handler might re-arm time timer, and the new timer_tag gets overwitten in that case. This leads to crashes when unplugging a pty chardev: pty_chr_close thinks no timer is running -> timer isn't canceled -> pty_chr_timer gets called with stale CharDevState -> BOOM. This patch fixes the ordering. Kill the pointless goto while being at it. https://bugzilla.redhat.com/show_bug.cgi?id=994414 Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit b0d768c35e08d2057b63e8e77e7a513c447199fa) Signed-off-by: Michael Roth --- qemu-char.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 1be1cf6..1621fbd 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque) struct CharDriverState *chr = opaque; PtyCharDriver *s = chr->opaque; - if (s->connected) { - goto out; - } - - /* Next poll ... */ - pty_chr_update_read_handler(chr); - -out: s->timer_tag = 0; + if (!s->connected) { + /* Next poll ... */ + pty_chr_update_read_handler(chr); + } return FALSE; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4ET-0002PA-Vl; Sat, 23 Nov 2013 03:50:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4ES-0002Ow-On for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:08 +0000 Received: from [85.158.137.68:41737] by server-2.bemta-3.messagelabs.com id 23/B9-17329-0F520925; Sat, 23 Nov 2013 03:50:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178606!3251636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27435 invoked from network); 23 Nov 2013 03:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4EP-00072o-Tw for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4EP-0003q2-Lz for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:05 +0000 Date: Sat, 23 Nov 2013 03:50:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] chardev: fix pty_chr_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 4b5b4721464495fe76fe6e2e033cbb61dce78eef Author: Gerd Hoffmann AuthorDate: Thu Aug 22 11:43:58 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:52:23 2013 -0500 chardev: fix pty_chr_timer pty_chr_timer first calls pty_chr_update_read_handler(), then clears timer_tag (because it is a one-shot timer). This is the wrong order though. pty_chr_update_read_handler might re-arm time timer, and the new timer_tag gets overwitten in that case. This leads to crashes when unplugging a pty chardev: pty_chr_close thinks no timer is running -> timer isn't canceled -> pty_chr_timer gets called with stale CharDevState -> BOOM. This patch fixes the ordering. Kill the pointless goto while being at it. https://bugzilla.redhat.com/show_bug.cgi?id=994414 Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann (cherry picked from commit b0d768c35e08d2057b63e8e77e7a513c447199fa) Signed-off-by: Michael Roth --- qemu-char.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 1be1cf6..1621fbd 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque) struct CharDriverState *chr = opaque; PtyCharDriver *s = chr->opaque; - if (s->connected) { - goto out; - } - - /* Next poll ... */ - pty_chr_update_read_handler(chr); - -out: s->timer_tag = 0; + if (!s->connected) { + /* Next poll ... */ + pty_chr_update_read_handler(chr); + } return FALSE; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Ee-0002QV-2j; Sat, 23 Nov 2013 03:50:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ec-0002QO-SI for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:19 +0000 Received: from [193.109.254.147:7871] by server-15.bemta-14.messagelabs.com id 52/A0-06807-AF520925; Sat, 23 Nov 2013 03:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385178616!236298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6702 invoked from network); 23 Nov 2013 03:50:17 -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; 23 Nov 2013 03:50:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ea-00072v-5b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ea-0003qQ-2B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:16 +0000 Date: Sat, 23 Nov 2013 03:50:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Catch invalid ROM size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50b31e80525d03ef406a8c9f55ff2ae1655a3b66 Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:50 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:53:49 2013 -0500 kvmvapic: Catch invalid ROM size If not caught early, a zero-length ROM will cause a NULL-pointer access later on in patch_hypercalls when allocating a zero-length ROM copy and trying to read from it. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 18e5eec4db96a00907eb588a2b803401637c7f67) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 15beb80..7ac0fe1 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -578,7 +578,7 @@ static int patch_hypercalls(VAPICROMState *s) * enable write access to the option ROM so that variables can be updated by * the guest. */ -static void vapic_map_rom_writable(VAPICROMState *s) +static int vapic_map_rom_writable(VAPICROMState *s) { hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK; MemoryRegionSection section; @@ -599,6 +599,9 @@ static void vapic_map_rom_writable(VAPICROMState *s) /* read ROM size from RAM region */ ram = memory_region_get_ram_ptr(section.mr); rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE; + if (rom_size == 0) { + return -1; + } s->rom_size = rom_size; /* We need to round to avoid creating subpages @@ -612,11 +615,15 @@ static void vapic_map_rom_writable(VAPICROMState *s) memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000); s->rom_mapped_writable = true; memory_region_unref(section.mr); + + return 0; } static int vapic_prepare(VAPICROMState *s) { - vapic_map_rom_writable(s); + if (vapic_map_rom_writable(s) < 0) { + return -1; + } if (patch_hypercalls(s) < 0) { return -1; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:20 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Ee-0002QV-2j; Sat, 23 Nov 2013 03:50:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ec-0002QO-SI for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:19 +0000 Received: from [193.109.254.147:7871] by server-15.bemta-14.messagelabs.com id 52/A0-06807-AF520925; Sat, 23 Nov 2013 03:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385178616!236298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6702 invoked from network); 23 Nov 2013 03:50:17 -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; 23 Nov 2013 03:50:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ea-00072v-5b for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ea-0003qQ-2B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:16 +0000 Date: Sat, 23 Nov 2013 03:50:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Catch invalid ROM size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50b31e80525d03ef406a8c9f55ff2ae1655a3b66 Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:50 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:53:49 2013 -0500 kvmvapic: Catch invalid ROM size If not caught early, a zero-length ROM will cause a NULL-pointer access later on in patch_hypercalls when allocating a zero-length ROM copy and trying to read from it. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 18e5eec4db96a00907eb588a2b803401637c7f67) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 15beb80..7ac0fe1 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -578,7 +578,7 @@ static int patch_hypercalls(VAPICROMState *s) * enable write access to the option ROM so that variables can be updated by * the guest. */ -static void vapic_map_rom_writable(VAPICROMState *s) +static int vapic_map_rom_writable(VAPICROMState *s) { hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK; MemoryRegionSection section; @@ -599,6 +599,9 @@ static void vapic_map_rom_writable(VAPICROMState *s) /* read ROM size from RAM region */ ram = memory_region_get_ram_ptr(section.mr); rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE; + if (rom_size == 0) { + return -1; + } s->rom_size = rom_size; /* We need to round to avoid creating subpages @@ -612,11 +615,15 @@ static void vapic_map_rom_writable(VAPICROMState *s) memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000); s->rom_mapped_writable = true; memory_region_unref(section.mr); + + return 0; } static int vapic_prepare(VAPICROMState *s) { - vapic_map_rom_writable(s); + if (vapic_map_rom_writable(s) < 0) { + return -1; + } if (patch_hypercalls(s) < 0) { return -1; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Eo-0002Rv-5S; Sat, 23 Nov 2013 03:50:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Em-0002Rl-Jm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:28 +0000 Received: from [85.158.143.35:22979] by server-1.bemta-4.messagelabs.com id 30/BA-02132-40620925; Sat, 23 Nov 2013 03:50:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1385178626!549091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17518 invoked from network); 23 Nov 2013 03:50:27 -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; 23 Nov 2013 03:50:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ek-000731-D0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ek-0003qn-9V for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:26 +0000 Date: Sat, 23 Nov 2013 03:50:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Enter inactive state on hardware reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ea8a3c12aa49efc8f503a019dd764f8a0add2cb Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:51 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:54:18 2013 -0500 kvmvapic: Enter inactive state on hardware reset ROM layout may change after reset of devices are hotplugged, so we have to pick up the physical address again when the ROM is initialized. This is best achieved by resetting the state to INACTIVE. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit c056bc3f3464cfae1c94b7dd633d3ec13b13b655) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 7ac0fe1..f2e335d 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -510,9 +510,7 @@ static void vapic_reset(DeviceState *dev) { VAPICROMState *s = VAPIC(dev); - if (s->state == VAPIC_ACTIVE) { - s->state = VAPIC_STANDBY; - } + s->state = VAPIC_INACTIVE; vapic_enable_tpr_reporting(false); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Eo-0002Rv-5S; Sat, 23 Nov 2013 03:50:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Em-0002Rl-Jm for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:28 +0000 Received: from [85.158.143.35:22979] by server-1.bemta-4.messagelabs.com id 30/BA-02132-40620925; Sat, 23 Nov 2013 03:50:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1385178626!549091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17518 invoked from network); 23 Nov 2013 03:50:27 -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; 23 Nov 2013 03:50:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ek-000731-D0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Ek-0003qn-9V for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:26 +0000 Date: Sat, 23 Nov 2013 03:50:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Enter inactive state on hardware reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ea8a3c12aa49efc8f503a019dd764f8a0add2cb Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:51 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:54:18 2013 -0500 kvmvapic: Enter inactive state on hardware reset ROM layout may change after reset of devices are hotplugged, so we have to pick up the physical address again when the ROM is initialized. This is best achieved by resetting the state to INACTIVE. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit c056bc3f3464cfae1c94b7dd633d3ec13b13b655) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 7ac0fe1..f2e335d 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -510,9 +510,7 @@ static void vapic_reset(DeviceState *dev) { VAPICROMState *s = VAPIC(dev); - if (s->state == VAPIC_ACTIVE) { - s->state = VAPIC_STANDBY; - } + s->state = VAPIC_INACTIVE; vapic_enable_tpr_reporting(false); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Ez-0002U1-90; Sat, 23 Nov 2013 03:50:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ex-0002Tl-6A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:39 +0000 Received: from [85.158.139.211:33579] by server-6.bemta-5.messagelabs.com id 7C/83-16310-E0620925; Sat, 23 Nov 2013 03:50:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385178636!1866626!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24975 invoked from network); 23 Nov 2013 03:50:37 -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; 23 Nov 2013 03:50:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Eu-000739-KP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Eu-0003rD-IV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:36 +0000 Date: Sat, 23 Nov 2013 03:50:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Clear also physical ROM address when entering INACTIVE 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 5d2de77798cacf1dadf6a4211972473e057cc6e5 Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:52 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:54:39 2013 -0500 kvmvapic: Clear also physical ROM address when entering INACTIVE state To avoid misinterpreting INACTIVE after migration as old qemu-kvm's STANDBY, also clear rom_state_paddr when going back to this state. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 4357930b8a7d2fcff2d8121ec518117428a781e7) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index f2e335d..cf6c714 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -511,6 +511,7 @@ static void vapic_reset(DeviceState *dev) VAPICROMState *s = VAPIC(dev); s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; vapic_enable_tpr_reporting(false); } @@ -664,6 +665,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, } if (vapic_prepare(s) < 0) { s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; break; } break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:41 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4Ez-0002U1-90; Sat, 23 Nov 2013 03:50:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ex-0002Tl-6A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:39 +0000 Received: from [85.158.139.211:33579] by server-6.bemta-5.messagelabs.com id 7C/83-16310-E0620925; Sat, 23 Nov 2013 03:50:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385178636!1866626!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24975 invoked from network); 23 Nov 2013 03:50:37 -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; 23 Nov 2013 03:50:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Eu-000739-KP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Eu-0003rD-IV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:36 +0000 Date: Sat, 23 Nov 2013 03:50:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] kvmvapic: Clear also physical ROM address when entering INACTIVE 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 5d2de77798cacf1dadf6a4211972473e057cc6e5 Author: Jan Kiszka AuthorDate: Tue Sep 3 18:08:52 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:54:39 2013 -0500 kvmvapic: Clear also physical ROM address when entering INACTIVE state To avoid misinterpreting INACTIVE after migration as old qemu-kvm's STANDBY, also clear rom_state_paddr when going back to this state. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini (cherry picked from commit 4357930b8a7d2fcff2d8121ec518117428a781e7) Signed-off-by: Michael Roth --- hw/i386/kvmvapic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index f2e335d..cf6c714 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -511,6 +511,7 @@ static void vapic_reset(DeviceState *dev) VAPICROMState *s = VAPIC(dev); s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; vapic_enable_tpr_reporting(false); } @@ -664,6 +665,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, } if (vapic_prepare(s) < 0) { s->state = VAPIC_INACTIVE; + s->rom_state_paddr = 0; break; } break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4F9-0002WR-E1; Sat, 23 Nov 2013 03:50:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4F7-0002WD-Ox for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:49 +0000 Received: from [85.158.137.68:42381] by server-9.bemta-3.messagelabs.com id D3/44-13104-81620925; Sat, 23 Nov 2013 03:50:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178646!3251699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28366 invoked from network); 23 Nov 2013 03:50:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4F4-00073J-PY for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4F4-0003sJ-OA for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:46 +0000 Date: Sat, 23 Nov 2013 03:50:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c20c1ffe791ca29840fd9607ea034ea24ad7bdd Author: Stefan Weil AuthorDate: Thu Sep 12 20:17:50 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:56:25 2013 -0500 tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) Debian busybox-static for alpha has a load address of 0x0000000120000000 which is mapped to 0x0000000020000000 for 32 bit hosts. qemu-alpha uses the TCG opcodes qemu_ld32, qemu_ld64, qemu_st32 and qemu_st64 which all raise the assertion (taddr == host_addr). Remove all assertions of this type because they are either wrong or unnecessary (when sizeof(tcg_target_ulong) >= sizeof(target_ulong)). Cc: qemu-stable Signed-off-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev (cherry picked from commit 07ac4dc5db22a31e47b149abdbc5ea99013cf4de) Signed-off-by: Michael Roth --- tci.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/tci.c b/tci.c index c742c8d..af58576 100644 --- a/tci.c +++ b/tci.c @@ -1085,7 +1085,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp8 = *(uint8_t *)(host_addr + GUEST_BASE); #endif tci_write_reg8(t0, tmp8); @@ -1097,7 +1096,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp8 = *(uint8_t *)(host_addr + GUEST_BASE); #endif tci_write_reg8s(t0, tmp8); @@ -1109,7 +1107,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg16(t0, tmp16); @@ -1121,7 +1118,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg16s(t0, tmp16); @@ -1134,7 +1130,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32(t0, tmp32); @@ -1146,7 +1141,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32s(t0, tmp32); @@ -1159,7 +1153,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32(t0, tmp32); @@ -1174,7 +1167,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp64 = helper_ldq_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp64 = tswap64(*(uint64_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg(t0, tmp64); @@ -1190,7 +1182,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stb_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint8_t *)(host_addr + GUEST_BASE) = t0; #endif break; @@ -1202,7 +1193,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stw_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint16_t *)(host_addr + GUEST_BASE) = tswap16(t0); #endif break; @@ -1214,7 +1204,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stl_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint32_t *)(host_addr + GUEST_BASE) = tswap32(t0); #endif break; @@ -1226,7 +1215,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stq_mmu(env, taddr, tmp64, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint64_t *)(host_addr + GUEST_BASE) = tswap64(tmp64); #endif break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:50:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:50: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 1Vk4F9-0002WR-E1; Sat, 23 Nov 2013 03:50:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4F7-0002WD-Ox for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:49 +0000 Received: from [85.158.137.68:42381] by server-9.bemta-3.messagelabs.com id D3/44-13104-81620925; Sat, 23 Nov 2013 03:50:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385178646!3251699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28366 invoked from network); 23 Nov 2013 03:50:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4F4-00073J-PY for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4F4-0003sJ-OA for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:46 +0000 Date: Sat, 23 Nov 2013 03:50:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c20c1ffe791ca29840fd9607ea034ea24ad7bdd Author: Stefan Weil AuthorDate: Thu Sep 12 20:17:50 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 22:56:25 2013 -0500 tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) Debian busybox-static for alpha has a load address of 0x0000000120000000 which is mapped to 0x0000000020000000 for 32 bit hosts. qemu-alpha uses the TCG opcodes qemu_ld32, qemu_ld64, qemu_st32 and qemu_st64 which all raise the assertion (taddr == host_addr). Remove all assertions of this type because they are either wrong or unnecessary (when sizeof(tcg_target_ulong) >= sizeof(target_ulong)). Cc: qemu-stable Signed-off-by: Stefan Weil Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev (cherry picked from commit 07ac4dc5db22a31e47b149abdbc5ea99013cf4de) Signed-off-by: Michael Roth --- tci.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/tci.c b/tci.c index c742c8d..af58576 100644 --- a/tci.c +++ b/tci.c @@ -1085,7 +1085,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp8 = *(uint8_t *)(host_addr + GUEST_BASE); #endif tci_write_reg8(t0, tmp8); @@ -1097,7 +1096,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp8 = helper_ldb_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp8 = *(uint8_t *)(host_addr + GUEST_BASE); #endif tci_write_reg8s(t0, tmp8); @@ -1109,7 +1107,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg16(t0, tmp16); @@ -1121,7 +1118,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp16 = helper_ldw_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp16 = tswap16(*(uint16_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg16s(t0, tmp16); @@ -1134,7 +1130,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32(t0, tmp32); @@ -1146,7 +1141,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32s(t0, tmp32); @@ -1159,7 +1153,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp32 = helper_ldl_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp32 = tswap32(*(uint32_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg32(t0, tmp32); @@ -1174,7 +1167,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) tmp64 = helper_ldq_mmu(env, taddr, tci_read_i(&tb_ptr)); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); tmp64 = tswap64(*(uint64_t *)(host_addr + GUEST_BASE)); #endif tci_write_reg(t0, tmp64); @@ -1190,7 +1182,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stb_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint8_t *)(host_addr + GUEST_BASE) = t0; #endif break; @@ -1202,7 +1193,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stw_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint16_t *)(host_addr + GUEST_BASE) = tswap16(t0); #endif break; @@ -1214,7 +1204,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stl_mmu(env, taddr, t0, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint32_t *)(host_addr + GUEST_BASE) = tswap32(t0); #endif break; @@ -1226,7 +1215,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) helper_stq_mmu(env, taddr, tmp64, t2); #else host_addr = (tcg_target_ulong)taddr; - assert(taddr == host_addr); *(uint64_t *)(host_addr + GUEST_BASE) = tswap64(tmp64); #endif break; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4FL-0002YK-0i; Sat, 23 Nov 2013 03:51:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FJ-0002Y7-6j for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:01 +0000 Received: from [85.158.139.211:37903] by server-2.bemta-5.messagelabs.com id 34/DB-29392-42620925; Sat, 23 Nov 2013 03:51:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385178657!3727936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1342 invoked from network); 23 Nov 2013 03:50:58 -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 Nov 2013 03:50:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FF-00073S-5L for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FE-0003sf-U3 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:57 +0000 Date: Sat, 23 Nov 2013 03:50:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] blockdev: do not default cache.no-flush to true X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aeab582580fa057dbe646fc3277570af6a8d5ce8 Author: Paolo Bonzini AuthorDate: Thu Sep 19 18:48:53 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 23:02:51 2013 -0500 blockdev: do not default cache.no-flush to true That's why all my VMs were so fast lately. :) This changed in 1.6.0 by mistake in patch 29c4e2b (blockdev: Split up 'cache' option, 2013-07-18). Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi (cherry picked from commit 1df6fa4bc6754a170cf511a78e2e6fef84eb5228) Signed-off-by: Michael Roth --- blockdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/blockdev.c b/blockdev.c index bc7016a..097932c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -460,7 +460,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, if (qemu_opt_get_bool(opts, "cache.direct", false)) { bdrv_flags |= BDRV_O_NOCACHE; } - if (qemu_opt_get_bool(opts, "cache.no-flush", true)) { + if (qemu_opt_get_bool(opts, "cache.no-flush", false)) { bdrv_flags |= BDRV_O_NO_FLUSH; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4FL-0002YK-0i; Sat, 23 Nov 2013 03:51:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FJ-0002Y7-6j for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:01 +0000 Received: from [85.158.139.211:37903] by server-2.bemta-5.messagelabs.com id 34/DB-29392-42620925; Sat, 23 Nov 2013 03:51:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385178657!3727936!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1342 invoked from network); 23 Nov 2013 03:50:58 -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 Nov 2013 03:50:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FF-00073S-5L for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FE-0003sf-U3 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:50:57 +0000 Date: Sat, 23 Nov 2013 03:50:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] blockdev: do not default cache.no-flush to true X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aeab582580fa057dbe646fc3277570af6a8d5ce8 Author: Paolo Bonzini AuthorDate: Thu Sep 19 18:48:53 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 23:02:51 2013 -0500 blockdev: do not default cache.no-flush to true That's why all my VMs were so fast lately. :) This changed in 1.6.0 by mistake in patch 29c4e2b (blockdev: Split up 'cache' option, 2013-07-18). Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi (cherry picked from commit 1df6fa4bc6754a170cf511a78e2e6fef84eb5228) Signed-off-by: Michael Roth --- blockdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/blockdev.c b/blockdev.c index bc7016a..097932c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -460,7 +460,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, if (qemu_opt_get_bool(opts, "cache.direct", false)) { bdrv_flags |= BDRV_O_NOCACHE; } - if (qemu_opt_get_bool(opts, "cache.no-flush", true)) { + if (qemu_opt_get_bool(opts, "cache.no-flush", false)) { bdrv_flags |= BDRV_O_NO_FLUSH; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4FW-0002a6-4H; Sat, 23 Nov 2013 03:51:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FU-0002Zm-B4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:12 +0000 Received: from [193.109.254.147:3717] by server-12.bemta-14.messagelabs.com id 1E/89-25062-F2620925; Sat, 23 Nov 2013 03:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1385178667!239527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21950 invoked from network); 23 Nov 2013 03:51:09 -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 Nov 2013 03:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FP-000741-E0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FP-0003tB-9V for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:07 +0000 Date: Sat, 23 Nov 2013 03:51:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-blk: do not relay a previous driver's WCE configuration to the current X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8adc0db7e76e804692372a06ca02cc5a80b67d5 Author: Paolo Bonzini AuthorDate: Fri Sep 20 17:31:55 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 23:03:09 2013 -0500 virtio-blk: do not relay a previous driver's WCE configuration to the current The following sequence happens: - the SeaBIOS virtio-blk driver does not support the WCE feature, which causes QEMU to disable writeback caching - the Linux virtio-blk driver resets the device, finds WCE is available but writeback caching is disabled; tells block layer to not send cache flush commands - the Linux virtio-blk driver sets the DRIVER_OK bit, which causes writeback caching to be re-enabled, but the Linux virtio-blk driver does not know of this side effect and cache flushes remain disabled The bug is at the third step. If the guest does know about CONFIG_WCE, QEMU should ignore the WCE feature's state. The guest will control the cache mode solely using configuration space. This change makes Linux do flushes correctly, but Linux will keep SeaBIOS's writethrough mode. Hence, whenever the guest is reset, the cache mode of the disk should be reset to whatever was specified in the "-drive" option. With this change, the Linux virtio-blk driver finds that writeback caching is enabled, and tells the block layer to send cache flush commands appropriately. Reported-by: Rusty Russell Signed-off-by: Stefan Hajnoczi (cherry picked from commit ef5bc96268ceec64769617dc53b0ac3a20ff351c) Signed-off-by: Michael Roth --- hw/block/virtio-blk.c | 24 ++++++++++++++++++++++-- include/hw/virtio/virtio-blk.h | 1 + 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e2f55cc..49a23c3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -460,9 +460,9 @@ static void virtio_blk_dma_restart_cb(void *opaque, int running, static void virtio_blk_reset(VirtIODevice *vdev) { -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE VirtIOBlock *s = VIRTIO_BLK(vdev); +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE if (s->dataplane) { virtio_blk_data_plane_stop(s->dataplane); } @@ -473,6 +473,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) * are per-device request lists. */ bdrv_drain_all(); + bdrv_set_enable_write_cache(s->bs, s->original_wce); } /* coalesce internal state, copy to pci i/o region 0 @@ -564,7 +565,25 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) } features = vdev->guest_features; - bdrv_set_enable_write_cache(s->bs, !!(features & (1 << VIRTIO_BLK_F_WCE))); + + /* A guest that supports VIRTIO_BLK_F_CONFIG_WCE must be able to send + * cache flushes. Thus, the "auto writethrough" behavior is never + * necessary for guests that support the VIRTIO_BLK_F_CONFIG_WCE feature. + * Leaving it enabled would break the following sequence: + * + * Guest started with "-drive cache=writethrough" + * Guest sets status to 0 + * Guest sets DRIVER bit in status field + * Guest reads host features (WCE=0, CONFIG_WCE=1) + * Guest writes guest features (WCE=0, CONFIG_WCE=1) + * Guest writes 1 to the WCE configuration field (writeback mode) + * Guest sets DRIVER_OK bit in status field + * + * s->bs would erroneously be placed in writethrough mode. + */ + if (!(features & (1 << VIRTIO_BLK_F_CONFIG_WCE))) { + bdrv_set_enable_write_cache(s->bs, !!(features & (1 << VIRTIO_BLK_F_WCE))); + } } static void virtio_blk_save(QEMUFile *f, void *opaque) @@ -674,6 +693,7 @@ static int virtio_blk_device_init(VirtIODevice *vdev) } blkconf_serial(&blk->conf, &blk->serial); + s->original_wce = bdrv_enable_write_cache(blk->conf.bs); if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { return -1; } diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index b87cf49..41885da 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -123,6 +123,7 @@ typedef struct VirtIOBlock { BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; + bool original_wce; VMChangeStateEntry *change; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE Notifier migration_state_notifier; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4FW-0002a6-4H; Sat, 23 Nov 2013 03:51:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FU-0002Zm-B4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:12 +0000 Received: from [193.109.254.147:3717] by server-12.bemta-14.messagelabs.com id 1E/89-25062-F2620925; Sat, 23 Nov 2013 03:51:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1385178667!239527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21950 invoked from network); 23 Nov 2013 03:51:09 -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 Nov 2013 03:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FP-000741-E0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FP-0003tB-9V for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:07 +0000 Date: Sat, 23 Nov 2013 03:51:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-blk: do not relay a previous driver's WCE configuration to the current X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8adc0db7e76e804692372a06ca02cc5a80b67d5 Author: Paolo Bonzini AuthorDate: Fri Sep 20 17:31:55 2013 +0200 Commit: Michael Roth CommitDate: Tue Sep 24 23:03:09 2013 -0500 virtio-blk: do not relay a previous driver's WCE configuration to the current The following sequence happens: - the SeaBIOS virtio-blk driver does not support the WCE feature, which causes QEMU to disable writeback caching - the Linux virtio-blk driver resets the device, finds WCE is available but writeback caching is disabled; tells block layer to not send cache flush commands - the Linux virtio-blk driver sets the DRIVER_OK bit, which causes writeback caching to be re-enabled, but the Linux virtio-blk driver does not know of this side effect and cache flushes remain disabled The bug is at the third step. If the guest does know about CONFIG_WCE, QEMU should ignore the WCE feature's state. The guest will control the cache mode solely using configuration space. This change makes Linux do flushes correctly, but Linux will keep SeaBIOS's writethrough mode. Hence, whenever the guest is reset, the cache mode of the disk should be reset to whatever was specified in the "-drive" option. With this change, the Linux virtio-blk driver finds that writeback caching is enabled, and tells the block layer to send cache flush commands appropriately. Reported-by: Rusty Russell Signed-off-by: Stefan Hajnoczi (cherry picked from commit ef5bc96268ceec64769617dc53b0ac3a20ff351c) Signed-off-by: Michael Roth --- hw/block/virtio-blk.c | 24 ++++++++++++++++++++++-- include/hw/virtio/virtio-blk.h | 1 + 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e2f55cc..49a23c3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -460,9 +460,9 @@ static void virtio_blk_dma_restart_cb(void *opaque, int running, static void virtio_blk_reset(VirtIODevice *vdev) { -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE VirtIOBlock *s = VIRTIO_BLK(vdev); +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE if (s->dataplane) { virtio_blk_data_plane_stop(s->dataplane); } @@ -473,6 +473,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) * are per-device request lists. */ bdrv_drain_all(); + bdrv_set_enable_write_cache(s->bs, s->original_wce); } /* coalesce internal state, copy to pci i/o region 0 @@ -564,7 +565,25 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) } features = vdev->guest_features; - bdrv_set_enable_write_cache(s->bs, !!(features & (1 << VIRTIO_BLK_F_WCE))); + + /* A guest that supports VIRTIO_BLK_F_CONFIG_WCE must be able to send + * cache flushes. Thus, the "auto writethrough" behavior is never + * necessary for guests that support the VIRTIO_BLK_F_CONFIG_WCE feature. + * Leaving it enabled would break the following sequence: + * + * Guest started with "-drive cache=writethrough" + * Guest sets status to 0 + * Guest sets DRIVER bit in status field + * Guest reads host features (WCE=0, CONFIG_WCE=1) + * Guest writes guest features (WCE=0, CONFIG_WCE=1) + * Guest writes 1 to the WCE configuration field (writeback mode) + * Guest sets DRIVER_OK bit in status field + * + * s->bs would erroneously be placed in writethrough mode. + */ + if (!(features & (1 << VIRTIO_BLK_F_CONFIG_WCE))) { + bdrv_set_enable_write_cache(s->bs, !!(features & (1 << VIRTIO_BLK_F_WCE))); + } } static void virtio_blk_save(QEMUFile *f, void *opaque) @@ -674,6 +693,7 @@ static int virtio_blk_device_init(VirtIODevice *vdev) } blkconf_serial(&blk->conf, &blk->serial); + s->original_wce = bdrv_enable_write_cache(blk->conf.bs); if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) { return -1; } diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index b87cf49..41885da 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -123,6 +123,7 @@ typedef struct VirtIOBlock { BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; + bool original_wce; VMChangeStateEntry *change; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE Notifier migration_state_notifier; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Ff-0002bV-7b; Sat, 23 Nov 2013 03: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 1Vk4Fd-0002bF-6S for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:21 +0000 Received: from [85.158.143.35:62330] by server-3.bemta-4.messagelabs.com id 2D/11-32360-83620925; Sat, 23 Nov 2013 03:51:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385178678!543125!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31520 invoked from network); 23 Nov 2013 03:51:19 -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 Nov 2013 03:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FZ-000747-Py for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FZ-0003tZ-H4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:17 +0000 Date: Sat, 23 Nov 2013 03:51:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: emulate intr endpoint intervals correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc6fbaa8322ca53f46d9a6cc7e2f82de5362ea83 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:38:44 2013 +0200 Commit: Michael Roth CommitDate: Wed Sep 25 15:33:02 2013 -0500 xhci: emulate intr endpoint intervals correctly Respect the interval for interrupt endpoints, so we don't finish transfers as fast as possible but at the rate configured by the guest. Fixes guest deadlocks triggered by interrupt storms. Cc: Signed-off-by: Gerd Hoffmann (cherry picked from commit 4d7a81c06f5f17e019a2d3a18300500bd64f6f40) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index a6f55a1..8010a6d 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -355,6 +355,7 @@ typedef struct XHCITransfer { unsigned int streamid; bool in_xfer; bool iso_xfer; + bool timed_xfer; unsigned int trb_count; unsigned int trb_alloced; @@ -1803,6 +1804,7 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) xfer->in_xfer = bmRequestType & USB_DIR_IN; xfer->iso_xfer = false; + xfer->timed_xfer = false; if (xhci_setup_packet(xfer) < 0) { return -1; @@ -1818,6 +1820,17 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) return 0; } +static void xhci_calc_intr_kick(XHCIState *xhci, XHCITransfer *xfer, + XHCIEPContext *epctx, uint64_t mfindex) +{ + uint64_t asap = ((mfindex + epctx->interval - 1) & + ~(epctx->interval-1)); + uint64_t kick = epctx->mfindex_last + epctx->interval; + + assert(epctx->interval != 0); + xfer->mfindex_kick = MAX(asap, kick); +} + static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx, uint64_t mfindex) { @@ -1840,8 +1853,8 @@ static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, } } -static void xhci_check_iso_kick(XHCIState *xhci, XHCITransfer *xfer, - XHCIEPContext *epctx, uint64_t mfindex) +static void xhci_check_intr_iso_kick(XHCIState *xhci, XHCITransfer *xfer, + XHCIEPContext *epctx, uint64_t mfindex) { if (xfer->mfindex_kick > mfindex) { qemu_mod_timer(epctx->kick_timer, qemu_get_clock_ns(vm_clock) + @@ -1866,18 +1879,30 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx switch(epctx->type) { case ET_INTR_OUT: case ET_INTR_IN: + xfer->pkts = 0; + xfer->iso_xfer = false; + xfer->timed_xfer = true; + mfindex = xhci_mfindex_get(xhci); + xhci_calc_intr_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); + if (xfer->running_retry) { + return -1; + } + break; case ET_BULK_OUT: case ET_BULK_IN: xfer->pkts = 0; xfer->iso_xfer = false; + xfer->timed_xfer = false; break; case ET_ISO_OUT: case ET_ISO_IN: xfer->pkts = 1; xfer->iso_xfer = true; + xfer->timed_xfer = true; mfindex = xhci_mfindex_get(xhci); xhci_calc_iso_kick(xhci, xfer, epctx, mfindex); - xhci_check_iso_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); if (xfer->running_retry) { return -1; } @@ -1938,13 +1963,18 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, trace_usb_xhci_xfer_retry(xfer); assert(xfer->running_retry); - if (xfer->iso_xfer) { - /* retry delayed iso transfer */ + if (xfer->timed_xfer) { + /* time to kick the transfer? */ mfindex = xhci_mfindex_get(xhci); - xhci_check_iso_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); if (xfer->running_retry) { return; } + xfer->timed_xfer = 0; + xfer->running_retry = 1; + } + if (xfer->iso_xfer) { + /* retry iso transfer */ if (xhci_setup_packet(xfer) < 0) { return; } @@ -2030,7 +2060,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, epctx->next_xfer = (epctx->next_xfer + 1) % TD_QUEUE; ep = xfer->packet.ep; } else { - if (!xfer->iso_xfer) { + if (!xfer->timed_xfer) { fprintf(stderr, "xhci: error firing data transfer\n"); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03: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 1Vk4Ff-0002bV-7b; Sat, 23 Nov 2013 03: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 1Vk4Fd-0002bF-6S for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:21 +0000 Received: from [85.158.143.35:62330] by server-3.bemta-4.messagelabs.com id 2D/11-32360-83620925; Sat, 23 Nov 2013 03:51:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385178678!543125!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31520 invoked from network); 23 Nov 2013 03:51:19 -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 Nov 2013 03:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4FZ-000747-Py for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4FZ-0003tZ-H4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:17 +0000 Date: Sat, 23 Nov 2013 03:51:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xhci: emulate intr endpoint intervals correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc6fbaa8322ca53f46d9a6cc7e2f82de5362ea83 Author: Gerd Hoffmann AuthorDate: Wed Aug 28 11:38:44 2013 +0200 Commit: Michael Roth CommitDate: Wed Sep 25 15:33:02 2013 -0500 xhci: emulate intr endpoint intervals correctly Respect the interval for interrupt endpoints, so we don't finish transfers as fast as possible but at the rate configured by the guest. Fixes guest deadlocks triggered by interrupt storms. Cc: Signed-off-by: Gerd Hoffmann (cherry picked from commit 4d7a81c06f5f17e019a2d3a18300500bd64f6f40) Signed-off-by: Michael Roth --- hw/usb/hcd-xhci.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index a6f55a1..8010a6d 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -355,6 +355,7 @@ typedef struct XHCITransfer { unsigned int streamid; bool in_xfer; bool iso_xfer; + bool timed_xfer; unsigned int trb_count; unsigned int trb_alloced; @@ -1803,6 +1804,7 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) xfer->in_xfer = bmRequestType & USB_DIR_IN; xfer->iso_xfer = false; + xfer->timed_xfer = false; if (xhci_setup_packet(xfer) < 0) { return -1; @@ -1818,6 +1820,17 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) return 0; } +static void xhci_calc_intr_kick(XHCIState *xhci, XHCITransfer *xfer, + XHCIEPContext *epctx, uint64_t mfindex) +{ + uint64_t asap = ((mfindex + epctx->interval - 1) & + ~(epctx->interval-1)); + uint64_t kick = epctx->mfindex_last + epctx->interval; + + assert(epctx->interval != 0); + xfer->mfindex_kick = MAX(asap, kick); +} + static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx, uint64_t mfindex) { @@ -1840,8 +1853,8 @@ static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, } } -static void xhci_check_iso_kick(XHCIState *xhci, XHCITransfer *xfer, - XHCIEPContext *epctx, uint64_t mfindex) +static void xhci_check_intr_iso_kick(XHCIState *xhci, XHCITransfer *xfer, + XHCIEPContext *epctx, uint64_t mfindex) { if (xfer->mfindex_kick > mfindex) { qemu_mod_timer(epctx->kick_timer, qemu_get_clock_ns(vm_clock) + @@ -1866,18 +1879,30 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx switch(epctx->type) { case ET_INTR_OUT: case ET_INTR_IN: + xfer->pkts = 0; + xfer->iso_xfer = false; + xfer->timed_xfer = true; + mfindex = xhci_mfindex_get(xhci); + xhci_calc_intr_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); + if (xfer->running_retry) { + return -1; + } + break; case ET_BULK_OUT: case ET_BULK_IN: xfer->pkts = 0; xfer->iso_xfer = false; + xfer->timed_xfer = false; break; case ET_ISO_OUT: case ET_ISO_IN: xfer->pkts = 1; xfer->iso_xfer = true; + xfer->timed_xfer = true; mfindex = xhci_mfindex_get(xhci); xhci_calc_iso_kick(xhci, xfer, epctx, mfindex); - xhci_check_iso_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); if (xfer->running_retry) { return -1; } @@ -1938,13 +1963,18 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, trace_usb_xhci_xfer_retry(xfer); assert(xfer->running_retry); - if (xfer->iso_xfer) { - /* retry delayed iso transfer */ + if (xfer->timed_xfer) { + /* time to kick the transfer? */ mfindex = xhci_mfindex_get(xhci); - xhci_check_iso_kick(xhci, xfer, epctx, mfindex); + xhci_check_intr_iso_kick(xhci, xfer, epctx, mfindex); if (xfer->running_retry) { return; } + xfer->timed_xfer = 0; + xfer->running_retry = 1; + } + if (xfer->iso_xfer) { + /* retry iso transfer */ if (xhci_setup_packet(xfer) < 0) { return; } @@ -2030,7 +2060,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, epctx->next_xfer = (epctx->next_xfer + 1) % TD_QUEUE; ep = xfer->packet.ep; } else { - if (!xfer->iso_xfer) { + if (!xfer->timed_xfer) { fprintf(stderr, "xhci: error firing data transfer\n"); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fo-0002d0-BT; Sat, 23 Nov 2013 03:51:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fn-0002ck-0d for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:31 +0000 Received: from [85.158.137.68:43069] by server-1.bemta-3.messagelabs.com id 57/C8-29598-24620925; Sat, 23 Nov 2013 03:51:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385178688!3299469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12483 invoked from network); 23 Nov 2013 03:51:29 -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; 23 Nov 2013 03:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fk-00074F-2G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Fj-0003tx-UE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:27 +0000 Date: Sat, 23 Nov 2013 03:51:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iov: avoid "orig_len may be used unitialized" warning X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b314120afdbab3d29885f47fc83bc55f43765968 Author: Michael Tokarev AuthorDate: Sat Sep 14 13:11:36 2013 +0400 Commit: Michael Roth CommitDate: Thu Sep 26 20:35:32 2013 -0500 iov: avoid "orig_len may be used unitialized" warning Signed-off-by: Wenchao Xia Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev (cherry picked from commit 2be178a475289286db80de5ddd7830e67e112bdd) Signed-off-by: Michael Roth --- util/iov.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/util/iov.c b/util/iov.c index f705586..bb46c04 100644 --- a/util/iov.c +++ b/util/iov.c @@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, assert(iov[niov].iov_len > tail); orig_len = iov[niov].iov_len; iov[niov++].iov_len = tail; - } - - ret = do_send_recv(sockfd, iov, niov, do_send); - - /* Undo the changes above before checking for errors */ - if (tail) { + ret = do_send_recv(sockfd, iov, niov, do_send); + /* Undo the changes above before checking for errors */ iov[niov-1].iov_len = orig_len; + } else { + ret = do_send_recv(sockfd, iov, niov, do_send); } if (offset) { iov[0].iov_base -= offset; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fo-0002d0-BT; Sat, 23 Nov 2013 03:51:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fn-0002ck-0d for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:31 +0000 Received: from [85.158.137.68:43069] by server-1.bemta-3.messagelabs.com id 57/C8-29598-24620925; Sat, 23 Nov 2013 03:51:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1385178688!3299469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12483 invoked from network); 23 Nov 2013 03:51:29 -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; 23 Nov 2013 03:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fk-00074F-2G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Fj-0003tx-UE for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:27 +0000 Date: Sat, 23 Nov 2013 03:51:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] iov: avoid "orig_len may be used unitialized" warning X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b314120afdbab3d29885f47fc83bc55f43765968 Author: Michael Tokarev AuthorDate: Sat Sep 14 13:11:36 2013 +0400 Commit: Michael Roth CommitDate: Thu Sep 26 20:35:32 2013 -0500 iov: avoid "orig_len may be used unitialized" warning Signed-off-by: Wenchao Xia Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev (cherry picked from commit 2be178a475289286db80de5ddd7830e67e112bdd) Signed-off-by: Michael Roth --- util/iov.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/util/iov.c b/util/iov.c index f705586..bb46c04 100644 --- a/util/iov.c +++ b/util/iov.c @@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, assert(iov[niov].iov_len > tail); orig_len = iov[niov].iov_len; iov[niov++].iov_len = tail; - } - - ret = do_send_recv(sockfd, iov, niov, do_send); - - /* Undo the changes above before checking for errors */ - if (tail) { + ret = do_send_recv(sockfd, iov, niov, do_send); + /* Undo the changes above before checking for errors */ iov[niov-1].iov_len = orig_len; + } else { + ret = do_send_recv(sockfd, iov, niov, do_send); } if (offset) { iov[0].iov_base -= offset; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4Fy-0002eb-EG; Sat, 23 Nov 2013 03:51:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fx-0002eQ-8w for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:41 +0000 Received: from [193.109.254.147:10157] by server-4.bemta-14.messagelabs.com id 75/12-22292-C4620925; Sat, 23 Nov 2013 03:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385178698!238912!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21083 invoked from network); 23 Nov 2013 03:51:39 -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 Nov 2013 03:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fu-00074L-Bf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Fu-0003uN-6r for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:38 +0000 Date: Sat, 23 Nov 2013 03:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tap: Use numbered tap/tun devices on all *BSD OS'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 6bbb9d8100c90deb4843bfa3cf36e75b843c495b Author: Brad Smith AuthorDate: Sat Aug 3 22:20:41 2013 -0400 Commit: Michael Roth CommitDate: Thu Sep 26 20:53:51 2013 -0500 tap: Use numbered tap/tun devices on all *BSD OS's The following patch simplifies the *BSD tap/tun code and makes use of numbered tap/tun interfaces on all *BSD OS's. NetBSD has a patch in their pkgsrc tree to make use of this feature and DragonFly also supports this as well. Signed-off-by: Brad Smith Signed-off-by: Stefan Hajnoczi (cherry picked from commit aa4f082f7526d39dac8e2ca64d192d858014ee10) Signed-off-by: Michael Roth --- net/tap-bsd.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index f61d580..90f8a02 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -44,8 +44,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, struct stat s; #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ - defined(__OpenBSD__) || defined(__APPLE__) /* if no ifname is given, always start the search from tap0/tun0. */ int i; char dname[100]; @@ -76,15 +74,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, dname, strerror(errno)); return -1; } -#else - TFR(fd = open("/dev/tap", O_RDWR)); - if (fd < 0) { - fprintf(stderr, - "warning: could not open /dev/tap: no virtual network emulation: %s\n", - strerror(errno)); - return -1; - } -#endif #ifdef TAPGIFNAME if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4Fy-0002eb-EG; Sat, 23 Nov 2013 03:51:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fx-0002eQ-8w for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:41 +0000 Received: from [193.109.254.147:10157] by server-4.bemta-14.messagelabs.com id 75/12-22292-C4620925; Sat, 23 Nov 2013 03:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1385178698!238912!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21083 invoked from network); 23 Nov 2013 03:51:39 -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 Nov 2013 03:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Fu-00074L-Bf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Fu-0003uN-6r for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:38 +0000 Date: Sat, 23 Nov 2013 03:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tap: Use numbered tap/tun devices on all *BSD OS'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 6bbb9d8100c90deb4843bfa3cf36e75b843c495b Author: Brad Smith AuthorDate: Sat Aug 3 22:20:41 2013 -0400 Commit: Michael Roth CommitDate: Thu Sep 26 20:53:51 2013 -0500 tap: Use numbered tap/tun devices on all *BSD OS's The following patch simplifies the *BSD tap/tun code and makes use of numbered tap/tun interfaces on all *BSD OS's. NetBSD has a patch in their pkgsrc tree to make use of this feature and DragonFly also supports this as well. Signed-off-by: Brad Smith Signed-off-by: Stefan Hajnoczi (cherry picked from commit aa4f082f7526d39dac8e2ca64d192d858014ee10) Signed-off-by: Michael Roth --- net/tap-bsd.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index f61d580..90f8a02 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -44,8 +44,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, struct stat s; #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ - defined(__OpenBSD__) || defined(__APPLE__) /* if no ifname is given, always start the search from tap0/tun0. */ int i; char dname[100]; @@ -76,15 +74,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, dname, strerror(errno)); return -1; } -#else - TFR(fd = open("/dev/tap", O_RDWR)); - if (fd < 0) { - fprintf(stderr, - "warning: could not open /dev/tap: no virtual network emulation: %s\n", - strerror(errno)); - return -1; - } -#endif #ifdef TAPGIFNAME if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4G9-0002gT-Ky; Sat, 23 Nov 2013 03:51:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4G7-0002gC-C4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:51 +0000 Received: from [85.158.143.35:24869] by server-1.bemta-4.messagelabs.com id C5/FA-02132-65620925; Sat, 23 Nov 2013 03:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1385178708!545971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31673 invoked from network); 23 Nov 2013 03:51:49 -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; 23 Nov 2013 03:51:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4G4-00074R-HS for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4G4-0003vF-G8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:48 +0000 Date: Sat, 23 Nov 2013 03:51:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rbd: avoid qemu_rbd_snap_list() memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc06b430942e84a2a69e2a80a6d5b376a8064020 Author: Stefan Hajnoczi AuthorDate: Wed Sep 25 16:00:48 2013 +0200 Commit: Michael Roth CommitDate: Mon Sep 30 22:32:04 2013 -0500 rbd: avoid qemu_rbd_snap_list() memory leaks When there are no snapshots qemu_rbd_snap_list() returns 0 and the snapshot table pointer is NULL. Don't forget to free the snaps buffer we allocated for librbd rbd_snap_list(). When the function succeeds don't forget to free the snaps buffer after calling rbd_snap_list_end(). Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 9e6337d0818650362149b734d53edf9489f3acaa) Signed-off-by: Michael Roth --- block/rbd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index cb71751..7e7c735 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -934,7 +934,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, do { snaps = g_malloc(sizeof(*snaps) * max_snaps); snap_count = rbd_snap_list(s->image, snaps, &max_snaps); - if (snap_count < 0) { + if (snap_count <= 0) { g_free(snaps); } } while (snap_count == -ERANGE); @@ -958,6 +958,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, sn_info->vm_clock_nsec = 0; } rbd_snap_list_end(snaps); + g_free(snaps); done: *psn_tab = sn_tab; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:51:53 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:51: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 1Vk4G9-0002gT-Ky; Sat, 23 Nov 2013 03:51:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4G7-0002gC-C4 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:51 +0000 Received: from [85.158.143.35:24869] by server-1.bemta-4.messagelabs.com id C5/FA-02132-65620925; Sat, 23 Nov 2013 03:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1385178708!545971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31673 invoked from network); 23 Nov 2013 03:51:49 -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; 23 Nov 2013 03:51:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4G4-00074R-HS for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4G4-0003vF-G8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:48 +0000 Date: Sat, 23 Nov 2013 03:51:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rbd: avoid qemu_rbd_snap_list() memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc06b430942e84a2a69e2a80a6d5b376a8064020 Author: Stefan Hajnoczi AuthorDate: Wed Sep 25 16:00:48 2013 +0200 Commit: Michael Roth CommitDate: Mon Sep 30 22:32:04 2013 -0500 rbd: avoid qemu_rbd_snap_list() memory leaks When there are no snapshots qemu_rbd_snap_list() returns 0 and the snapshot table pointer is NULL. Don't forget to free the snaps buffer we allocated for librbd rbd_snap_list(). When the function succeeds don't forget to free the snaps buffer after calling rbd_snap_list_end(). Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 9e6337d0818650362149b734d53edf9489f3acaa) Signed-off-by: Michael Roth --- block/rbd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index cb71751..7e7c735 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -934,7 +934,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, do { snaps = g_malloc(sizeof(*snaps) * max_snaps); snap_count = rbd_snap_list(s->image, snaps, &max_snaps); - if (snap_count < 0) { + if (snap_count <= 0) { g_free(snaps); } } while (snap_count == -ERANGE); @@ -958,6 +958,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, sn_info->vm_clock_nsec = 0; } rbd_snap_list_end(snaps); + g_free(snaps); done: *psn_tab = sn_tab; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4GJ-0002i0-Nr; Sat, 23 Nov 2013 03:52:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GH-0002hi-Ld for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:01 +0000 Received: from [85.158.139.211:37724] by server-11.bemta-5.messagelabs.com id A0/25-23268-06620925; Sat, 23 Nov 2013 03:52:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385178718!3836494!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17538 invoked from network); 23 Nov 2013 03:51:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:51:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GE-00074a-M9 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GE-0003vb-KT for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:58 +0000 Date: Sat, 23 Nov 2013 03:51:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vmdk: fix cluster size check for flat extents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61fbeb6e81f648d25c2d3ba5f0d663d54abed1c1 Author: Fam Zheng AuthorDate: Mon Sep 23 17:18:29 2013 +0800 Commit: Michael Roth CommitDate: Mon Sep 30 22:34:36 2013 -0500 vmdk: fix cluster size check for flat extents We use the extent size as cluster size for flat extents (where no L1/L2 table is allocated so it's safe) reuse sector calculating code with sparse extents. Don't pass in the cluster size for adding flat extent, just set it to sectors later, then the cluster size checking will not fail. The cluster_sectors is changed to int64_t to allow big flat extent. Without this, flat extent opening is broken: # qemu-img create -f vmdk -o subformat=monolithicFlat /tmp/a.vmdk 100G Formatting '/tmp/a.vmdk', fmt=vmdk size=107374182400 compat6=off subformat='monolithicFlat' zeroed_grain=off # qemu-img info /tmp/a.vmdk image: /tmp/a.vmdk file format: raw virtual size: 0 (0 bytes) disk size: 4.0K Signed-off-by: Fam Zheng Signed-off-by: Kevin Wolf (cherry picked from commit 301c7d38a0c359b91526391d13617386f3d9bb29) Signed-off-by: Michael Roth --- block/vmdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 346bb5c..258a24f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -105,7 +105,7 @@ typedef struct VmdkExtent { uint32_t l2_cache_offsets[L2_CACHE_SIZE]; uint32_t l2_cache_counts[L2_CACHE_SIZE]; - unsigned int cluster_sectors; + int64_t cluster_sectors; } VmdkExtent; typedef struct BDRVVmdkState { @@ -416,7 +416,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l1_size = l1_size; extent->l1_entry_sectors = l2_size * cluster_sectors; extent->l2_size = l2_size; - extent->cluster_sectors = cluster_sectors; + extent->cluster_sectors = flat ? sectors : cluster_sectors; if (s->num_extents > 1) { extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; @@ -736,7 +736,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, VmdkExtent *extent; ret = vmdk_add_extent(bs, extent_file, true, sectors, - 0, 0, 0, 0, sectors, &extent); + 0, 0, 0, 0, 0, &extent); if (ret < 0) { return ret; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4GJ-0002i0-Nr; Sat, 23 Nov 2013 03:52:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GH-0002hi-Ld for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:01 +0000 Received: from [85.158.139.211:37724] by server-11.bemta-5.messagelabs.com id A0/25-23268-06620925; Sat, 23 Nov 2013 03:52:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385178718!3836494!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17538 invoked from network); 23 Nov 2013 03:51:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:51:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GE-00074a-M9 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GE-0003vb-KT for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:51:58 +0000 Date: Sat, 23 Nov 2013 03:51:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vmdk: fix cluster size check for flat extents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61fbeb6e81f648d25c2d3ba5f0d663d54abed1c1 Author: Fam Zheng AuthorDate: Mon Sep 23 17:18:29 2013 +0800 Commit: Michael Roth CommitDate: Mon Sep 30 22:34:36 2013 -0500 vmdk: fix cluster size check for flat extents We use the extent size as cluster size for flat extents (where no L1/L2 table is allocated so it's safe) reuse sector calculating code with sparse extents. Don't pass in the cluster size for adding flat extent, just set it to sectors later, then the cluster size checking will not fail. The cluster_sectors is changed to int64_t to allow big flat extent. Without this, flat extent opening is broken: # qemu-img create -f vmdk -o subformat=monolithicFlat /tmp/a.vmdk 100G Formatting '/tmp/a.vmdk', fmt=vmdk size=107374182400 compat6=off subformat='monolithicFlat' zeroed_grain=off # qemu-img info /tmp/a.vmdk image: /tmp/a.vmdk file format: raw virtual size: 0 (0 bytes) disk size: 4.0K Signed-off-by: Fam Zheng Signed-off-by: Kevin Wolf (cherry picked from commit 301c7d38a0c359b91526391d13617386f3d9bb29) Signed-off-by: Michael Roth --- block/vmdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 346bb5c..258a24f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -105,7 +105,7 @@ typedef struct VmdkExtent { uint32_t l2_cache_offsets[L2_CACHE_SIZE]; uint32_t l2_cache_counts[L2_CACHE_SIZE]; - unsigned int cluster_sectors; + int64_t cluster_sectors; } VmdkExtent; typedef struct BDRVVmdkState { @@ -416,7 +416,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l1_size = l1_size; extent->l1_entry_sectors = l2_size * cluster_sectors; extent->l2_size = l2_size; - extent->cluster_sectors = cluster_sectors; + extent->cluster_sectors = flat ? sectors : cluster_sectors; if (s->num_extents > 1) { extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; @@ -736,7 +736,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, VmdkExtent *extent; ret = vmdk_add_extent(bs, extent_file, true, sectors, - 0, 0, 0, 0, sectors, &extent); + 0, 0, 0, 0, 0, &extent); if (ret < 0) { return ret; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4GS-0002js-Qe; Sat, 23 Nov 2013 03:52:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GR-0002jc-ME for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:11 +0000 Received: from [193.109.254.147:10769] by server-4.bemta-14.messagelabs.com id 5F/22-22292-A6620925; Sat, 23 Nov 2013 03:52:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178729!236083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25957 invoked from network); 23 Nov 2013 03:52:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GO-000759-RC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GO-0003w7-Pp for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:08 +0000 Date: Sat, 23 Nov 2013 03:52:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] piix4: disable io on reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae00a27feab0ca12d2a802cfae9ee65ba3d43602 Author: Michael S. Tsirkin AuthorDate: Wed Sep 11 13:33:31 2013 +0300 Commit: Michael Roth CommitDate: Mon Sep 30 22:48:18 2013 -0500 piix4: disable io on reset io base register at 0x40 is cleared on reset, but io is not disabled until some other event happens to call pm_io_space_update. Invoke pm_io_space_update directly to make this consistent. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin (cherry picked from commit c046e8c4a26c902ca1b4f5bdf668a2da6bc75f54) Signed-off-by: Michael Roth --- hw/acpi/piix4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c885690..3aaf18c 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -380,6 +380,7 @@ static void piix4_reset(void *opaque) /* Mark SMM as already inited (until KVM supports SMM). */ pci_conf[0x5B] = 0x02; } + pm_io_space_update(s); piix4_update_hotplug(s); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4GS-0002js-Qe; Sat, 23 Nov 2013 03:52:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GR-0002jc-ME for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:11 +0000 Received: from [193.109.254.147:10769] by server-4.bemta-14.messagelabs.com id 5F/22-22292-A6620925; Sat, 23 Nov 2013 03:52:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385178729!236083!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25957 invoked from network); 23 Nov 2013 03:52:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GO-000759-RC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GO-0003w7-Pp for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:08 +0000 Date: Sat, 23 Nov 2013 03:52:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] piix4: disable io on reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae00a27feab0ca12d2a802cfae9ee65ba3d43602 Author: Michael S. Tsirkin AuthorDate: Wed Sep 11 13:33:31 2013 +0300 Commit: Michael Roth CommitDate: Mon Sep 30 22:48:18 2013 -0500 piix4: disable io on reset io base register at 0x40 is cleared on reset, but io is not disabled until some other event happens to call pm_io_space_update. Invoke pm_io_space_update directly to make this consistent. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin (cherry picked from commit c046e8c4a26c902ca1b4f5bdf668a2da6bc75f54) Signed-off-by: Michael Roth --- hw/acpi/piix4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c885690..3aaf18c 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -380,6 +380,7 @@ static void piix4_reset(void *opaque) /* Mark SMM as already inited (until KVM supports SMM). */ pci_conf[0x5B] = 0x02; } + pm_io_space_update(s); piix4_update_hotplug(s); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Gd-0002lZ-Tk; Sat, 23 Nov 2013 03:52:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gc-0002lO-97 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:22 +0000 Received: from [193.109.254.147:54586] by server-9.bemta-14.messagelabs.com id A5/49-08751-57620925; Sat, 23 Nov 2013 03:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385178739!237086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9895 invoked from network); 23 Nov 2013 03:52:20 -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; 23 Nov 2013 03:52:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GZ-00075F-4B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GZ-0003wY-0K for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:19 +0000 Date: Sat, 23 Nov 2013 03:52:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] coroutine: add ./configure --disable-coroutine-pool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba20326a937421c50a775907dc9ac726bb9a9b50 Author: Stefan Hajnoczi AuthorDate: Wed Sep 11 16:42:35 2013 +0200 Commit: Michael Roth CommitDate: Mon Sep 30 22:57:15 2013 -0500 coroutine: add ./configure --disable-coroutine-pool The 'gthread' coroutine backend was written before the freelist (aka pool) existed in qemu-coroutine.c. This means that every thread is expected to exit when its coroutine terminates. It is not possible to reuse threads from a pool. This patch automatically disables the pool when 'gthread' is used. This allows the 'gthread' backend to work again (for example, tests/test-coroutine completes successfully instead of hanging). I considered implementing thread reuse but I don't want quirks like CPU affinity differences due to coroutine threads being recycled. The 'gthread' backend is a reference backend and it's therefore okay to skip the pool optimization. Note this patch also makes it easy to toggle the pool for benchmarking purposes: ./configure --with-coroutine-backend=ucontext \ --disable-coroutine-pool Reported-by: Gabriel Kerneis Signed-off-by: Stefan Hajnoczi Reviewed-by: Gabriel Kerneis Signed-off-by: Kevin Wolf (cherry picked from commit 70c60c089fdc6bf8a79324e492c13e8c08d55942) Signed-off-by: Michael Roth --- configure | 24 ++++++++++++++++++++++++ qemu-coroutine.c | 32 ++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 18fa608..4cf672d 100755 --- a/configure +++ b/configure @@ -235,6 +235,7 @@ guest_agent="" want_tools="yes" libiscsi="" coroutine="" +coroutine_pool="" seccomp="" glusterfs="" glusterfs_discard="no" @@ -871,6 +872,10 @@ for opt do ;; --with-coroutine=*) coroutine="$optarg" ;; + --disable-coroutine-pool) coroutine_pool="no" + ;; + --enable-coroutine-pool) coroutine_pool="yes" + ;; --disable-docs) docs="no" ;; --enable-docs) docs="yes" @@ -1152,6 +1157,8 @@ echo " --disable-seccomp disable seccomp support" echo " --enable-seccomp enables seccomp support" echo " --with-coroutine=BACKEND coroutine backend. Supported options:" echo " gthread, ucontext, sigaltstack, windows" +echo " --disable-coroutine-pool disable coroutine freelist (worse performance)" +echo " --enable-coroutine-pool enable coroutine freelist (better performance)" echo " --enable-glusterfs enable GlusterFS backend" echo " --disable-glusterfs disable GlusterFS backend" echo " --enable-gcov enable test coverage analysis with gcov" @@ -3240,6 +3247,17 @@ else esac fi +if test "$coroutine_pool" = ""; then + if test "$coroutine" = "gthread"; then + coroutine_pool=no + else + coroutine_pool=yes + fi +fi +if test "$coroutine" = "gthread" -a "$coroutine_pool" = "yes"; then + error_exit "'gthread' coroutine backend does not support pool (use --disable-coroutine-pool)" +fi + ########################################## # check if we have open_by_handle_at @@ -3605,6 +3623,7 @@ echo "libiscsi support $libiscsi" echo "build guest agent $guest_agent" echo "seccomp support $seccomp" echo "coroutine backend $coroutine" +echo "coroutine pool $coroutine_pool" echo "GlusterFS support $glusterfs" echo "virtio-blk-data-plane $virtio_blk_data_plane" echo "gcov $gcov_tool" @@ -3954,6 +3973,11 @@ if test "$rbd" = "yes" ; then fi echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak +if test "$coroutine_pool" = "yes" ; then + echo "CONFIG_COROUTINE_POOL=1" >> $config_host_mak +else + echo "CONFIG_COROUTINE_POOL=0" >> $config_host_mak +fi if test "$open_by_handle_at" = "yes" ; then echo "CONFIG_OPEN_BY_HANDLE=y" >> $config_host_mak diff --git a/qemu-coroutine.c b/qemu-coroutine.c index 423430d..4708521 100644 --- a/qemu-coroutine.c +++ b/qemu-coroutine.c @@ -30,15 +30,17 @@ static unsigned int pool_size; Coroutine *qemu_coroutine_create(CoroutineEntry *entry) { - Coroutine *co; - - qemu_mutex_lock(&pool_lock); - co = QSLIST_FIRST(&pool); - if (co) { - QSLIST_REMOVE_HEAD(&pool, pool_next); - pool_size--; + Coroutine *co = NULL; + + if (CONFIG_COROUTINE_POOL) { + qemu_mutex_lock(&pool_lock); + co = QSLIST_FIRST(&pool); + if (co) { + QSLIST_REMOVE_HEAD(&pool, pool_next); + pool_size--; + } + qemu_mutex_unlock(&pool_lock); } - qemu_mutex_unlock(&pool_lock); if (!co) { co = qemu_coroutine_new(); @@ -51,15 +53,17 @@ Coroutine *qemu_coroutine_create(CoroutineEntry *entry) static void coroutine_delete(Coroutine *co) { - qemu_mutex_lock(&pool_lock); - if (pool_size < POOL_MAX_SIZE) { - QSLIST_INSERT_HEAD(&pool, co, pool_next); - co->caller = NULL; - pool_size++; + if (CONFIG_COROUTINE_POOL) { + qemu_mutex_lock(&pool_lock); + if (pool_size < POOL_MAX_SIZE) { + QSLIST_INSERT_HEAD(&pool, co, pool_next); + co->caller = NULL; + pool_size++; + qemu_mutex_unlock(&pool_lock); + return; + } qemu_mutex_unlock(&pool_lock); - return; } - qemu_mutex_unlock(&pool_lock); qemu_coroutine_delete(co); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:23 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Gd-0002lZ-Tk; Sat, 23 Nov 2013 03:52:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gc-0002lO-97 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:22 +0000 Received: from [193.109.254.147:54586] by server-9.bemta-14.messagelabs.com id A5/49-08751-57620925; Sat, 23 Nov 2013 03:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385178739!237086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9895 invoked from network); 23 Nov 2013 03:52:20 -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; 23 Nov 2013 03:52:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4GZ-00075F-4B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4GZ-0003wY-0K for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:19 +0000 Date: Sat, 23 Nov 2013 03:52:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] coroutine: add ./configure --disable-coroutine-pool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba20326a937421c50a775907dc9ac726bb9a9b50 Author: Stefan Hajnoczi AuthorDate: Wed Sep 11 16:42:35 2013 +0200 Commit: Michael Roth CommitDate: Mon Sep 30 22:57:15 2013 -0500 coroutine: add ./configure --disable-coroutine-pool The 'gthread' coroutine backend was written before the freelist (aka pool) existed in qemu-coroutine.c. This means that every thread is expected to exit when its coroutine terminates. It is not possible to reuse threads from a pool. This patch automatically disables the pool when 'gthread' is used. This allows the 'gthread' backend to work again (for example, tests/test-coroutine completes successfully instead of hanging). I considered implementing thread reuse but I don't want quirks like CPU affinity differences due to coroutine threads being recycled. The 'gthread' backend is a reference backend and it's therefore okay to skip the pool optimization. Note this patch also makes it easy to toggle the pool for benchmarking purposes: ./configure --with-coroutine-backend=ucontext \ --disable-coroutine-pool Reported-by: Gabriel Kerneis Signed-off-by: Stefan Hajnoczi Reviewed-by: Gabriel Kerneis Signed-off-by: Kevin Wolf (cherry picked from commit 70c60c089fdc6bf8a79324e492c13e8c08d55942) Signed-off-by: Michael Roth --- configure | 24 ++++++++++++++++++++++++ qemu-coroutine.c | 32 ++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 18fa608..4cf672d 100755 --- a/configure +++ b/configure @@ -235,6 +235,7 @@ guest_agent="" want_tools="yes" libiscsi="" coroutine="" +coroutine_pool="" seccomp="" glusterfs="" glusterfs_discard="no" @@ -871,6 +872,10 @@ for opt do ;; --with-coroutine=*) coroutine="$optarg" ;; + --disable-coroutine-pool) coroutine_pool="no" + ;; + --enable-coroutine-pool) coroutine_pool="yes" + ;; --disable-docs) docs="no" ;; --enable-docs) docs="yes" @@ -1152,6 +1157,8 @@ echo " --disable-seccomp disable seccomp support" echo " --enable-seccomp enables seccomp support" echo " --with-coroutine=BACKEND coroutine backend. Supported options:" echo " gthread, ucontext, sigaltstack, windows" +echo " --disable-coroutine-pool disable coroutine freelist (worse performance)" +echo " --enable-coroutine-pool enable coroutine freelist (better performance)" echo " --enable-glusterfs enable GlusterFS backend" echo " --disable-glusterfs disable GlusterFS backend" echo " --enable-gcov enable test coverage analysis with gcov" @@ -3240,6 +3247,17 @@ else esac fi +if test "$coroutine_pool" = ""; then + if test "$coroutine" = "gthread"; then + coroutine_pool=no + else + coroutine_pool=yes + fi +fi +if test "$coroutine" = "gthread" -a "$coroutine_pool" = "yes"; then + error_exit "'gthread' coroutine backend does not support pool (use --disable-coroutine-pool)" +fi + ########################################## # check if we have open_by_handle_at @@ -3605,6 +3623,7 @@ echo "libiscsi support $libiscsi" echo "build guest agent $guest_agent" echo "seccomp support $seccomp" echo "coroutine backend $coroutine" +echo "coroutine pool $coroutine_pool" echo "GlusterFS support $glusterfs" echo "virtio-blk-data-plane $virtio_blk_data_plane" echo "gcov $gcov_tool" @@ -3954,6 +3973,11 @@ if test "$rbd" = "yes" ; then fi echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak +if test "$coroutine_pool" = "yes" ; then + echo "CONFIG_COROUTINE_POOL=1" >> $config_host_mak +else + echo "CONFIG_COROUTINE_POOL=0" >> $config_host_mak +fi if test "$open_by_handle_at" = "yes" ; then echo "CONFIG_OPEN_BY_HANDLE=y" >> $config_host_mak diff --git a/qemu-coroutine.c b/qemu-coroutine.c index 423430d..4708521 100644 --- a/qemu-coroutine.c +++ b/qemu-coroutine.c @@ -30,15 +30,17 @@ static unsigned int pool_size; Coroutine *qemu_coroutine_create(CoroutineEntry *entry) { - Coroutine *co; - - qemu_mutex_lock(&pool_lock); - co = QSLIST_FIRST(&pool); - if (co) { - QSLIST_REMOVE_HEAD(&pool, pool_next); - pool_size--; + Coroutine *co = NULL; + + if (CONFIG_COROUTINE_POOL) { + qemu_mutex_lock(&pool_lock); + co = QSLIST_FIRST(&pool); + if (co) { + QSLIST_REMOVE_HEAD(&pool, pool_next); + pool_size--; + } + qemu_mutex_unlock(&pool_lock); } - qemu_mutex_unlock(&pool_lock); if (!co) { co = qemu_coroutine_new(); @@ -51,15 +53,17 @@ Coroutine *qemu_coroutine_create(CoroutineEntry *entry) static void coroutine_delete(Coroutine *co) { - qemu_mutex_lock(&pool_lock); - if (pool_size < POOL_MAX_SIZE) { - QSLIST_INSERT_HEAD(&pool, co, pool_next); - co->caller = NULL; - pool_size++; + if (CONFIG_COROUTINE_POOL) { + qemu_mutex_lock(&pool_lock); + if (pool_size < POOL_MAX_SIZE) { + QSLIST_INSERT_HEAD(&pool, co, pool_next); + co->caller = NULL; + pool_size++; + qemu_mutex_unlock(&pool_lock); + return; + } qemu_mutex_unlock(&pool_lock); - return; } - qemu_mutex_unlock(&pool_lock); qemu_coroutine_delete(co); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Go-0002n7-0S; Sat, 23 Nov 2013 03:52:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gm-0002mq-IJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:32 +0000 Received: from [193.109.254.147:54838] by server-4.bemta-14.messagelabs.com id 67/42-22292-F7620925; Sat, 23 Nov 2013 03:52:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1385178749!217505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29930 invoked from network); 23 Nov 2013 03:52:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gj-00075N-A0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Gj-0003x2-88 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:29 +0000 Date: Sat, 23 Nov 2013 03:52:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: Adjust qemu wakeup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc05a488b49f903e404323b76ca9b675318393fc Author: Liu, Jinsong AuthorDate: Wed Sep 25 16:38:29 2013 +0000 Commit: Michael Roth CommitDate: Tue Oct 1 10:50:35 2013 -0500 qemu: Adjust qemu wakeup Currently Xen hvm s3 has a bug coming from the difference between qemu-traditioanl and qemu-xen. For qemu-traditional, the way to resume from hvm s3 is via 'xl trigger' command. However, for qemu-xen, the way to resume from hvm s3 inherited from standard qemu, i.e. via QMP, and it doesn't work under Xen. The root cause is, for qemu-xen, 'xl trigger' command didn't reset devices, while QMP didn't unpause hvm domain though they did qemu system reset. We have two qemu patches and one xl patch to fix Xen hvm s3 bug. This patch is the qemu patch 1. It adjusts qemu wakeup so that Xen s3 resume logic (which will be implemented at qemu patch 2) will be notified after qemu system reset. Signed-off-by: Liu Jinsong Signed-off-by: Stefano Stabellini Reviewed-by: Paolo Bonzini Reviewed-by: Anthony PERARD (cherry picked from commit 4bc78a877252d772b983810a7d2c0be00e9be70e) Signed-off-by: Michael Roth --- hw/acpi/core.c | 3 ++- include/sysemu/sysemu.h | 4 +++- vl.c | 15 +++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index b07feda..769cfdb 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -324,12 +324,13 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS); break; case QEMU_WAKEUP_REASON_OTHER: - default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. Pretend that resume was caused by power button */ ar->pm1.evt.sts |= (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_POWER_BUTTON_STATUS); break; + default: + break; } } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index d7a77b6..1a77c99 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -39,9 +39,11 @@ int vm_stop(RunState state); int vm_stop_force_state(RunState state); typedef enum WakeupReason { - QEMU_WAKEUP_REASON_OTHER = 0, + /* Always keep QEMU_WAKEUP_REASON_NONE = 0 */ + QEMU_WAKEUP_REASON_NONE = 0, QEMU_WAKEUP_REASON_RTC, QEMU_WAKEUP_REASON_PMTIMER, + QEMU_WAKEUP_REASON_OTHER, } WakeupReason; void qemu_system_reset_request(void); diff --git a/vl.c b/vl.c index f422a1c..2160933 100644 --- a/vl.c +++ b/vl.c @@ -1792,14 +1792,14 @@ static pid_t shutdown_pid; static int powerdown_requested; static int debug_requested; static int suspend_requested; -static int wakeup_requested; +static WakeupReason wakeup_reason; static NotifierList powerdown_notifiers = NOTIFIER_LIST_INITIALIZER(powerdown_notifiers); static NotifierList suspend_notifiers = NOTIFIER_LIST_INITIALIZER(suspend_notifiers); static NotifierList wakeup_notifiers = NOTIFIER_LIST_INITIALIZER(wakeup_notifiers); -static uint32_t wakeup_reason_mask = ~0; +static uint32_t wakeup_reason_mask = ~(1 << QEMU_WAKEUP_REASON_NONE); static RunState vmstop_requested = RUN_STATE_MAX; int qemu_shutdown_requested_get(void) @@ -1849,11 +1849,9 @@ static int qemu_suspend_requested(void) return r; } -static int qemu_wakeup_requested(void) +static WakeupReason qemu_wakeup_requested(void) { - int r = wakeup_requested; - wakeup_requested = 0; - return r; + return wakeup_reason; } static int qemu_powerdown_requested(void) @@ -1970,8 +1968,7 @@ void qemu_system_wakeup_request(WakeupReason reason) return; } runstate_set(RUN_STATE_RUNNING); - notifier_list_notify(&wakeup_notifiers, &reason); - wakeup_requested = 1; + wakeup_reason = reason; qemu_notify_event(); } @@ -2063,6 +2060,8 @@ static bool main_loop_should_exit(void) pause_all_vcpus(); cpu_synchronize_all_states(); qemu_system_reset(VMRESET_SILENT); + notifier_list_notify(&wakeup_notifiers, &wakeup_reason); + wakeup_reason = QEMU_WAKEUP_REASON_NONE; resume_all_vcpus(); monitor_protocol_event(QEVENT_WAKEUP, NULL); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:34 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Go-0002n7-0S; Sat, 23 Nov 2013 03:52:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gm-0002mq-IJ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:32 +0000 Received: from [193.109.254.147:54838] by server-4.bemta-14.messagelabs.com id 67/42-22292-F7620925; Sat, 23 Nov 2013 03:52:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1385178749!217505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29930 invoked from network); 23 Nov 2013 03:52:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gj-00075N-A0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Gj-0003x2-88 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:29 +0000 Date: Sat, 23 Nov 2013 03:52:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: Adjust qemu wakeup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc05a488b49f903e404323b76ca9b675318393fc Author: Liu, Jinsong AuthorDate: Wed Sep 25 16:38:29 2013 +0000 Commit: Michael Roth CommitDate: Tue Oct 1 10:50:35 2013 -0500 qemu: Adjust qemu wakeup Currently Xen hvm s3 has a bug coming from the difference between qemu-traditioanl and qemu-xen. For qemu-traditional, the way to resume from hvm s3 is via 'xl trigger' command. However, for qemu-xen, the way to resume from hvm s3 inherited from standard qemu, i.e. via QMP, and it doesn't work under Xen. The root cause is, for qemu-xen, 'xl trigger' command didn't reset devices, while QMP didn't unpause hvm domain though they did qemu system reset. We have two qemu patches and one xl patch to fix Xen hvm s3 bug. This patch is the qemu patch 1. It adjusts qemu wakeup so that Xen s3 resume logic (which will be implemented at qemu patch 2) will be notified after qemu system reset. Signed-off-by: Liu Jinsong Signed-off-by: Stefano Stabellini Reviewed-by: Paolo Bonzini Reviewed-by: Anthony PERARD (cherry picked from commit 4bc78a877252d772b983810a7d2c0be00e9be70e) Signed-off-by: Michael Roth --- hw/acpi/core.c | 3 ++- include/sysemu/sysemu.h | 4 +++- vl.c | 15 +++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index b07feda..769cfdb 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -324,12 +324,13 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS); break; case QEMU_WAKEUP_REASON_OTHER: - default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. Pretend that resume was caused by power button */ ar->pm1.evt.sts |= (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_POWER_BUTTON_STATUS); break; + default: + break; } } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index d7a77b6..1a77c99 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -39,9 +39,11 @@ int vm_stop(RunState state); int vm_stop_force_state(RunState state); typedef enum WakeupReason { - QEMU_WAKEUP_REASON_OTHER = 0, + /* Always keep QEMU_WAKEUP_REASON_NONE = 0 */ + QEMU_WAKEUP_REASON_NONE = 0, QEMU_WAKEUP_REASON_RTC, QEMU_WAKEUP_REASON_PMTIMER, + QEMU_WAKEUP_REASON_OTHER, } WakeupReason; void qemu_system_reset_request(void); diff --git a/vl.c b/vl.c index f422a1c..2160933 100644 --- a/vl.c +++ b/vl.c @@ -1792,14 +1792,14 @@ static pid_t shutdown_pid; static int powerdown_requested; static int debug_requested; static int suspend_requested; -static int wakeup_requested; +static WakeupReason wakeup_reason; static NotifierList powerdown_notifiers = NOTIFIER_LIST_INITIALIZER(powerdown_notifiers); static NotifierList suspend_notifiers = NOTIFIER_LIST_INITIALIZER(suspend_notifiers); static NotifierList wakeup_notifiers = NOTIFIER_LIST_INITIALIZER(wakeup_notifiers); -static uint32_t wakeup_reason_mask = ~0; +static uint32_t wakeup_reason_mask = ~(1 << QEMU_WAKEUP_REASON_NONE); static RunState vmstop_requested = RUN_STATE_MAX; int qemu_shutdown_requested_get(void) @@ -1849,11 +1849,9 @@ static int qemu_suspend_requested(void) return r; } -static int qemu_wakeup_requested(void) +static WakeupReason qemu_wakeup_requested(void) { - int r = wakeup_requested; - wakeup_requested = 0; - return r; + return wakeup_reason; } static int qemu_powerdown_requested(void) @@ -1970,8 +1968,7 @@ void qemu_system_wakeup_request(WakeupReason reason) return; } runstate_set(RUN_STATE_RUNNING); - notifier_list_notify(&wakeup_notifiers, &reason); - wakeup_requested = 1; + wakeup_reason = reason; qemu_notify_event(); } @@ -2063,6 +2060,8 @@ static bool main_loop_should_exit(void) pause_all_vcpus(); cpu_synchronize_all_states(); qemu_system_reset(VMRESET_SILENT); + notifier_list_notify(&wakeup_notifiers, &wakeup_reason); + wakeup_reason = QEMU_WAKEUP_REASON_NONE; resume_all_vcpus(); monitor_protocol_event(QEVENT_WAKEUP, NULL); } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Gx-0002oU-3C; Sat, 23 Nov 2013 03:52:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gw-0002oJ-4G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:42 +0000 Received: from [85.158.137.68:45895] by server-14.bemta-3.messagelabs.com id F6/6B-06105-98620925; Sat, 23 Nov 2013 03:52:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385178759!3293145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17436 invoked from network); 23 Nov 2013 03:52:40 -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; 23 Nov 2013 03:52:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gt-00075T-FX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Gt-0003xS-D0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:39 +0000 Date: Sat, 23 Nov 2013 03:52:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: Add qemu xen logic for Xen HVM 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 1b5f7709411a412ec8ce21004a47f51ab6c3f3ad Author: Liu, Jinsong AuthorDate: Wed Sep 25 16:40:23 2013 +0000 Commit: Michael Roth CommitDate: Tue Oct 1 10:50:42 2013 -0500 qemu: Add qemu xen logic for Xen HVM S3 resume This patch is qemu patch 2 to fix Xen HVM S3 bug, adding qemu xen logic. When qemu wakeup, qemu xen logic is notified and hypercall to xen hypervisor to unpause domain. Signed-off-by: Liu Jinsong Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 11addd0ab9371af2b6ec028c7fe4e4c4992252fc) Signed-off-by: Michael Roth --- xen-all.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen-all.c b/xen-all.c index e1d0694..7894ac6 100644 --- a/xen-all.c +++ b/xen-all.c @@ -98,6 +98,7 @@ typedef struct XenIOState { Notifier exit; Notifier suspend; + Notifier wakeup; } XenIOState; /* Xen specific function for piix pci */ @@ -1060,6 +1061,11 @@ static void xen_read_physmap(XenIOState *state) free(entries); } +static void xen_wakeup_notifier(Notifier *notifier, void *data) +{ + xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); +} + int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; @@ -1089,6 +1095,9 @@ int xen_hvm_init(MemoryRegion **ram_memory) state->suspend.notify = xen_suspend_notifier; qemu_register_suspend_notifier(&state->suspend); + state->wakeup.notify = xen_wakeup_notifier; + qemu_register_wakeup_notifier(&state->wakeup); + xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn); DPRINTF("shared page at pfn %lx\n", ioreq_pfn); state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:43 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4Gx-0002oU-3C; Sat, 23 Nov 2013 03:52:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gw-0002oJ-4G for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:42 +0000 Received: from [85.158.137.68:45895] by server-14.bemta-3.messagelabs.com id F6/6B-06105-98620925; Sat, 23 Nov 2013 03:52:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1385178759!3293145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17436 invoked from network); 23 Nov 2013 03:52:40 -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; 23 Nov 2013 03:52:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Gt-00075T-FX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4Gt-0003xS-D0 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:39 +0000 Date: Sat, 23 Nov 2013 03:52:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: Add qemu xen logic for Xen HVM 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 1b5f7709411a412ec8ce21004a47f51ab6c3f3ad Author: Liu, Jinsong AuthorDate: Wed Sep 25 16:40:23 2013 +0000 Commit: Michael Roth CommitDate: Tue Oct 1 10:50:42 2013 -0500 qemu: Add qemu xen logic for Xen HVM S3 resume This patch is qemu patch 2 to fix Xen HVM S3 bug, adding qemu xen logic. When qemu wakeup, qemu xen logic is notified and hypercall to xen hypervisor to unpause domain. Signed-off-by: Liu Jinsong Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD (cherry picked from commit 11addd0ab9371af2b6ec028c7fe4e4c4992252fc) Signed-off-by: Michael Roth --- xen-all.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen-all.c b/xen-all.c index e1d0694..7894ac6 100644 --- a/xen-all.c +++ b/xen-all.c @@ -98,6 +98,7 @@ typedef struct XenIOState { Notifier exit; Notifier suspend; + Notifier wakeup; } XenIOState; /* Xen specific function for piix pci */ @@ -1060,6 +1061,11 @@ static void xen_read_physmap(XenIOState *state) free(entries); } +static void xen_wakeup_notifier(Notifier *notifier, void *data) +{ + xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); +} + int xen_hvm_init(MemoryRegion **ram_memory) { int i, rc; @@ -1089,6 +1095,9 @@ int xen_hvm_init(MemoryRegion **ram_memory) state->suspend.notify = xen_suspend_notifier; qemu_register_suspend_notifier(&state->suspend); + state->wakeup.notify = xen_wakeup_notifier; + qemu_register_wakeup_notifier(&state->wakeup); + xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn); DPRINTF("shared page at pfn %lx\n", ioreq_pfn); state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4H8-0002qc-7v; Sat, 23 Nov 2013 03:52:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4H6-0002qM-Id for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:52 +0000 Received: from [85.158.139.211:39870] by server-12.bemta-5.messagelabs.com id AC/74-30017-39620925; Sat, 23 Nov 2013 03:52:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1385178769!1853595!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25897 invoked from network); 23 Nov 2013 03:52:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4H3-00075Z-Lg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4H3-0003ya-KK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:49 +0000 Date: Sat, 23 Nov 2013 03:52:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: Allocate SCSITargetReq r->buf dynamically X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdcbe7d587a64dec0db0d3c9a3b230c39efbfeef Author: Asias He AuthorDate: Fri Sep 13 14:56:55 2013 +0800 Commit: Michael Roth CommitDate: Fri Oct 4 10:18:56 2013 -0500 scsi: Allocate SCSITargetReq r->buf dynamically BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1007330 Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6282465 This is the backport of the following commit. The patch is not sent public since it is a embargoed bug. r->buf is hardcoded to 2056 which is (256 + 1) * 8, allowing 256 luns at most. If more than 256 luns are specified by user, we have buffer overflow in scsi_target_emulate_report_luns. To fix, we allocate the buffer dynamically. Signed-off-by: Asias He Signed-off-by: Asias He Signed-off-by: Paolo Bonzini *s/&r->buf/r->buf/ due to type change Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 44 +++++++++++++++++++++++++++++++++----------- include/hw/scsi/scsi.h | 2 ++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 8fe4f4c..ad26c25 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -11,6 +11,8 @@ static char *scsibus_get_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static void scsi_req_dequeue(SCSIRequest *req); +static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len); +static void scsi_target_free_buf(SCSIRequest *req); static Property scsi_props[] = { DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0), @@ -317,7 +319,8 @@ typedef struct SCSITargetReq SCSITargetReq; struct SCSITargetReq { SCSIRequest req; int len; - uint8_t buf[2056]; + uint8_t *buf; + int buf_len; }; static void store_lun(uint8_t *outbuf, int lun) @@ -361,14 +364,12 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) if (!found_lun0) { n += 8; } - len = MIN(n + 8, r->req.cmd.xfer & ~7); - if (len > sizeof(r->buf)) { - /* TODO: > 256 LUNs? */ - return false; - } + scsi_target_alloc_buf(&r->req, n + 8); + + len = MIN(n + 8, r->req.cmd.xfer & ~7); memset(r->buf, 0, len); - stl_be_p(&r->buf, n); + stl_be_p(r->buf, n); i = found_lun0 ? 8 : 16; QTAILQ_FOREACH(kid, &r->req.bus->qbus.children, sibling) { DeviceState *qdev = kid->child; @@ -387,6 +388,9 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) static bool scsi_target_emulate_inquiry(SCSITargetReq *r) { assert(r->req.dev->lun != r->req.lun); + + scsi_target_alloc_buf(&r->req, SCSI_INQUIRY_LEN); + if (r->req.cmd.buf[1] & 0x2) { /* Command support data - optional, not implemented */ return false; @@ -411,7 +415,7 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) return false; } /* done with EVPD */ - assert(r->len < sizeof(r->buf)); + assert(r->len < r->buf_len); r->len = MIN(r->req.cmd.xfer, r->len); return true; } @@ -455,8 +459,8 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) } break; case REQUEST_SENSE: - r->len = scsi_device_get_sense(r->req.dev, r->buf, - MIN(req->cmd.xfer, sizeof r->buf), + scsi_target_alloc_buf(&r->req, SCSI_SENSE_LEN); + r->len = scsi_device_get_sense(r->req.dev, r->buf, r->buf_len, (req->cmd.buf[1] & 1) == 0); if (r->req.dev->sense_is_ua) { scsi_device_unit_attention_reported(req->dev); @@ -501,11 +505,29 @@ static uint8_t *scsi_target_get_buf(SCSIRequest *req) return r->buf; } +static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len) +{ + SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); + + r->buf = g_malloc(len); + r->buf_len = len; + + return r->buf; +} + +static void scsi_target_free_buf(SCSIRequest *req) +{ + SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); + + g_free(r->buf); +} + static const struct SCSIReqOps reqops_target_command = { .size = sizeof(SCSITargetReq), .send_command = scsi_target_send_command, .read_data = scsi_target_read_data, .get_buf = scsi_target_get_buf, + .free_req = scsi_target_free_buf, }; @@ -1365,7 +1387,7 @@ int scsi_build_sense(uint8_t *in_buf, int in_len, buf[7] = 10; buf[12] = sense.asc; buf[13] = sense.ascq; - return MIN(len, 18); + return MIN(len, SCSI_SENSE_LEN); } else { /* Return descriptor format sense buffer */ buf[0] = 0x72; diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 8786531..18cb694 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -9,6 +9,8 @@ #define MAX_SCSI_DEVS 255 #define SCSI_CMD_BUF_SIZE 16 +#define SCSI_SENSE_LEN 18 +#define SCSI_INQUIRY_LEN 36 typedef struct SCSIBus SCSIBus; typedef struct SCSIBusInfo SCSIBusInfo; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:52:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:52: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 1Vk4H8-0002qc-7v; Sat, 23 Nov 2013 03:52:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4H6-0002qM-Id for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:52 +0000 Received: from [85.158.139.211:39870] by server-12.bemta-5.messagelabs.com id AC/74-30017-39620925; Sat, 23 Nov 2013 03:52:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1385178769!1853595!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.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25897 invoked from network); 23 Nov 2013 03:52:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:52:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4H3-00075Z-Lg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4H3-0003ya-KK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:49 +0000 Date: Sat, 23 Nov 2013 03:52:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: Allocate SCSITargetReq r->buf dynamically X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdcbe7d587a64dec0db0d3c9a3b230c39efbfeef Author: Asias He AuthorDate: Fri Sep 13 14:56:55 2013 +0800 Commit: Michael Roth CommitDate: Fri Oct 4 10:18:56 2013 -0500 scsi: Allocate SCSITargetReq r->buf dynamically BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1007330 Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6282465 This is the backport of the following commit. The patch is not sent public since it is a embargoed bug. r->buf is hardcoded to 2056 which is (256 + 1) * 8, allowing 256 luns at most. If more than 256 luns are specified by user, we have buffer overflow in scsi_target_emulate_report_luns. To fix, we allocate the buffer dynamically. Signed-off-by: Asias He Signed-off-by: Asias He Signed-off-by: Paolo Bonzini *s/&r->buf/r->buf/ due to type change Signed-off-by: Michael Roth --- hw/scsi/scsi-bus.c | 44 +++++++++++++++++++++++++++++++++----------- include/hw/scsi/scsi.h | 2 ++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 8fe4f4c..ad26c25 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -11,6 +11,8 @@ static char *scsibus_get_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static void scsi_req_dequeue(SCSIRequest *req); +static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len); +static void scsi_target_free_buf(SCSIRequest *req); static Property scsi_props[] = { DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0), @@ -317,7 +319,8 @@ typedef struct SCSITargetReq SCSITargetReq; struct SCSITargetReq { SCSIRequest req; int len; - uint8_t buf[2056]; + uint8_t *buf; + int buf_len; }; static void store_lun(uint8_t *outbuf, int lun) @@ -361,14 +364,12 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) if (!found_lun0) { n += 8; } - len = MIN(n + 8, r->req.cmd.xfer & ~7); - if (len > sizeof(r->buf)) { - /* TODO: > 256 LUNs? */ - return false; - } + scsi_target_alloc_buf(&r->req, n + 8); + + len = MIN(n + 8, r->req.cmd.xfer & ~7); memset(r->buf, 0, len); - stl_be_p(&r->buf, n); + stl_be_p(r->buf, n); i = found_lun0 ? 8 : 16; QTAILQ_FOREACH(kid, &r->req.bus->qbus.children, sibling) { DeviceState *qdev = kid->child; @@ -387,6 +388,9 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) static bool scsi_target_emulate_inquiry(SCSITargetReq *r) { assert(r->req.dev->lun != r->req.lun); + + scsi_target_alloc_buf(&r->req, SCSI_INQUIRY_LEN); + if (r->req.cmd.buf[1] & 0x2) { /* Command support data - optional, not implemented */ return false; @@ -411,7 +415,7 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) return false; } /* done with EVPD */ - assert(r->len < sizeof(r->buf)); + assert(r->len < r->buf_len); r->len = MIN(r->req.cmd.xfer, r->len); return true; } @@ -455,8 +459,8 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) } break; case REQUEST_SENSE: - r->len = scsi_device_get_sense(r->req.dev, r->buf, - MIN(req->cmd.xfer, sizeof r->buf), + scsi_target_alloc_buf(&r->req, SCSI_SENSE_LEN); + r->len = scsi_device_get_sense(r->req.dev, r->buf, r->buf_len, (req->cmd.buf[1] & 1) == 0); if (r->req.dev->sense_is_ua) { scsi_device_unit_attention_reported(req->dev); @@ -501,11 +505,29 @@ static uint8_t *scsi_target_get_buf(SCSIRequest *req) return r->buf; } +static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len) +{ + SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); + + r->buf = g_malloc(len); + r->buf_len = len; + + return r->buf; +} + +static void scsi_target_free_buf(SCSIRequest *req) +{ + SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); + + g_free(r->buf); +} + static const struct SCSIReqOps reqops_target_command = { .size = sizeof(SCSITargetReq), .send_command = scsi_target_send_command, .read_data = scsi_target_read_data, .get_buf = scsi_target_get_buf, + .free_req = scsi_target_free_buf, }; @@ -1365,7 +1387,7 @@ int scsi_build_sense(uint8_t *in_buf, int in_len, buf[7] = 10; buf[12] = sense.asc; buf[13] = sense.ascq; - return MIN(len, 18); + return MIN(len, SCSI_SENSE_LEN); } else { /* Return descriptor format sense buffer */ buf[0] = 0x72; diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 8786531..18cb694 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -9,6 +9,8 @@ #define MAX_SCSI_DEVS 255 #define SCSI_CMD_BUF_SIZE 16 +#define SCSI_SENSE_LEN 18 +#define SCSI_INQUIRY_LEN 36 typedef struct SCSIBus SCSIBus; typedef struct SCSIBusInfo SCSIBusInfo; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4HH-0002sB-Al; Sat, 23 Nov 2013 03:53:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HG-0002s2-ED for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:02 +0000 Received: from [85.158.137.68:50429] by server-16.bemta-3.messagelabs.com id C2/12-26128-D9620925; Sat, 23 Nov 2013 03:53:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385178780!3312637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19919 invoked from network); 23 Nov 2013 03:53:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HD-00075i-Rs for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HD-0003yw-QQ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:59 +0000 Date: Sat, 23 Nov 2013 03:52:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Update VERSION for 1.6.1 release X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62ecc3a0e3c77a4944c92a02dd7fae2ab1f2290d Author: Michael Roth AuthorDate: Fri Oct 4 10:21:43 2013 -0500 Commit: Michael Roth CommitDate: Fri Oct 4 10:21:43 2013 -0500 Update VERSION for 1.6.1 release Signed-off-by: Michael Roth --- VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index dc1e644..9c6d629 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 +1.6.1 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:03 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4HH-0002sB-Al; Sat, 23 Nov 2013 03:53:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HG-0002s2-ED for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:02 +0000 Received: from [85.158.137.68:50429] by server-16.bemta-3.messagelabs.com id C2/12-26128-D9620925; Sat, 23 Nov 2013 03:53:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385178780!3312637!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19919 invoked from network); 23 Nov 2013 03:53:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 03:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HD-00075i-Rs for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HD-0003yw-QQ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:52:59 +0000 Date: Sat, 23 Nov 2013 03:52:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Update VERSION for 1.6.1 release X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62ecc3a0e3c77a4944c92a02dd7fae2ab1f2290d Author: Michael Roth AuthorDate: Fri Oct 4 10:21:43 2013 -0500 Commit: Michael Roth CommitDate: Fri Oct 4 10:21:43 2013 -0500 Update VERSION for 1.6.1 release Signed-off-by: Michael Roth --- VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index dc1e644..9c6d629 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 +1.6.1 -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4HS-0002tg-G2; Sat, 23 Nov 2013 03:53:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HQ-0002tW-RC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:13 +0000 Received: from [193.109.254.147:55810] by server-6.bemta-14.messagelabs.com id C9/F6-19621-7A620925; Sat, 23 Nov 2013 03:53:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178790!236658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23622 invoked from network); 23 Nov 2013 03:53: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; 23 Nov 2013 03:53:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HO-00076H-43 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HO-0003zV-17 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:10 +0000 Date: Sat, 23 Nov 2013 03:53:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote branch 'origin/stable-1.6' into xen-staging-master-9 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d84e4524e30413b2a1d724754e76a7d2480466f3 Merge: e381ccab5afe6b5e808aa550d8bd22b1d0757fde 62ecc3a0e3c77a4944c92a02dd7fae2ab1f2290d Author: Stefano Stabellini AuthorDate: Thu Oct 10 11:02:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Thu Oct 10 11:02:48 2013 +0000 Merge remote branch 'origin/stable-1.6' into xen-staging-master-9 Conflicts: xen-all.c VERSION | 2 +- block.c | 11 ++++++--- block/cow.c | 6 ++++- block/qcow2.c | 4 +-- block/raw-win32.c | 36 ++++++++++++++++++++++++------ block/rbd.c | 3 +- block/stream.c | 2 +- block/vmdk.c | 6 ++-- blockdev.c | 2 +- configure | 24 ++++++++++++++++++++ exec.c | 9 ++++++- gdbstub.c | 6 +++- hw/acpi/core.c | 3 +- hw/acpi/piix4.c | 1 + hw/audio/adlib.c | 2 +- hw/block/virtio-blk.c | 24 ++++++++++++++++++- hw/char/spapr_vty.c | 2 + hw/display/qxl-render.c | 15 ++++++++---- hw/i386/kvmvapic.c | 17 ++++++++++---- hw/net/ne2000.c | 2 +- hw/net/pcnet-pci.c | 4 +- hw/pci-host/piix.c | 9 +++++-- hw/pci-host/q35.c | 8 ++++-- hw/scsi/scsi-bus.c | 46 ++++++++++++++++++++++++++++---------- hw/usb/core.c | 7 +++-- hw/usb/dev-hid.c | 2 +- hw/usb/dev-hub.c | 6 +---- hw/usb/hcd-ehci.c | 7 ++--- hw/usb/hcd-ehci.h | 1 + hw/usb/hcd-xhci.c | 47 +++++++++++++++++++++++++++++++++------ hw/virtio/virtio-pci.c | 3 +- hw/virtio/virtio.c | 2 +- include/exec/ioport.h | 4 +++ include/hw/i386/pc.h | 11 ++++++++- include/hw/scsi/scsi.h | 2 + include/hw/virtio/virtio-blk.h | 1 + include/qom/cpu.h | 2 + include/sysemu/sysemu.h | 4 ++- ioport.c | 16 +++++++++++++ memory.c | 2 +- migration-rdma.c | 8 ++++-- net/tap-bsd.c | 11 --------- qemu-char.c | 12 +++------ qemu-coroutine.c | 32 +++++++++++++++------------ qemu-img.c | 16 ++++++++++++- qemu-io-cmds.c | 4 +++ qom/cpu.c | 2 +- scripts/qapi-types.py | 5 +++- scripts/qapi.py | 2 +- target-i386/helper.c | 34 +++++++++++++--------------- target-ppc/translate.c | 4 +- tci.c | 12 ---------- util/iov.c | 10 +++----- vl.c | 15 ++++++------ xen-all.c | 9 +++++++ 55 files changed, 362 insertions(+), 175 deletions(-) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4HS-0002tg-G2; Sat, 23 Nov 2013 03:53:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HQ-0002tW-RC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:13 +0000 Received: from [193.109.254.147:55810] by server-6.bemta-14.messagelabs.com id C9/F6-19621-7A620925; Sat, 23 Nov 2013 03:53:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385178790!236658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23622 invoked from network); 23 Nov 2013 03:53: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; 23 Nov 2013 03:53:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HO-00076H-43 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HO-0003zV-17 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:10 +0000 Date: Sat, 23 Nov 2013 03:53:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Merge remote branch 'origin/stable-1.6' into xen-staging-master-9 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d84e4524e30413b2a1d724754e76a7d2480466f3 Merge: e381ccab5afe6b5e808aa550d8bd22b1d0757fde 62ecc3a0e3c77a4944c92a02dd7fae2ab1f2290d Author: Stefano Stabellini AuthorDate: Thu Oct 10 11:02:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Thu Oct 10 11:02:48 2013 +0000 Merge remote branch 'origin/stable-1.6' into xen-staging-master-9 Conflicts: xen-all.c VERSION | 2 +- block.c | 11 ++++++--- block/cow.c | 6 ++++- block/qcow2.c | 4 +-- block/raw-win32.c | 36 ++++++++++++++++++++++++------ block/rbd.c | 3 +- block/stream.c | 2 +- block/vmdk.c | 6 ++-- blockdev.c | 2 +- configure | 24 ++++++++++++++++++++ exec.c | 9 ++++++- gdbstub.c | 6 +++- hw/acpi/core.c | 3 +- hw/acpi/piix4.c | 1 + hw/audio/adlib.c | 2 +- hw/block/virtio-blk.c | 24 ++++++++++++++++++- hw/char/spapr_vty.c | 2 + hw/display/qxl-render.c | 15 ++++++++---- hw/i386/kvmvapic.c | 17 ++++++++++---- hw/net/ne2000.c | 2 +- hw/net/pcnet-pci.c | 4 +- hw/pci-host/piix.c | 9 +++++-- hw/pci-host/q35.c | 8 ++++-- hw/scsi/scsi-bus.c | 46 ++++++++++++++++++++++++++++---------- hw/usb/core.c | 7 +++-- hw/usb/dev-hid.c | 2 +- hw/usb/dev-hub.c | 6 +---- hw/usb/hcd-ehci.c | 7 ++--- hw/usb/hcd-ehci.h | 1 + hw/usb/hcd-xhci.c | 47 +++++++++++++++++++++++++++++++++------ hw/virtio/virtio-pci.c | 3 +- hw/virtio/virtio.c | 2 +- include/exec/ioport.h | 4 +++ include/hw/i386/pc.h | 11 ++++++++- include/hw/scsi/scsi.h | 2 + include/hw/virtio/virtio-blk.h | 1 + include/qom/cpu.h | 2 + include/sysemu/sysemu.h | 4 ++- ioport.c | 16 +++++++++++++ memory.c | 2 +- migration-rdma.c | 8 ++++-- net/tap-bsd.c | 11 --------- qemu-char.c | 12 +++------ qemu-coroutine.c | 32 +++++++++++++++------------ qemu-img.c | 16 ++++++++++++- qemu-io-cmds.c | 4 +++ qom/cpu.c | 2 +- scripts/qapi-types.py | 5 +++- scripts/qapi.py | 2 +- target-i386/helper.c | 34 +++++++++++++--------------- target-ppc/translate.c | 4 +- tci.c | 12 ---------- util/iov.c | 10 +++----- vl.c | 15 ++++++------ xen-all.c | 9 +++++++ 55 files changed, 362 insertions(+), 175 deletions(-) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4Hc-0002vB-J5; Sat, 23 Nov 2013 03:53:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ha-0002ut-OX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:22 +0000 Received: from [85.158.143.35:3285] by server-2.bemta-4.messagelabs.com id F2/11-11386-2B620925; Sat, 23 Nov 2013 03:53:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178800!538317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22237 invoked from network); 23 Nov 2013 03:53:21 -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; 23 Nov 2013 03:53:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HY-00076N-AC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HY-0003zr-86 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:20 +0000 Date: Sat, 23 Nov 2013 03:53:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_disk: mark ioreq as mapped before unmapping in error case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b97307ecaad98360f41ea36cd9674ef810c4f8cf Author: Matthew Daley AuthorDate: Thu Oct 10 14:10:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Thu Oct 10 14:10:48 2013 +0000 xen_disk: mark ioreq as mapped before unmapping in error case Commit 4472beae modified the semantics of ioreq_{un,}map so that they are idempotent if called when they're not needed (ie., twice in a row). However, it neglected to handle the case where batch mapping is not being used (the default), and one of the grants fails to map. In this case, ioreq_unmap will be called to unwind and unmap any mappings already performed, but ioreq_unmap simply returns due to the aforementioned change (the ioreq has not already been marked as mapped). The frontend user can therefore force xen_disk to leak grant mappings, a per-domain limited resource. Fix by marking the ioreq as mapped before calling ioreq_unmap in this situation. Signed-off-by: Matthew Daley Signed-off-by: Stefano Stabellini --- hw/block/xen_disk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 727f433..03e30d7 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -405,6 +405,7 @@ static int ioreq_map(struct ioreq *ioreq) xen_be_printf(&ioreq->blkdev->xendev, 0, "can't map grant ref %d (%s, %d maps)\n", refs[i], strerror(errno), ioreq->blkdev->cnt_map); + ioreq->mapped = 1; ioreq_unmap(ioreq); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 03:53:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 03:53: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 1Vk4Hc-0002vB-J5; Sat, 23 Nov 2013 03:53:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4Ha-0002ut-OX for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:22 +0000 Received: from [85.158.143.35:3285] by server-2.bemta-4.messagelabs.com id F2/11-11386-2B620925; Sat, 23 Nov 2013 03:53:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1385178800!538317!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22237 invoked from network); 23 Nov 2013 03:53:21 -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; 23 Nov 2013 03:53:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk4HY-00076N-AC for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk4HY-0003zr-86 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 03:53:20 +0000 Date: Sat, 23 Nov 2013 03:53:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_disk: mark ioreq as mapped before unmapping in error case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b97307ecaad98360f41ea36cd9674ef810c4f8cf Author: Matthew Daley AuthorDate: Thu Oct 10 14:10:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Thu Oct 10 14:10:48 2013 +0000 xen_disk: mark ioreq as mapped before unmapping in error case Commit 4472beae modified the semantics of ioreq_{un,}map so that they are idempotent if called when they're not needed (ie., twice in a row). However, it neglected to handle the case where batch mapping is not being used (the default), and one of the grants fails to map. In this case, ioreq_unmap will be called to unwind and unmap any mappings already performed, but ioreq_unmap simply returns due to the aforementioned change (the ioreq has not already been marked as mapped). The frontend user can therefore force xen_disk to leak grant mappings, a per-domain limited resource. Fix by marking the ioreq as mapped before calling ioreq_unmap in this situation. Signed-off-by: Matthew Daley Signed-off-by: Stefano Stabellini --- hw/block/xen_disk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 727f433..03e30d7 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -405,6 +405,7 @@ static int ioreq_map(struct ioreq *ioreq) xen_be_printf(&ioreq->blkdev->xendev, 0, "can't map grant ref %d (%s, %d maps)\n", refs[i], strerror(errno), ioreq->blkdev->cnt_map); + ioreq->mapped = 1; ioreq_unmap(ioreq); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09: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 1Vk9F7-0004Oo-84; Sat, 23 Nov 2013 09:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9F5-0004Of-Ik for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:07 +0000 Received: from [85.158.137.68:22751] by server-8.bemta-3.messagelabs.com id 4C/8C-31081-A2170925; Sat, 23 Nov 2013 09:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1385197864!3324533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8080 invoked from network); 23 Nov 2013 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9F2-0002ai-Fk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9F2-00042c-Ar for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:04 +0000 Date: Sat, 23 Nov 2013 09:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: refactor show_trace() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f000b981e54027b1579225a54ee991d337f8d5b Author: Andrew Cooper AuthorDate: Fri Nov 22 13:36:47 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:36:47 2013 +0100 x86/stack: refactor show_trace() Before, show_trace() had two implementations depending on CONFIG_FRAME_POINTER. Some parts were common, while the loops to wander up the stack were different. The version aided by frame pointers had a special case for function calls on wild function pointers, but this doesn't need to be a special case. After the refactoring, there are now two implementations of _show_trace() which differ depending on CONFIG_FRAME_POINTER, and a single show_trace() with the common bits, including the logic for wild function pointers. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 65 +++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e5b3585..8a01065 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -195,12 +195,14 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) #if !defined(CONFIG_FRAME_POINTER) -static void show_trace(struct cpu_user_regs *regs) +/* + * Stack trace from pointers found in stack, unaided by frame pointers. For + * caller convenience, this has the same prototype as its alternative, and + * simply ignores the base pointer parameter. + */ +static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { - unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; - - printk("Xen call trace:\n" - " [<%p>] %pS\n", _p(regs->eip), _p(regs->eip)); + unsigned long *stack = (unsigned long *)sp, addr; while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) { @@ -208,35 +210,22 @@ static void show_trace(struct cpu_user_regs *regs) if ( is_active_kernel_text(addr) ) printk(" [<%p>] %pS\n", _p(addr), _p(addr)); } - - printk("\n"); } #else -static void show_trace(struct cpu_user_regs *regs) +/* Stack trace from frames in the stack, using frame pointers */ +static void _show_trace(unsigned long sp, unsigned long bp) { unsigned long *frame, next, addr, low, high; - /* - * If RIP is not pointing into hypervisor code then someone may have - * called into oblivion. Peek to see if they left a return address at - * top of stack. - */ - addr = is_active_kernel_text(regs->eip) || - !is_active_kernel_text(*ESP_BEFORE_EXCEPTION(regs)) ? - regs->eip : *ESP_BEFORE_EXCEPTION(regs); - - printk("Xen call trace:\n" - " [<%p>] %pS\n", _p(addr), _p(addr)); - /* Bounds for range of valid frame pointer. */ - low = (unsigned long)(ESP_BEFORE_EXCEPTION(regs) - 2); + low = sp - 2*sizeof(unsigned long); high = (low & ~(STACK_SIZE - 1)) + (STACK_SIZE - sizeof(struct cpu_info) - 2*sizeof(unsigned long)); /* The initial frame pointer. */ - next = regs->ebp; + next = bp; for ( ; ; ) { @@ -268,12 +257,40 @@ static void show_trace(struct cpu_user_regs *regs) low = (unsigned long)&frame[2]; } - - printk("\n"); } #endif +static void show_trace(const struct cpu_user_regs *regs) +{ + unsigned long *sp = ESP_BEFORE_EXCEPTION(regs); + + printk("Xen call trace:\n"); + + /* + * If RIP looks sensible, or the top of the stack doesn't, print RIP at + * the top of the stack trace. + */ + if ( is_active_kernel_text(regs->rip) || + !is_active_kernel_text(*sp) ) + printk(" [<%p>] %pS\n", _p(regs->rip), _p(regs->rip)); + /* + * Else RIP looks bad but the top of the stack looks good. Perhaps we + * followed a wild function pointer? Lets assume the top of the stack is a + * return address; print it and skip past so _show_trace() doesn't print + * it again. + */ + else + { + printk(" [<%p>] %pS\n", _p(*sp), _p(*sp)); + sp++; + } + + _show_trace((unsigned long)sp, regs->rbp); + + printk("\n"); +} + void show_stack(struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09: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 1Vk9F7-0004Oo-84; Sat, 23 Nov 2013 09:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9F5-0004Of-Ik for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:07 +0000 Received: from [85.158.137.68:22751] by server-8.bemta-3.messagelabs.com id 4C/8C-31081-A2170925; Sat, 23 Nov 2013 09:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1385197864!3324533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8080 invoked from network); 23 Nov 2013 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9F2-0002ai-Fk for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9F2-00042c-Ar for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:04 +0000 Date: Sat, 23 Nov 2013 09:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: refactor show_trace() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f000b981e54027b1579225a54ee991d337f8d5b Author: Andrew Cooper AuthorDate: Fri Nov 22 13:36:47 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:36:47 2013 +0100 x86/stack: refactor show_trace() Before, show_trace() had two implementations depending on CONFIG_FRAME_POINTER. Some parts were common, while the loops to wander up the stack were different. The version aided by frame pointers had a special case for function calls on wild function pointers, but this doesn't need to be a special case. After the refactoring, there are now two implementations of _show_trace() which differ depending on CONFIG_FRAME_POINTER, and a single show_trace() with the common bits, including the logic for wild function pointers. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 65 +++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e5b3585..8a01065 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -195,12 +195,14 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) #if !defined(CONFIG_FRAME_POINTER) -static void show_trace(struct cpu_user_regs *regs) +/* + * Stack trace from pointers found in stack, unaided by frame pointers. For + * caller convenience, this has the same prototype as its alternative, and + * simply ignores the base pointer parameter. + */ +static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { - unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; - - printk("Xen call trace:\n" - " [<%p>] %pS\n", _p(regs->eip), _p(regs->eip)); + unsigned long *stack = (unsigned long *)sp, addr; while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) { @@ -208,35 +210,22 @@ static void show_trace(struct cpu_user_regs *regs) if ( is_active_kernel_text(addr) ) printk(" [<%p>] %pS\n", _p(addr), _p(addr)); } - - printk("\n"); } #else -static void show_trace(struct cpu_user_regs *regs) +/* Stack trace from frames in the stack, using frame pointers */ +static void _show_trace(unsigned long sp, unsigned long bp) { unsigned long *frame, next, addr, low, high; - /* - * If RIP is not pointing into hypervisor code then someone may have - * called into oblivion. Peek to see if they left a return address at - * top of stack. - */ - addr = is_active_kernel_text(regs->eip) || - !is_active_kernel_text(*ESP_BEFORE_EXCEPTION(regs)) ? - regs->eip : *ESP_BEFORE_EXCEPTION(regs); - - printk("Xen call trace:\n" - " [<%p>] %pS\n", _p(addr), _p(addr)); - /* Bounds for range of valid frame pointer. */ - low = (unsigned long)(ESP_BEFORE_EXCEPTION(regs) - 2); + low = sp - 2*sizeof(unsigned long); high = (low & ~(STACK_SIZE - 1)) + (STACK_SIZE - sizeof(struct cpu_info) - 2*sizeof(unsigned long)); /* The initial frame pointer. */ - next = regs->ebp; + next = bp; for ( ; ; ) { @@ -268,12 +257,40 @@ static void show_trace(struct cpu_user_regs *regs) low = (unsigned long)&frame[2]; } - - printk("\n"); } #endif +static void show_trace(const struct cpu_user_regs *regs) +{ + unsigned long *sp = ESP_BEFORE_EXCEPTION(regs); + + printk("Xen call trace:\n"); + + /* + * If RIP looks sensible, or the top of the stack doesn't, print RIP at + * the top of the stack trace. + */ + if ( is_active_kernel_text(regs->rip) || + !is_active_kernel_text(*sp) ) + printk(" [<%p>] %pS\n", _p(regs->rip), _p(regs->rip)); + /* + * Else RIP looks bad but the top of the stack looks good. Perhaps we + * followed a wild function pointer? Lets assume the top of the stack is a + * return address; print it and skip past so _show_trace() doesn't print + * it again. + */ + else + { + printk(" [<%p>] %pS\n", _p(*sp), _p(*sp)); + sp++; + } + + _show_trace((unsigned long)sp, regs->rbp); + + printk("\n"); +} + void show_stack(struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FH-0004Pg-Av; Sat, 23 Nov 2013 09:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FF-0004PV-LQ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:17 +0000 Received: from [85.158.137.68:23096] by server-2.bemta-3.messagelabs.com id 69/54-17329-43170925; Sat, 23 Nov 2013 09:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1385197875!2412774!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11778 invoked from network); 23 Nov 2013 09:11: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; 23 Nov 2013 09:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FC-0002am-Pi for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FC-00043j-KF for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:14 +0000 Date: Sat, 23 Nov 2013 09:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: adjust boundary conditions for printed stacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc2f01e602d9310f88625b4bdb4dc4ae179f2751 Author: Andrew Cooper AuthorDate: Fri Nov 22 13:37:25 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:37:25 2013 +0100 x86/stack: adjust boundary conditions for printed stacks Move the boundary into current.h along with the other stack manipulation code. The boundary is now the word adjacent to a struct cpu_info on the stack. This also fixes the somewhat spurious bounds for the case with frame pointers. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 9 ++++----- xen/include/asm-x86/current.h | 9 +++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 8a01065..e7cfa3e 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -203,8 +203,9 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { unsigned long *stack = (unsigned long *)sp, addr; + unsigned long *bottom = (unsigned long *)get_printable_stack_bottom(sp); - while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) + while ( stack <= bottom ) { addr = *stack++; if ( is_active_kernel_text(addr) ) @@ -217,12 +218,10 @@ static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) /* Stack trace from frames in the stack, using frame pointers */ static void _show_trace(unsigned long sp, unsigned long bp) { - unsigned long *frame, next, addr, low, high; + unsigned long *frame, next, addr; /* Bounds for range of valid frame pointer. */ - low = sp - 2*sizeof(unsigned long); - high = (low & ~(STACK_SIZE - 1)) + - (STACK_SIZE - sizeof(struct cpu_info) - 2*sizeof(unsigned long)); + unsigned long low = sp, high = get_printable_stack_bottom(sp); /* The initial frame pointer. */ next = bp; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index bec4dbe..c2792ce 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -50,6 +50,15 @@ static inline struct cpu_info *get_cpu_info(void) #define get_stack_bottom() \ ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) +/* + * Get the bottom-of-stack, as useful for printing stack traces. This is the + * highest word on the stack which might be part of a stack trace, and is the + * adjacent word to a struct cpu_info on the stack. + */ +#define get_printable_stack_bottom(sp) \ + ((sp & (~(STACK_SIZE-1))) + \ + (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) + #define reset_stack_and_jump(__fn) \ __asm__ __volatile__ ( \ "mov %0,%%"__OP"sp; jmp %c1" \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FH-0004Pg-Av; Sat, 23 Nov 2013 09:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FF-0004PV-LQ for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:17 +0000 Received: from [85.158.137.68:23096] by server-2.bemta-3.messagelabs.com id 69/54-17329-43170925; Sat, 23 Nov 2013 09:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1385197875!2412774!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11778 invoked from network); 23 Nov 2013 09:11: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; 23 Nov 2013 09:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FC-0002am-Pi for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FC-00043j-KF for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:14 +0000 Date: Sat, 23 Nov 2013 09:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: adjust boundary conditions for printed stacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc2f01e602d9310f88625b4bdb4dc4ae179f2751 Author: Andrew Cooper AuthorDate: Fri Nov 22 13:37:25 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:37:25 2013 +0100 x86/stack: adjust boundary conditions for printed stacks Move the boundary into current.h along with the other stack manipulation code. The boundary is now the word adjacent to a struct cpu_info on the stack. This also fixes the somewhat spurious bounds for the case with frame pointers. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 9 ++++----- xen/include/asm-x86/current.h | 9 +++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 8a01065..e7cfa3e 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -203,8 +203,9 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) { unsigned long *stack = (unsigned long *)sp, addr; + unsigned long *bottom = (unsigned long *)get_printable_stack_bottom(sp); - while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) + while ( stack <= bottom ) { addr = *stack++; if ( is_active_kernel_text(addr) ) @@ -217,12 +218,10 @@ static void _show_trace(unsigned long sp, unsigned long __maybe_unused bp) /* Stack trace from frames in the stack, using frame pointers */ static void _show_trace(unsigned long sp, unsigned long bp) { - unsigned long *frame, next, addr, low, high; + unsigned long *frame, next, addr; /* Bounds for range of valid frame pointer. */ - low = sp - 2*sizeof(unsigned long); - high = (low & ~(STACK_SIZE - 1)) + - (STACK_SIZE - sizeof(struct cpu_info) - 2*sizeof(unsigned long)); + unsigned long low = sp, high = get_printable_stack_bottom(sp); /* The initial frame pointer. */ next = bp; diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index bec4dbe..c2792ce 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -50,6 +50,15 @@ static inline struct cpu_info *get_cpu_info(void) #define get_stack_bottom() \ ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) +/* + * Get the bottom-of-stack, as useful for printing stack traces. This is the + * highest word on the stack which might be part of a stack trace, and is the + * adjacent word to a struct cpu_info on the stack. + */ +#define get_printable_stack_bottom(sp) \ + ((sp & (~(STACK_SIZE-1))) + \ + (STACK_SIZE - sizeof(struct cpu_info) - sizeof(unsigned long))) + #define reset_stack_and_jump(__fn) \ __asm__ __volatile__ ( \ "mov %0,%%"__OP"sp; jmp %c1" \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FR-0004R9-Fo; Sat, 23 Nov 2013 09: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 1Vk9FQ-0004Qt-0g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:28 +0000 Received: from [193.109.254.147:16046] by server-5.bemta-14.messagelabs.com id 89/28-13525-F3170925; Sat, 23 Nov 2013 09:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1385197885!266560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20923 invoked from network); 23 Nov 2013 09:11:26 -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; 23 Nov 2013 09:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FN-0002au-1k for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FM-000445-Ve for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:25 +0000 Date: Sat, 23 Nov 2013 09:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: change show_stack_overflow() to use frame pointers if available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ae607c381f83fd9256d4b9d6dd3bfdd5f3612f7 Author: Andrew Cooper AuthorDate: Fri Nov 22 13:38:44 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:38:44 2013 +0100 x86/stack: change show_stack_overflow() to use frame pointers if available Pass a full set of cpu_user_regs, and defer the hand-coded stack printing to _show_trace(), which will correctly use frame pointers if available. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 14 ++++---------- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/asm-x86/processor.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e7cfa3e..d8b3eac 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -316,11 +316,11 @@ void show_stack(struct cpu_user_regs *regs) show_trace(regs); } -void show_stack_overflow(unsigned int cpu, unsigned long esp) +void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { #ifdef MEMORY_GUARD + unsigned long esp = regs->rsp; unsigned long esp_top, esp_bottom; - unsigned long *stack, addr; esp_bottom = (esp | (STACK_SIZE - 1)) + 1; esp_top = esp_bottom - PRIMARY_STACK_SIZE; @@ -340,16 +340,10 @@ void show_stack_overflow(unsigned int cpu, unsigned long esp) if ( esp < esp_top ) esp = esp_top; - printk("Xen stack overflow (dumping trace %p-%p):\n ", + printk("Xen stack overflow (dumping trace %p-%p):\n", (void *)esp, (void *)esp_bottom); - stack = (unsigned long *)esp; - while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) - { - addr = *stack++; - if ( is_active_kernel_text(addr) ) - printk("%p: [<%p>] %pS\n", stack, _p(addr), _p(addr)); - } + _show_trace(esp, regs->rbp); printk("\n"); #endif diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 8e6a7c1..bcf72b6 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -248,7 +248,7 @@ void do_double_fault(struct cpu_user_regs *regs) printk("CPU: %d\n", cpu); _show_registers(regs, crs, CTXT_hypervisor, NULL); - show_stack_overflow(cpu, regs->rsp); + show_stack_overflow(cpu, regs); panic("DOUBLE FAULT -- system shutdown\n"); } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 73a3202..c120460 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -509,7 +509,7 @@ extern always_inline void prefetchw(const void *x) #endif void show_stack(struct cpu_user_regs *regs); -void show_stack_overflow(unsigned int cpu, unsigned long esp); +void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(struct cpu_user_regs *regs); void show_execution_state(struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FR-0004R9-Fo; Sat, 23 Nov 2013 09: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 1Vk9FQ-0004Qt-0g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:28 +0000 Received: from [193.109.254.147:16046] by server-5.bemta-14.messagelabs.com id 89/28-13525-F3170925; Sat, 23 Nov 2013 09:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1385197885!266560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20923 invoked from network); 23 Nov 2013 09:11:26 -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; 23 Nov 2013 09:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FN-0002au-1k for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FM-000445-Ve for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:25 +0000 Date: Sat, 23 Nov 2013 09:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/stack: change show_stack_overflow() to use frame pointers if available X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ae607c381f83fd9256d4b9d6dd3bfdd5f3612f7 Author: Andrew Cooper AuthorDate: Fri Nov 22 13:38:44 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 13:38:44 2013 +0100 x86/stack: change show_stack_overflow() to use frame pointers if available Pass a full set of cpu_user_regs, and defer the hand-coded stack printing to _show_trace(), which will correctly use frame pointers if available. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 14 ++++---------- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/asm-x86/processor.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e7cfa3e..d8b3eac 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -316,11 +316,11 @@ void show_stack(struct cpu_user_regs *regs) show_trace(regs); } -void show_stack_overflow(unsigned int cpu, unsigned long esp) +void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { #ifdef MEMORY_GUARD + unsigned long esp = regs->rsp; unsigned long esp_top, esp_bottom; - unsigned long *stack, addr; esp_bottom = (esp | (STACK_SIZE - 1)) + 1; esp_top = esp_bottom - PRIMARY_STACK_SIZE; @@ -340,16 +340,10 @@ void show_stack_overflow(unsigned int cpu, unsigned long esp) if ( esp < esp_top ) esp = esp_top; - printk("Xen stack overflow (dumping trace %p-%p):\n ", + printk("Xen stack overflow (dumping trace %p-%p):\n", (void *)esp, (void *)esp_bottom); - stack = (unsigned long *)esp; - while ( ((long)stack & (STACK_SIZE-BYTES_PER_LONG)) != 0 ) - { - addr = *stack++; - if ( is_active_kernel_text(addr) ) - printk("%p: [<%p>] %pS\n", stack, _p(addr), _p(addr)); - } + _show_trace(esp, regs->rbp); printk("\n"); #endif diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 8e6a7c1..bcf72b6 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -248,7 +248,7 @@ void do_double_fault(struct cpu_user_regs *regs) printk("CPU: %d\n", cpu); _show_registers(regs, crs, CTXT_hypervisor, NULL); - show_stack_overflow(cpu, regs->rsp); + show_stack_overflow(cpu, regs); panic("DOUBLE FAULT -- system shutdown\n"); } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 73a3202..c120460 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -509,7 +509,7 @@ extern always_inline void prefetchw(const void *x) #endif void show_stack(struct cpu_user_regs *regs); -void show_stack_overflow(unsigned int cpu, unsigned long esp); +void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(struct cpu_user_regs *regs); void show_execution_state(struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fb-0004Su-Ia; Sat, 23 Nov 2013 09:11:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FZ-0004SW-JO for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:37 +0000 Received: from [85.158.143.35:3551] by server-2.bemta-4.messagelabs.com id 16/A4-11386-84170925; Sat, 23 Nov 2013 09:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1385197895!578577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20190 invoked from network); 23 Nov 2013 09:11:36 -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; 23 Nov 2013 09:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FX-0002b2-8A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FX-00044n-5g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:35 +0000 Date: Sat, 23 Nov 2013 09:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: reset TSC to 0 after domain resume from S3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e95dc6ba69daef6468b3ae5912710727244d6e2f Author: Tomasz Wroblewski AuthorDate: Fri Nov 22 14:47:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 14:47:24 2013 +0100 x86/hvm: reset TSC to 0 after domain resume from S3 Host S3 implicitly resets the host TSC to 0, but the tsc offset for hvm domains is not recalculated when they resume, causing it to go into negative values. In Linux guest using tsc clocksource, this results in a hang after wrap back to positive values since the tsc clocksource implementation expects it reset. Signed-off-by: Tomasz Wroblewski --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3b353ec..b76f041 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3737,7 +3737,13 @@ static void hvm_s3_suspend(struct domain *d) static void hvm_s3_resume(struct domain *d) { if ( test_and_clear_bool(d->arch.hvm_domain.is_s3_suspended) ) + { + struct vcpu *v; + + for_each_vcpu( d, v ) + hvm_set_guest_tsc(v, 0); domain_unpause(d); + } } static int hvmop_set_isa_irq_level( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:39 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fb-0004Su-Ia; Sat, 23 Nov 2013 09:11:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FZ-0004SW-JO for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:37 +0000 Received: from [85.158.143.35:3551] by server-2.bemta-4.messagelabs.com id 16/A4-11386-84170925; Sat, 23 Nov 2013 09:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1385197895!578577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20190 invoked from network); 23 Nov 2013 09:11:36 -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; 23 Nov 2013 09:11:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9FX-0002b2-8A for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9FX-00044n-5g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:35 +0000 Date: Sat, 23 Nov 2013 09:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: reset TSC to 0 after domain resume from S3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e95dc6ba69daef6468b3ae5912710727244d6e2f Author: Tomasz Wroblewski AuthorDate: Fri Nov 22 14:47:24 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 14:47:24 2013 +0100 x86/hvm: reset TSC to 0 after domain resume from S3 Host S3 implicitly resets the host TSC to 0, but the tsc offset for hvm domains is not recalculated when they resume, causing it to go into negative values. In Linux guest using tsc clocksource, this results in a hang after wrap back to positive values since the tsc clocksource implementation expects it reset. Signed-off-by: Tomasz Wroblewski --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3b353ec..b76f041 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3737,7 +3737,13 @@ static void hvm_s3_suspend(struct domain *d) static void hvm_s3_resume(struct domain *d) { if ( test_and_clear_bool(d->arch.hvm_domain.is_s3_suspended) ) + { + struct vcpu *v; + + for_each_vcpu( d, v ) + hvm_set_guest_tsc(v, 0); domain_unpause(d); + } } static int hvmop_set_isa_irq_level( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:11:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11: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 1Vk9Fl-0004Ug-LO; Sat, 23 Nov 2013 09:11:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fj-0004UT-Ra for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:48 +0000 Received: from [85.158.143.35:3898] by server-2.bemta-4.messagelabs.com id 54/B4-11386-35170925; Sat, 23 Nov 2013 09:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385197905!577038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2489 invoked from network); 23 Nov 2013 09:11:46 -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; 23 Nov 2013 09:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fh-0002b8-FU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Fh-00045F-CF for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:45 +0000 Date: Sat, 23 Nov 2013 09:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: disable the watchdog NMIs on the crashing cpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a16fcd5ba0244fef764886211452acc69c0ed00 Author: David Vrabel AuthorDate: Fri Nov 22 14:48:12 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 14:48:12 2013 +0100 x86/crash: disable the watchdog NMIs on the crashing cpu nmi_shootdown_cpus() is called during a crash to park all the other CPUs. This changes the NMI trap handlers which means there's no point in having the watchdog still running. This also disables the watchdog before executing any crash kexec image and prevents the image from receiving unexpected NMIs. Signed-off-by: David Vrabel PVOps Linux as a kexec image shoots itself in the foot otherwise. On a Core2 system, Linux declares a firmware bug and tries to invert some bits in the performance counter register. It ends up setting the number of retired instructions to generate another NMI to fewer instructions than the NMI interrupt path itself, and ceases to make any useful progress. The call to disable_lapic_nmi_watchdog() must be this late into the kexec path to be sure that this cpu is the one which will execute the kexec image. Otherwise there are race conditions where the NMIs might be disabled on the wrong cpu, resulting in the kexec image still receiving NMIs. Signed-off-by: Andrew Cooper --- xen/arch/x86/crash.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/include/asm-x86/apic.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 4ef379b..01fd906 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -118,6 +118,7 @@ static void nmi_shootdown_cpus(void) unsigned long msecs; int i, cpu = smp_processor_id(); + disable_lapic_nmi_watchdog(); local_irq_disable(); crashing_cpu = cpu; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 2c16d93..c67a9c3 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -165,7 +165,7 @@ static void nmi_timer_fn(void *unused) set_timer(&this_cpu(nmi_timer), NOW() + MILLISECS(1000)); } -static void disable_lapic_nmi_watchdog(void) +void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index dd528fb..43b39ce 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -200,6 +200,7 @@ extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); extern void setup_secondary_APIC_clock (void); extern void setup_apic_nmi_watchdog (void); +extern void disable_lapic_nmi_watchdog(void); extern int reserve_lapic_nmi(void); extern void release_lapic_nmi(void); extern void self_nmi(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 Nov 23 09:11:49 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:11: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 1Vk9Fl-0004Ug-LO; Sat, 23 Nov 2013 09:11:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fj-0004UT-Ra for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:48 +0000 Received: from [85.158.143.35:3898] by server-2.bemta-4.messagelabs.com id 54/B4-11386-35170925; Sat, 23 Nov 2013 09:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385197905!577038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2489 invoked from network); 23 Nov 2013 09:11:46 -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; 23 Nov 2013 09:11:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fh-0002b8-FU for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Fh-00045F-CF for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:45 +0000 Date: Sat, 23 Nov 2013 09:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/crash: disable the watchdog NMIs on the crashing cpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a16fcd5ba0244fef764886211452acc69c0ed00 Author: David Vrabel AuthorDate: Fri Nov 22 14:48:12 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 14:48:12 2013 +0100 x86/crash: disable the watchdog NMIs on the crashing cpu nmi_shootdown_cpus() is called during a crash to park all the other CPUs. This changes the NMI trap handlers which means there's no point in having the watchdog still running. This also disables the watchdog before executing any crash kexec image and prevents the image from receiving unexpected NMIs. Signed-off-by: David Vrabel PVOps Linux as a kexec image shoots itself in the foot otherwise. On a Core2 system, Linux declares a firmware bug and tries to invert some bits in the performance counter register. It ends up setting the number of retired instructions to generate another NMI to fewer instructions than the NMI interrupt path itself, and ceases to make any useful progress. The call to disable_lapic_nmi_watchdog() must be this late into the kexec path to be sure that this cpu is the one which will execute the kexec image. Otherwise there are race conditions where the NMIs might be disabled on the wrong cpu, resulting in the kexec image still receiving NMIs. Signed-off-by: Andrew Cooper --- xen/arch/x86/crash.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/include/asm-x86/apic.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 4ef379b..01fd906 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -118,6 +118,7 @@ static void nmi_shootdown_cpus(void) unsigned long msecs; int i, cpu = smp_processor_id(); + disable_lapic_nmi_watchdog(); local_irq_disable(); crashing_cpu = cpu; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 2c16d93..c67a9c3 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -165,7 +165,7 @@ static void nmi_timer_fn(void *unused) set_timer(&this_cpu(nmi_timer), NOW() + MILLISECS(1000)); } -static void disable_lapic_nmi_watchdog(void) +void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index dd528fb..43b39ce 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -200,6 +200,7 @@ extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); extern void setup_secondary_APIC_clock (void); extern void setup_apic_nmi_watchdog (void); +extern void disable_lapic_nmi_watchdog(void); extern int reserve_lapic_nmi(void); extern void release_lapic_nmi(void); extern void self_nmi(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 Nov 23 09:12:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fw-0004Wb-OD; Sat, 23 Nov 2013 09:12:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fu-0004WF-Un for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:59 +0000 Received: from [85.158.143.35:25819] by server-1.bemta-4.messagelabs.com id AB/1F-02132-E5170925; Sat, 23 Nov 2013 09:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385197916!569143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13320 invoked from network); 23 Nov 2013 09:11:57 -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 Nov 2013 09:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fs-0002bH-AH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Fs-00046v-7Y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:56 +0000 Date: Sat, 23 Nov 2013 09:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop COMPARE_COPY_PAGE_SSE2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b29eba90610df0fe69dd9f51c1cacfd1a3f033a8 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:47 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:23 2013 -0500 tmem: cleanup: drop COMPARE_COPY_PAGE_SSE2 COMPARE_COPY_PAGE_SSE2 never be used in other place, memcpy() is enough. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 14 -------------- xen/common/tmem_xen.c | 35 ----------------------------------- 2 files changed, 0 insertions(+), 49 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index a122651..215722b 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -95,14 +95,7 @@ DECL_CYC_COUNTER(non_succ_get); DECL_CYC_COUNTER(non_succ_put); DECL_CYC_COUNTER(flush); DECL_CYC_COUNTER(flush_obj); -#ifdef COMPARE_COPY_PAGE_SSE2 -EXTERN_CYC_COUNTER(pg_copy1); -EXTERN_CYC_COUNTER(pg_copy2); -EXTERN_CYC_COUNTER(pg_copy3); -EXTERN_CYC_COUNTER(pg_copy4); -#else EXTERN_CYC_COUNTER(pg_copy); -#endif DECL_CYC_COUNTER(compress); DECL_CYC_COUNTER(decompress); @@ -2172,14 +2165,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,non_succ_put,"p"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush,"F"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush_obj,"O"); -#ifdef COMPARE_COPY_PAGE_SSE2 - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy1,"1"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy2,"2"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy3,"3"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy4,"4"); -#else n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy,"C"); -#endif n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,compress,"c"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,decompress,"d"); n--; /* overwrite trailing comma */ diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 54ec09f..4725558 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -36,14 +36,7 @@ integer_param("tmem_lock", opt_tmem_lock); EXPORT atomic_t freeable_page_count = ATOMIC_INIT(0); -#ifdef COMPARE_COPY_PAGE_SSE2 -DECL_CYC_COUNTER(pg_copy1); -DECL_CYC_COUNTER(pg_copy2); -DECL_CYC_COUNTER(pg_copy3); -DECL_CYC_COUNTER(pg_copy4); -#else DECL_CYC_COUNTER(pg_copy); -#endif /* these are a concurrency bottleneck, could be percpu and dynamically * allocated iff opt_tmem_compress */ @@ -53,40 +46,12 @@ static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, workmem); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, dstmem); static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); -#ifdef COMPARE_COPY_PAGE_SSE2 -#include /* REMOVE ME AFTER TEST */ -#include /* REMOVE ME AFTER TEST */ -#endif void tmh_copy_page(char *to, char*from) { -#ifdef COMPARE_COPY_PAGE_SSE2 - DECL_LOCAL_CYC_COUNTER(pg_copy1); - DECL_LOCAL_CYC_COUNTER(pg_copy2); - DECL_LOCAL_CYC_COUNTER(pg_copy3); - DECL_LOCAL_CYC_COUNTER(pg_copy4); - *to = *from; /* don't measure TLB misses */ - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy1); - copy_page_sse2(to, from); /* cold cache */ - END_CYC_COUNTER(pg_copy1); - START_CYC_COUNTER(pg_copy2); - copy_page_sse2(to, from); /* hot cache */ - END_CYC_COUNTER(pg_copy2); - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy3); - memcpy(to, from, PAGE_SIZE); /* cold cache */ - END_CYC_COUNTER(pg_copy3); - START_CYC_COUNTER(pg_copy4); - memcpy(to, from, PAGE_SIZE); /* hot cache */ - END_CYC_COUNTER(pg_copy4); -#else DECL_LOCAL_CYC_COUNTER(pg_copy); START_CYC_COUNTER(pg_copy); memcpy(to, from, PAGE_SIZE); END_CYC_COUNTER(pg_copy); -#endif } #if defined(CONFIG_ARM) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:00 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fw-0004Wb-OD; Sat, 23 Nov 2013 09:12:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fu-0004WF-Un for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:59 +0000 Received: from [85.158.143.35:25819] by server-1.bemta-4.messagelabs.com id AB/1F-02132-E5170925; Sat, 23 Nov 2013 09:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385197916!569143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13320 invoked from network); 23 Nov 2013 09:11:57 -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 Nov 2013 09:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Fs-0002bH-AH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Fs-00046v-7Y for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:11:56 +0000 Date: Sat, 23 Nov 2013 09:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop COMPARE_COPY_PAGE_SSE2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b29eba90610df0fe69dd9f51c1cacfd1a3f033a8 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:47 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:23 2013 -0500 tmem: cleanup: drop COMPARE_COPY_PAGE_SSE2 COMPARE_COPY_PAGE_SSE2 never be used in other place, memcpy() is enough. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 14 -------------- xen/common/tmem_xen.c | 35 ----------------------------------- 2 files changed, 0 insertions(+), 49 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index a122651..215722b 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -95,14 +95,7 @@ DECL_CYC_COUNTER(non_succ_get); DECL_CYC_COUNTER(non_succ_put); DECL_CYC_COUNTER(flush); DECL_CYC_COUNTER(flush_obj); -#ifdef COMPARE_COPY_PAGE_SSE2 -EXTERN_CYC_COUNTER(pg_copy1); -EXTERN_CYC_COUNTER(pg_copy2); -EXTERN_CYC_COUNTER(pg_copy3); -EXTERN_CYC_COUNTER(pg_copy4); -#else EXTERN_CYC_COUNTER(pg_copy); -#endif DECL_CYC_COUNTER(compress); DECL_CYC_COUNTER(decompress); @@ -2172,14 +2165,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,non_succ_put,"p"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush,"F"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,flush_obj,"O"); -#ifdef COMPARE_COPY_PAGE_SSE2 - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy1,"1"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy2,"2"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy3,"3"); - n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy4,"4"); -#else n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,pg_copy,"C"); -#endif n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,compress,"c"); n += SCNPRINTF_CYC_COUNTER(info+n,BSIZE-n,decompress,"d"); n--; /* overwrite trailing comma */ diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 54ec09f..4725558 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -36,14 +36,7 @@ integer_param("tmem_lock", opt_tmem_lock); EXPORT atomic_t freeable_page_count = ATOMIC_INIT(0); -#ifdef COMPARE_COPY_PAGE_SSE2 -DECL_CYC_COUNTER(pg_copy1); -DECL_CYC_COUNTER(pg_copy2); -DECL_CYC_COUNTER(pg_copy3); -DECL_CYC_COUNTER(pg_copy4); -#else DECL_CYC_COUNTER(pg_copy); -#endif /* these are a concurrency bottleneck, could be percpu and dynamically * allocated iff opt_tmem_compress */ @@ -53,40 +46,12 @@ static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, workmem); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, dstmem); static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); -#ifdef COMPARE_COPY_PAGE_SSE2 -#include /* REMOVE ME AFTER TEST */ -#include /* REMOVE ME AFTER TEST */ -#endif void tmh_copy_page(char *to, char*from) { -#ifdef COMPARE_COPY_PAGE_SSE2 - DECL_LOCAL_CYC_COUNTER(pg_copy1); - DECL_LOCAL_CYC_COUNTER(pg_copy2); - DECL_LOCAL_CYC_COUNTER(pg_copy3); - DECL_LOCAL_CYC_COUNTER(pg_copy4); - *to = *from; /* don't measure TLB misses */ - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy1); - copy_page_sse2(to, from); /* cold cache */ - END_CYC_COUNTER(pg_copy1); - START_CYC_COUNTER(pg_copy2); - copy_page_sse2(to, from); /* hot cache */ - END_CYC_COUNTER(pg_copy2); - flush_area_local(to,FLUSH_CACHE|FLUSH_ORDER(0)); - flush_area_local(from,FLUSH_CACHE|FLUSH_ORDER(0)); - START_CYC_COUNTER(pg_copy3); - memcpy(to, from, PAGE_SIZE); /* cold cache */ - END_CYC_COUNTER(pg_copy3); - START_CYC_COUNTER(pg_copy4); - memcpy(to, from, PAGE_SIZE); /* hot cache */ - END_CYC_COUNTER(pg_copy4); -#else DECL_LOCAL_CYC_COUNTER(pg_copy); START_CYC_COUNTER(pg_copy); memcpy(to, from, PAGE_SIZE); END_CYC_COUNTER(pg_copy); -#endif } #if defined(CONFIG_ARM) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G7-0004YQ-RB; Sat, 23 Nov 2013 09:12:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G5-0004Y5-Mc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:10 +0000 Received: from [85.158.139.211:22003] by server-9.bemta-5.messagelabs.com id 8C/9F-15098-96170925; Sat, 23 Nov 2013 09:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385197926!3799877!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15338 invoked from network); 23 Nov 2013 09:12:07 -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; 23 Nov 2013 09:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G2-0002bp-KD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9G2-00047y-Ez for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:06 +0000 Date: Sat, 23 Nov 2013 09:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef pfp_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6de3699137ed5cc802c264ab2d744b0a5efc82e6 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:48 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: drop typedef pfp_t Using 'struct page_info' directly instead of 'pfp_t' to make code more straightforward and readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 14 +++++++------- xen/common/tmem_xen.c | 22 +++++++++++----------- xen/include/xen/tmem_xen.h | 17 ++++++++--------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 215722b..4a278f2 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -232,7 +232,7 @@ struct tmem_page_descriptor { bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable) */ struct list_head pcd_siblings; union { - pfp_t *pfp; /* page frame pointer */ + struct page_info *pfp; /* page frame pointer */ char *cdata; /* compressed data */ struct tmem_page_content_descriptor *pcd; /* page dedup */ }; @@ -248,7 +248,7 @@ typedef struct tmem_page_descriptor pgp_t; struct tmem_page_content_descriptor { union { - pfp_t *pfp; /* page frame pointer */ + struct page_info *pfp; /* page frame pointer */ char *cdata; /* if compression_enabled */ char *tze; /* if !compression_enabled, trailing zeroes eliminated */ }; @@ -341,9 +341,9 @@ static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) tmh_free_subpage_thispool(pool,p,size); } -static NOINLINE pfp_t *tmem_page_alloc(pool_t *pool) +static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) { - pfp_t *pfp = NULL; + struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) pfp = tmh_alloc_page_thispool(pool); @@ -356,7 +356,7 @@ static NOINLINE pfp_t *tmem_page_alloc(pool_t *pool) return pfp; } -static NOINLINE void tmem_page_free(pool_t *pool, pfp_t *pfp) +static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) @@ -397,7 +397,7 @@ static NOINLINE int pcd_copy_to_client(tmem_cli_mfn_t cmfn, pgp_t *pgp) static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_rwlock) { pcd_t *pcd = pgp->pcd; - pfp_t *pfp = pgp->pcd->pfp; + struct page_info *pfp = pgp->pcd->pfp; uint16_t firstbyte = pgp->firstbyte; char *pcd_tze = pgp->pcd->tze; pagesize_t pcd_size = pcd->size; @@ -2873,7 +2873,7 @@ EXPORT void tmem_freeze_all(unsigned char key) EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { - pfp_t *pfp; + struct page_info *pfp; unsigned long evicts_per_relinq = 0; int max_evictions = 10; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 4725558..cbcdb1a 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -56,13 +56,13 @@ void tmh_copy_page(char *to, char*from) #if defined(CONFIG_ARM) static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, - pfp_t **pcli_pfp, bool_t cli_write) + struct page_info **pcli_pfp, bool_t cli_write) { ASSERT(0); return NULL; } -static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, +static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { ASSERT(0); @@ -71,7 +71,7 @@ static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, #include static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, - pfp_t **pcli_pfp, bool_t cli_write) + struct page_info **pcli_pfp, bool_t cli_write) { p2m_type_t t; struct page_info *page; @@ -95,7 +95,7 @@ static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, return map_domain_page(*pcli_mfn); } -static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, +static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { if ( mark_dirty ) @@ -109,13 +109,13 @@ static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, } #endif -EXPORT int tmh_copy_from_client(pfp_t *pfp, +EXPORT int tmh_copy_from_client(struct page_info *pfp, tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; char *tmem_va, *cli_va = NULL; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; int rc = 1; if ( tmem_offset > PAGE_SIZE || pfn_offset > PAGE_SIZE || len > PAGE_SIZE ) @@ -165,7 +165,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, unsigned char *dmem = this_cpu(dstmem); unsigned char *wmem = this_cpu(workmem); char *scratch = this_cpu(scratch_page); - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; unsigned long cli_mfn = 0; void *cli_va = NULL; @@ -190,13 +190,13 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, pfp_t *pfp, +EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; char *tmem_va, *cli_va = NULL; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; int rc = 1; if ( tmem_offset > PAGE_SIZE || pfn_offset > PAGE_SIZE || len > PAGE_SIZE ) @@ -233,7 +233,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; void *cli_va = NULL; char *scratch = this_cpu(scratch_page); size_t out_len = PAGE_SIZE; @@ -263,7 +263,7 @@ EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, { void *cli_va; unsigned long cli_mfn; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; ASSERT(!(len & (sizeof(uint64_t)-1))); ASSERT(len <= PAGE_SIZE); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index ad1ddd5..f05d0f5 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -277,7 +277,6 @@ static inline void tmh_free_infra(void *p) struct client; typedef domid_t cli_id_t; typedef struct domain tmh_cli_ptr_t; -typedef struct page_info pfp_t; extern tmh_client_t *tmh_client_init(cli_id_t); extern void tmh_client_destroy(tmh_client_t *); @@ -337,14 +336,14 @@ static inline bool_t tmh_current_is_privileged(void) return !xsm_tmem_control(XSM_PRIV); } -static inline uint8_t tmh_get_first_byte(pfp_t *pfp) +static inline uint8_t tmh_get_first_byte(struct page_info *pfp) { void *p = __map_domain_page(pfp); return (uint8_t)(*(char *)p); } -static inline int tmh_page_cmp(pfp_t *pfp1, pfp_t *pfp2) +static inline int tmh_page_cmp(struct page_info *pfp1, struct page_info *pfp2) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp2); @@ -382,14 +381,14 @@ static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t return 1; } -static inline int tmh_tze_pfp_cmp(pfp_t *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) +static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2; pagesize_t i; if ( tze_len == PAGE_SIZE ) - p2 = (uint64_t *)__map_domain_page((pfp_t *)tva); + p2 = (uint64_t *)__map_domain_page((struct page_info *)tva); else p2 = (uint64_t *)tva; ASSERT(pfp_len <= PAGE_SIZE); @@ -411,7 +410,7 @@ static inline int tmh_tze_pfp_cmp(pfp_t *pfp1, pagesize_t pfp_len, void *tva, pa /* return the size of the data in the pfp, ignoring trailing zeroes and * rounded up to the nearest multiple of 8 */ -static inline pagesize_t tmh_tze_pfp_scan(pfp_t *pfp) +static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) { const uint64_t *p = (uint64_t *)__map_domain_page(pfp); pagesize_t bytecount = PAGE_SIZE; @@ -422,7 +421,7 @@ static inline pagesize_t tmh_tze_pfp_scan(pfp_t *pfp) return bytecount; } -static inline void tmh_tze_copy_from_pfp(void *tva, pfp_t *pfp, pagesize_t len) +static inline void tmh_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) { uint64_t *p1 = (uint64_t *)tva; const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp); @@ -496,10 +495,10 @@ int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t, int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(pfp_t *, tmem_cli_mfn_t, pagesize_t tmem_offset, +int tmh_copy_from_client(struct page_info *, tmem_cli_mfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(tmem_cli_mfn_t, pfp_t *, pagesize_t tmem_offset, +int tmh_copy_to_client(tmem_cli_mfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); extern int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, pagesize_t len); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G7-0004YQ-RB; Sat, 23 Nov 2013 09:12:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G5-0004Y5-Mc for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:10 +0000 Received: from [85.158.139.211:22003] by server-9.bemta-5.messagelabs.com id 8C/9F-15098-96170925; Sat, 23 Nov 2013 09:12:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385197926!3799877!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15338 invoked from network); 23 Nov 2013 09:12:07 -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; 23 Nov 2013 09:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9G2-0002bp-KD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9G2-00047y-Ez for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:06 +0000 Date: Sat, 23 Nov 2013 09:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef pfp_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6de3699137ed5cc802c264ab2d744b0a5efc82e6 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:48 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: drop typedef pfp_t Using 'struct page_info' directly instead of 'pfp_t' to make code more straightforward and readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 14 +++++++------- xen/common/tmem_xen.c | 22 +++++++++++----------- xen/include/xen/tmem_xen.h | 17 ++++++++--------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 215722b..4a278f2 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -232,7 +232,7 @@ struct tmem_page_descriptor { bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable) */ struct list_head pcd_siblings; union { - pfp_t *pfp; /* page frame pointer */ + struct page_info *pfp; /* page frame pointer */ char *cdata; /* compressed data */ struct tmem_page_content_descriptor *pcd; /* page dedup */ }; @@ -248,7 +248,7 @@ typedef struct tmem_page_descriptor pgp_t; struct tmem_page_content_descriptor { union { - pfp_t *pfp; /* page frame pointer */ + struct page_info *pfp; /* page frame pointer */ char *cdata; /* if compression_enabled */ char *tze; /* if !compression_enabled, trailing zeroes eliminated */ }; @@ -341,9 +341,9 @@ static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) tmh_free_subpage_thispool(pool,p,size); } -static NOINLINE pfp_t *tmem_page_alloc(pool_t *pool) +static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) { - pfp_t *pfp = NULL; + struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) pfp = tmh_alloc_page_thispool(pool); @@ -356,7 +356,7 @@ static NOINLINE pfp_t *tmem_page_alloc(pool_t *pool) return pfp; } -static NOINLINE void tmem_page_free(pool_t *pool, pfp_t *pfp) +static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) @@ -397,7 +397,7 @@ static NOINLINE int pcd_copy_to_client(tmem_cli_mfn_t cmfn, pgp_t *pgp) static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_rwlock) { pcd_t *pcd = pgp->pcd; - pfp_t *pfp = pgp->pcd->pfp; + struct page_info *pfp = pgp->pcd->pfp; uint16_t firstbyte = pgp->firstbyte; char *pcd_tze = pgp->pcd->tze; pagesize_t pcd_size = pcd->size; @@ -2873,7 +2873,7 @@ EXPORT void tmem_freeze_all(unsigned char key) EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { - pfp_t *pfp; + struct page_info *pfp; unsigned long evicts_per_relinq = 0; int max_evictions = 10; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 4725558..cbcdb1a 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -56,13 +56,13 @@ void tmh_copy_page(char *to, char*from) #if defined(CONFIG_ARM) static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, - pfp_t **pcli_pfp, bool_t cli_write) + struct page_info **pcli_pfp, bool_t cli_write) { ASSERT(0); return NULL; } -static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, +static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { ASSERT(0); @@ -71,7 +71,7 @@ static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, #include static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, - pfp_t **pcli_pfp, bool_t cli_write) + struct page_info **pcli_pfp, bool_t cli_write) { p2m_type_t t; struct page_info *page; @@ -95,7 +95,7 @@ static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, return map_domain_page(*pcli_mfn); } -static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, +static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, unsigned long cli_mfn, bool_t mark_dirty) { if ( mark_dirty ) @@ -109,13 +109,13 @@ static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp, } #endif -EXPORT int tmh_copy_from_client(pfp_t *pfp, +EXPORT int tmh_copy_from_client(struct page_info *pfp, tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; char *tmem_va, *cli_va = NULL; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; int rc = 1; if ( tmem_offset > PAGE_SIZE || pfn_offset > PAGE_SIZE || len > PAGE_SIZE ) @@ -165,7 +165,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, unsigned char *dmem = this_cpu(dstmem); unsigned char *wmem = this_cpu(workmem); char *scratch = this_cpu(scratch_page); - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; unsigned long cli_mfn = 0; void *cli_va = NULL; @@ -190,13 +190,13 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, pfp_t *pfp, +EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; char *tmem_va, *cli_va = NULL; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; int rc = 1; if ( tmem_offset > PAGE_SIZE || pfn_offset > PAGE_SIZE || len > PAGE_SIZE ) @@ -233,7 +233,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; void *cli_va = NULL; char *scratch = this_cpu(scratch_page); size_t out_len = PAGE_SIZE; @@ -263,7 +263,7 @@ EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, { void *cli_va; unsigned long cli_mfn; - pfp_t *cli_pfp = NULL; + struct page_info *cli_pfp = NULL; ASSERT(!(len & (sizeof(uint64_t)-1))); ASSERT(len <= PAGE_SIZE); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index ad1ddd5..f05d0f5 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -277,7 +277,6 @@ static inline void tmh_free_infra(void *p) struct client; typedef domid_t cli_id_t; typedef struct domain tmh_cli_ptr_t; -typedef struct page_info pfp_t; extern tmh_client_t *tmh_client_init(cli_id_t); extern void tmh_client_destroy(tmh_client_t *); @@ -337,14 +336,14 @@ static inline bool_t tmh_current_is_privileged(void) return !xsm_tmem_control(XSM_PRIV); } -static inline uint8_t tmh_get_first_byte(pfp_t *pfp) +static inline uint8_t tmh_get_first_byte(struct page_info *pfp) { void *p = __map_domain_page(pfp); return (uint8_t)(*(char *)p); } -static inline int tmh_page_cmp(pfp_t *pfp1, pfp_t *pfp2) +static inline int tmh_page_cmp(struct page_info *pfp1, struct page_info *pfp2) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp2); @@ -382,14 +381,14 @@ static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t return 1; } -static inline int tmh_tze_pfp_cmp(pfp_t *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) +static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2; pagesize_t i; if ( tze_len == PAGE_SIZE ) - p2 = (uint64_t *)__map_domain_page((pfp_t *)tva); + p2 = (uint64_t *)__map_domain_page((struct page_info *)tva); else p2 = (uint64_t *)tva; ASSERT(pfp_len <= PAGE_SIZE); @@ -411,7 +410,7 @@ static inline int tmh_tze_pfp_cmp(pfp_t *pfp1, pagesize_t pfp_len, void *tva, pa /* return the size of the data in the pfp, ignoring trailing zeroes and * rounded up to the nearest multiple of 8 */ -static inline pagesize_t tmh_tze_pfp_scan(pfp_t *pfp) +static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) { const uint64_t *p = (uint64_t *)__map_domain_page(pfp); pagesize_t bytecount = PAGE_SIZE; @@ -422,7 +421,7 @@ static inline pagesize_t tmh_tze_pfp_scan(pfp_t *pfp) return bytecount; } -static inline void tmh_tze_copy_from_pfp(void *tva, pfp_t *pfp, pagesize_t len) +static inline void tmh_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) { uint64_t *p1 = (uint64_t *)tva; const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp); @@ -496,10 +495,10 @@ int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t, int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(pfp_t *, tmem_cli_mfn_t, pagesize_t tmem_offset, +int tmh_copy_from_client(struct page_info *, tmem_cli_mfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(tmem_cli_mfn_t, pfp_t *, pagesize_t tmem_offset, +int tmh_copy_to_client(tmem_cli_mfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); extern int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, pagesize_t len); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09: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 1Vk9GG-0004aE-Vq; Sat, 23 Nov 2013 09:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GG-0004a4-42 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:20 +0000 Received: from [85.158.137.68:41630] by server-2.bemta-3.messagelabs.com id 61/D4-17329-37170925; Sat, 23 Nov 2013 09:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1385197937!3284141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20156 invoked from network); 23 Nov 2013 09:12:18 -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; 23 Nov 2013 09:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GD-0002bv-1L for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GC-00048W-Oq for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:16 +0000 Date: Sat, 23 Nov 2013 09:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef tmem_cli_mfn_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 006a687ba4de74d7933c09b43872abc19f126c63 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:49 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: drop typedef tmem_cli_mfn_t Using 'xen_pfn_t' directly instead of 'tmem_cli_mfn_t' to make code more readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 10 +++++----- xen/common/tmem_xen.c | 14 +++++++------- xen/include/public/tmem.h | 3 +-- xen/include/xen/tmem_xen.h | 10 +++++----- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 4a278f2..f3a0d91 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -370,7 +370,7 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) #define NOT_SHAREABLE ((uint16_t)-1UL) -static NOINLINE int pcd_copy_to_client(tmem_cli_mfn_t cmfn, pgp_t *pgp) +static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) { uint8_t firstbyte = pgp->firstbyte; pcd_t *pcd; @@ -1436,7 +1436,7 @@ static inline void tmem_ensure_avail_pages(void) /************ TMEM CORE OPERATIONS ************************************/ -static NOINLINE int do_tmem_put_compress(pgp_t *pgp, tmem_cli_mfn_t cmfn, +static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { void *dst, *p; @@ -1479,7 +1479,7 @@ out: return ret; } -static NOINLINE int do_tmem_dup_put(pgp_t *pgp, tmem_cli_mfn_t cmfn, +static NOINLINE int do_tmem_dup_put(pgp_t *pgp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -1571,7 +1571,7 @@ cleanup: static NOINLINE int do_tmem_put(pool_t *pool, OID *oidp, uint32_t index, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { obj_t *obj = NULL, *objfound = NULL, *objnew = NULL; @@ -1714,7 +1714,7 @@ free: } static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { obj_t *obj; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index cbcdb1a..e1e83d2 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -55,7 +55,7 @@ void tmh_copy_page(char *to, char*from) } #if defined(CONFIG_ARM) -static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, +static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { ASSERT(0); @@ -70,7 +70,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, #else #include -static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, +static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { p2m_type_t t; @@ -110,7 +110,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, #endif EXPORT int tmh_copy_from_client(struct page_info *pfp, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; @@ -158,7 +158,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, return rc; } -EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, +EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, void **out_va, size_t *out_len, tmem_cli_va_param_t clibuf) { int ret = 0; @@ -190,7 +190,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, +EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -229,7 +229,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, return rc; } -EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, +EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; @@ -258,7 +258,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, return 1; } -EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, +EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len) { void *cli_va; diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index bf53798..dd685ee 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -95,7 +95,6 @@ #ifndef __ASSEMBLY__ -typedef xen_pfn_t tmem_cli_mfn_t; typedef XEN_GUEST_HANDLE(char) tmem_cli_va_t; struct tmem_op { uint32_t cmd; @@ -121,7 +120,7 @@ struct tmem_op { uint32_t tmem_offset; uint32_t pfn_offset; uint32_t len; - tmem_cli_mfn_t cmfn; /* client machine page frame */ + xen_pfn_t cmfn; /* client machine page frame */ } gen; /* for all other cmd ("generic") */ } u; }; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index f05d0f5..b24246c 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -489,19 +489,19 @@ static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, #define tmh_cli_id_str "domid" #define tmh_client_str "domain" -int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t, +int tmh_decompress_to_client(xen_pfn_t, void *, size_t, tmem_cli_va_param_t); -int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *, +int tmh_compress_from_client(xen_pfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(struct page_info *, tmem_cli_mfn_t, pagesize_t tmem_offset, +int tmh_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(tmem_cli_mfn_t, struct page_info *, pagesize_t tmem_offset, +int tmh_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -extern int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, pagesize_t len); +extern int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); #define tmh_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) #define tmh_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:21 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09: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 1Vk9GG-0004aE-Vq; Sat, 23 Nov 2013 09:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GG-0004a4-42 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:20 +0000 Received: from [85.158.137.68:41630] by server-2.bemta-3.messagelabs.com id 61/D4-17329-37170925; Sat, 23 Nov 2013 09:12:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1385197937!3284141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20156 invoked from network); 23 Nov 2013 09:12:18 -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; 23 Nov 2013 09:12:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GD-0002bv-1L for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GC-00048W-Oq for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:16 +0000 Date: Sat, 23 Nov 2013 09:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef tmem_cli_mfn_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 006a687ba4de74d7933c09b43872abc19f126c63 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:49 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: drop typedef tmem_cli_mfn_t Using 'xen_pfn_t' directly instead of 'tmem_cli_mfn_t' to make code more readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 10 +++++----- xen/common/tmem_xen.c | 14 +++++++------- xen/include/public/tmem.h | 3 +-- xen/include/xen/tmem_xen.h | 10 +++++----- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 4a278f2..f3a0d91 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -370,7 +370,7 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) #define NOT_SHAREABLE ((uint16_t)-1UL) -static NOINLINE int pcd_copy_to_client(tmem_cli_mfn_t cmfn, pgp_t *pgp) +static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) { uint8_t firstbyte = pgp->firstbyte; pcd_t *pcd; @@ -1436,7 +1436,7 @@ static inline void tmem_ensure_avail_pages(void) /************ TMEM CORE OPERATIONS ************************************/ -static NOINLINE int do_tmem_put_compress(pgp_t *pgp, tmem_cli_mfn_t cmfn, +static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { void *dst, *p; @@ -1479,7 +1479,7 @@ out: return ret; } -static NOINLINE int do_tmem_dup_put(pgp_t *pgp, tmem_cli_mfn_t cmfn, +static NOINLINE int do_tmem_dup_put(pgp_t *pgp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -1571,7 +1571,7 @@ cleanup: static NOINLINE int do_tmem_put(pool_t *pool, OID *oidp, uint32_t index, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { obj_t *obj = NULL, *objfound = NULL, *objnew = NULL; @@ -1714,7 +1714,7 @@ free: } static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { obj_t *obj; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index cbcdb1a..e1e83d2 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -55,7 +55,7 @@ void tmh_copy_page(char *to, char*from) } #if defined(CONFIG_ARM) -static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, +static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { ASSERT(0); @@ -70,7 +70,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, #else #include -static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, +static inline void *cli_get_page(xen_pfn_t cmfn, unsigned long *pcli_mfn, struct page_info **pcli_pfp, bool_t cli_write) { p2m_type_t t; @@ -110,7 +110,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, #endif EXPORT int tmh_copy_from_client(struct page_info *pfp, - tmem_cli_mfn_t cmfn, pagesize_t tmem_offset, + xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { unsigned long tmem_mfn, cli_mfn = 0; @@ -158,7 +158,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, return rc; } -EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, +EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, void **out_va, size_t *out_len, tmem_cli_va_param_t clibuf) { int ret = 0; @@ -190,7 +190,7 @@ EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, +EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -229,7 +229,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_mfn_t cmfn, struct page_info *pfp, return rc; } -EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, +EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; @@ -258,7 +258,7 @@ EXPORT int tmh_decompress_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, return 1; } -EXPORT int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, +EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len) { void *cli_va; diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index bf53798..dd685ee 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -95,7 +95,6 @@ #ifndef __ASSEMBLY__ -typedef xen_pfn_t tmem_cli_mfn_t; typedef XEN_GUEST_HANDLE(char) tmem_cli_va_t; struct tmem_op { uint32_t cmd; @@ -121,7 +120,7 @@ struct tmem_op { uint32_t tmem_offset; uint32_t pfn_offset; uint32_t len; - tmem_cli_mfn_t cmfn; /* client machine page frame */ + xen_pfn_t cmfn; /* client machine page frame */ } gen; /* for all other cmd ("generic") */ } u; }; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index f05d0f5..b24246c 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -489,19 +489,19 @@ static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, #define tmh_cli_id_str "domid" #define tmh_client_str "domain" -int tmh_decompress_to_client(tmem_cli_mfn_t, void *, size_t, +int tmh_decompress_to_client(xen_pfn_t, void *, size_t, tmem_cli_va_param_t); -int tmh_compress_from_client(tmem_cli_mfn_t, void **, size_t *, +int tmh_compress_from_client(xen_pfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(struct page_info *, tmem_cli_mfn_t, pagesize_t tmem_offset, +int tmh_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(tmem_cli_mfn_t, struct page_info *, pagesize_t tmem_offset, +int tmh_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -extern int tmh_copy_tze_to_client(tmem_cli_mfn_t cmfn, void *tmem_va, pagesize_t len); +extern int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); #define tmh_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) #define tmh_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12: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 1Vk9GV-0004cM-3J; Sat, 23 Nov 2013 09:12:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GT-0004c3-AK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:33 +0000 Received: from [85.158.139.211:22743] by server-15.bemta-5.messagelabs.com id 40/5D-08490-08170925; Sat, 23 Nov 2013 09:12:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385197947!3782667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16392 invoked from network); 23 Nov 2013 09:12:28 -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; 23 Nov 2013 09:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GN-0002c1-8w for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GN-00048y-6D for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:27 +0000 Date: Sat, 23 Nov 2013 09:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: rename 'tmh_' with 'tmem_' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f4271763027700168f2aac9b561633c2fccca59 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:50 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: rename 'tmh_' with 'tmem_' tmem was designed can be ported to other platform besides xen easily, but I don't think anybody will port tmem to other platform. And this flexible character made tmem not easy for understand, there are too many 'tmh_' and 'tmem_' functions and variables. This patch replace all 'tmh_' functions/variables with 'tmem_' to make code more readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 416 ++++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 102 ++++++------ xen/include/xen/tmem_xen.h | 210 +++++++++++------------ 3 files changed, 356 insertions(+), 372 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f3a0d91..7d22e0c 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -29,12 +29,6 @@ #define TMEM_SPEC_VERSION 1 -/************ INTERFACE TO TMEM HOST-DEPENDENT (tmh) CODE ************/ - -#define CLI_ID_NULL TMH_CLI_ID_NULL -#define cli_id_str tmh_cli_id_str -#define client_str tmh_client_str - /************ DEBUG and STATISTICS (+ some compression testing) *******/ #ifndef NDEBUG @@ -110,7 +104,7 @@ struct tmem_page_content_descriptor; struct client { struct list_head client_list; struct tm_pool *pools[MAX_POOLS_PER_DOMAIN]; - tmh_client_t *tmh; + tmem_client_t *tmem; struct list_head ephemeral_page_list; long eph_count, eph_count_max; cli_id_t cli_id; @@ -275,22 +269,22 @@ static int tmem_initialized = 0; /************ CONCURRENCY ***********************************************/ -EXPORT DEFINE_SPINLOCK(tmem_spinlock); /* used iff tmh_lock_all */ -EXPORT DEFINE_RWLOCK(tmem_rwlock); /* used iff !tmh_lock_all */ +EXPORT DEFINE_SPINLOCK(tmem_spinlock); /* used iff tmem_lock_all */ +EXPORT DEFINE_RWLOCK(tmem_rwlock); /* used iff !tmem_lock_all */ static DEFINE_SPINLOCK(eph_lists_spinlock); /* protects global AND clients */ static DEFINE_SPINLOCK(pers_lists_spinlock); -#define tmem_spin_lock(_l) do {if (!tmh_lock_all) spin_lock(_l);}while(0) -#define tmem_spin_unlock(_l) do {if (!tmh_lock_all) spin_unlock(_l);}while(0) -#define tmem_read_lock(_l) do {if (!tmh_lock_all) read_lock(_l);}while(0) -#define tmem_read_unlock(_l) do {if (!tmh_lock_all) read_unlock(_l);}while(0) -#define tmem_write_lock(_l) do {if (!tmh_lock_all) write_lock(_l);}while(0) -#define tmem_write_unlock(_l) do {if (!tmh_lock_all) write_unlock(_l);}while(0) -#define tmem_write_trylock(_l) ((tmh_lock_all)?1:write_trylock(_l)) -#define tmem_spin_trylock(_l) (tmh_lock_all?1:spin_trylock(_l)) +#define tmem_spin_lock(_l) do {if (!tmem_lock_all) spin_lock(_l);}while(0) +#define tmem_spin_unlock(_l) do {if (!tmem_lock_all) spin_unlock(_l);}while(0) +#define tmem_read_lock(_l) do {if (!tmem_lock_all) read_lock(_l);}while(0) +#define tmem_read_unlock(_l) do {if (!tmem_lock_all) read_unlock(_l);}while(0) +#define tmem_write_lock(_l) do {if (!tmem_lock_all) write_lock(_l);}while(0) +#define tmem_write_unlock(_l) do {if (!tmem_lock_all) write_unlock(_l);}while(0) +#define tmem_write_trylock(_l) ((tmem_lock_all)?1:write_trylock(_l)) +#define tmem_spin_trylock(_l) (tmem_lock_all?1:spin_trylock(_l)) -#define ASSERT_SPINLOCK(_l) ASSERT(tmh_lock_all || spin_is_locked(_l)) -#define ASSERT_WRITELOCK(_l) ASSERT(tmh_lock_all || rw_is_write_locked(_l)) +#define ASSERT_SPINLOCK(_l) ASSERT(tmem_lock_all || spin_is_locked(_l)) +#define ASSERT_WRITELOCK(_l) ASSERT(tmem_lock_all || rw_is_write_locked(_l)) /* global counters (should use long_atomic_t access) */ static long global_eph_count = 0; /* atomicity depends on eph_lists_spinlock */ @@ -325,9 +319,9 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) void *v; if ( (pool != NULL) && is_persistent(pool) ) - v = tmh_alloc_subpage_thispool(pool,size,align); + v = tmem_alloc_subpage_thispool(pool,size,align); else - v = tmh_alloc_subpage(pool, size, align); + v = tmem_alloc_subpage(pool, size, align); if ( v == NULL ) alloc_failed++; return v; @@ -336,9 +330,9 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) { if ( pool == NULL || !is_persistent(pool) ) - tmh_free_subpage(p,size); + tmem_free_subpage(p,size); else - tmh_free_subpage_thispool(pool,p,size); + tmem_free_subpage_thispool(pool,p,size); } static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) @@ -346,9 +340,9 @@ static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) - pfp = tmh_alloc_page_thispool(pool); + pfp = tmem_alloc_page_thispool(pool); else - pfp = tmh_alloc_page(pool,0); + pfp = tmem_alloc_page(pool,0); if ( pfp == NULL ) alloc_page_failed++; else @@ -360,9 +354,9 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) - tmh_free_page(pfp); + tmem_free_page(pfp); else - tmh_free_page_thispool(pool,pfp); + tmem_free_page_thispool(pool,pfp); atomic_dec_and_assert(global_page_count); } @@ -376,18 +370,18 @@ static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) pcd_t *pcd; int ret; - ASSERT(tmh_dedup_enabled()); + ASSERT(tmem_dedup_enabled()); tmem_read_lock(&pcd_tree_rwlocks[firstbyte]); pcd = pgp->pcd; if ( pgp->size < PAGE_SIZE && pgp->size != 0 && pcd->size < PAGE_SIZE && pcd->size != 0 ) - ret = tmh_decompress_to_client(cmfn, pcd->cdata, pcd->size, - tmh_cli_buf_null); - else if ( tmh_tze_enabled() && pcd->size < PAGE_SIZE ) - ret = tmh_copy_tze_to_client(cmfn, pcd->tze, pcd->size); + ret = tmem_decompress_to_client(cmfn, pcd->cdata, pcd->size, + tmem_cli_buf_null); + else if ( tmem_tze_enabled() && pcd->size < PAGE_SIZE ) + ret = tmem_copy_tze_to_client(cmfn, pcd->tze, pcd->size); else - ret = tmh_copy_to_client(cmfn, pcd->pfp, 0, 0, PAGE_SIZE, - tmh_cli_buf_null); + ret = tmem_copy_to_client(cmfn, pcd->pfp, 0, 0, PAGE_SIZE, + tmem_cli_buf_null); tmem_read_unlock(&pcd_tree_rwlocks[firstbyte]); return ret; } @@ -405,7 +399,7 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ char *pcd_cdata = pgp->pcd->cdata; pagesize_t pcd_csize = pgp->pcd->size; - ASSERT(tmh_dedup_enabled()); + ASSERT(tmem_dedup_enabled()); ASSERT(firstbyte != NOT_SHAREABLE); ASSERT(firstbyte < 256); @@ -447,9 +441,9 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ tmem_free(pcd_tze,pcd_size,pool); } else { /* real physical page */ - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) pcd_tot_tze_size -= PAGE_SIZE; - if ( tmh_compression_enabled() ) + if ( tmem_compression_enabled() ) pcd_tot_csize -= PAGE_SIZE; tmem_page_free(pool,pfp); } @@ -464,10 +458,10 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) pcd_t *pcd; int cmp; pagesize_t pfp_size = 0; - uint8_t firstbyte = (cdata == NULL) ? tmh_get_first_byte(pgp->pfp) : *cdata; + uint8_t firstbyte = (cdata == NULL) ? tmem_get_first_byte(pgp->pfp) : *cdata; int ret = 0; - if ( !tmh_dedup_enabled() ) + if ( !tmem_dedup_enabled() ) return 0; ASSERT(pgp->us.obj != NULL); ASSERT(pgp->us.obj->pool != NULL); @@ -476,9 +470,9 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) { ASSERT(pgp->pfp != NULL); pfp_size = PAGE_SIZE; - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) { - pfp_size = tmh_tze_pfp_scan(pgp->pfp); + pfp_size = tmem_tze_pfp_scan(pgp->pfp); if ( pfp_size > PCD_TZE_MAX_SIZE ) pfp_size = PAGE_SIZE; } @@ -499,25 +493,25 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) { if ( pcd->size < PAGE_SIZE ) /* both new entry and rbtree entry are compressed */ - cmp = tmh_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); + cmp = tmem_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); else /* new entry is compressed, rbtree entry is not */ cmp = -1; } else if ( pcd->size < PAGE_SIZE ) /* rbtree entry is compressed, rbtree entry is not */ cmp = 1; - else if ( tmh_tze_enabled() ) { + else if ( tmem_tze_enabled() ) { if ( pcd->size < PAGE_SIZE ) /* both new entry and rbtree entry are trailing zero */ - cmp = tmh_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); + cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); else /* new entry is trailing zero, rbtree entry is not */ - cmp = tmh_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); + cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); } else { /* both new entry and rbtree entry are full physical pages */ ASSERT(pgp->pfp != NULL); ASSERT(pcd->pfp != NULL); - cmp = tmh_page_cmp(pgp->pfp,pcd->pfp); + cmp = tmem_page_cmp(pgp->pfp,pcd->pfp); } /* walk tree or match depending on cmp */ @@ -559,21 +553,21 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) pcd->size = csize; pcd_tot_csize += csize; } else if ( pfp_size == 0 ) { - ASSERT(tmh_tze_enabled()); + ASSERT(tmem_tze_enabled()); pcd->size = 0; pcd->tze = NULL; } else if ( pfp_size < PAGE_SIZE && ((pcd->tze = tmem_malloc_bytes(pfp_size,pgp->us.obj->pool)) != NULL) ) { - tmh_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); + tmem_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); pcd->size = pfp_size; pcd_tot_tze_size += pfp_size; tmem_page_free(pgp->us.obj->pool,pgp->pfp); } else { pcd->pfp = pgp->pfp; pcd->size = PAGE_SIZE; - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) pcd_tot_tze_size += PAGE_SIZE; - if ( tmh_compression_enabled() ) + if ( tmem_compression_enabled() ) pcd_tot_csize += PAGE_SIZE; } rb_link_node(&pcd->pcd_rb_tree_node, parent, new); @@ -608,7 +602,7 @@ static NOINLINE pgp_t *pgp_alloc(obj_t *obj) INIT_LIST_HEAD(&pgp->global_eph_pages); INIT_LIST_HEAD(&pgp->us.client_eph_pages); pgp->pfp = NULL; - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { pgp->firstbyte = NOT_SHAREABLE; pgp->eviction_attempted = 0; @@ -639,7 +633,7 @@ static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) if ( pgp->pfp == NULL ) return; - if ( tmh_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) + if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) pcd_disassociate(pgp,pool,0); /* pgp->size lost */ else if ( pgp_size ) tmem_free(pgp->cdata,pgp_size,pool); @@ -876,7 +870,7 @@ void oid_set_invalid(OID *oidp) unsigned oid_hash(OID *oidp) { - return (tmh_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], + return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } @@ -895,7 +889,7 @@ restart_find: switch ( oid_compare(&obj->oid, oidp) ) { case 0: /* equal */ - if ( tmh_lock_all ) + if ( tmem_lock_all ) obj->no_evict = 1; else { @@ -942,7 +936,7 @@ static NOINLINE void obj_free(obj_t *obj, int no_rebalance) obj->pool = NULL; old_oid = obj->oid; oid_set_invalid(&obj->oid); - obj->last_client = CLI_ID_NULL; + obj->last_client = TMEM_CLI_ID_NULL; atomic_dec_and_assert(global_obj_count); /* use no_rebalance only if all objects are being destroyed anyway */ if ( !no_rebalance ) @@ -1001,7 +995,7 @@ static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) obj->oid = *oidp; obj->objnode_count = 0; obj->pgp_count = 0; - obj->last_client = CLI_ID_NULL; + obj->last_client = TMEM_CLI_ID_NULL; SET_SENTINEL(obj,OBJ); tmem_spin_lock(&obj->obj_spinlock); obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj); @@ -1056,7 +1050,7 @@ static pool_t * pool_alloc(void) pool_t *pool; int i; - if ( (pool = tmh_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) + if ( (pool = tmem_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1085,7 +1079,7 @@ static NOINLINE void pool_free(pool_t *pool) INVERT_SENTINEL(pool,POOL); pool->client = NULL; list_del(&pool->pool_list); - tmh_free_infra(pool); + tmem_free_infra(pool); } /* register new_client as a user of this shared pool and return new @@ -1100,8 +1094,8 @@ static int shared_pool_join(pool_t *pool, client_t *new_client) sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); if ( new_client->cli_id != pool->client->cli_id ) - tmh_client_info("adding new %s %d to shared pool owned by %s %d\n", - client_str, new_client->cli_id, client_str, pool->client->cli_id); + tmem_client_info("adding new %s %d to shared pool owned by %s %d\n", + tmem_client_str, new_client->cli_id, tmem_client_str, pool->client->cli_id); return ++pool->shared_count; } @@ -1130,8 +1124,8 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) old_client->eph_count -= _atomic_read(pool->pgp_count); list_splice_init(&old_client->ephemeral_page_list, &new_client->ephemeral_page_list); - tmh_client_info("reassigned shared pool from %s=%d to %s=%d pool_id=%d\n", - cli_id_str, old_client->cli_id, cli_id_str, new_client->cli_id, poolid); + tmem_client_info("reassigned shared pool from %s=%d to %s=%d pool_id=%d\n", + tmem_cli_id_str, old_client->cli_id, tmem_cli_id_str, new_client->cli_id, poolid); pool->pool_id = poolid; } @@ -1166,8 +1160,8 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) } return 0; } - tmh_client_warn("tmem: no match unsharing pool, %s=%d\n", - cli_id_str,pool->client->cli_id); + tmem_client_warn("tmem: no match unsharing pool, %s=%d\n", + tmem_cli_id_str,pool->client->cli_id); return -1; } @@ -1177,22 +1171,22 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) ASSERT(pool != NULL); if ( (is_shared(pool)) && (shared_pool_quit(pool,cli_id) > 0) ) { - tmh_client_warn("tmem: %s=%d no longer using shared pool %d owned by %s=%d\n", - cli_id_str, cli_id, pool->pool_id, cli_id_str,pool->client->cli_id); + tmem_client_warn("tmem: %s=%d no longer using shared pool %d owned by %s=%d\n", + tmem_cli_id_str, cli_id, pool->pool_id, tmem_cli_id_str,pool->client->cli_id); return; } - tmh_client_info("%s %s-%s tmem pool %s=%d pool_id=%d\n", + tmem_client_info("%s %s-%s tmem pool %s=%d pool_id=%d\n", destroy ? "destroying" : "flushing", is_persistent(pool) ? "persistent" : "ephemeral" , is_shared(pool) ? "shared" : "private", - cli_id_str, pool->client->cli_id, pool->pool_id); + tmem_cli_id_str, pool->client->cli_id, pool->pool_id); if ( pool->client->live_migrating ) { - tmh_client_warn("can't %s pool while %s is live-migrating\n", - destroy?"destroy":"flush", client_str); + tmem_client_warn("can't %s pool while %s is live-migrating\n", + destroy?"destroy":"flush", tmem_client_str); return; } - pool_destroy_objs(pool,0,CLI_ID_NULL); + pool_destroy_objs(pool,0,TMEM_CLI_ID_NULL); if ( destroy ) { pool->client->pools[pool->pool_id] = NULL; @@ -1204,30 +1198,30 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) static client_t *client_create(cli_id_t cli_id) { - client_t *client = tmh_alloc_infra(sizeof(client_t),__alignof__(client_t)); + client_t *client = tmem_alloc_infra(sizeof(client_t),__alignof__(client_t)); int i; - tmh_client_info("tmem: initializing tmem capability for %s=%d...", - cli_id_str, cli_id); + tmem_client_info("tmem: initializing tmem capability for %s=%d...", + tmem_cli_id_str, cli_id); if ( client == NULL ) { - tmh_client_err("failed... out of memory\n"); + tmem_client_err("failed... out of memory\n"); goto fail; } memset(client,0,sizeof(client_t)); - if ( (client->tmh = tmh_client_init(cli_id)) == NULL ) + if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { - tmh_client_err("failed... can't allocate host-dependent part of client\n"); + tmem_client_err("failed... can't allocate host-dependent part of client\n"); goto fail; } - if ( !tmh_set_client_from_id(client, client->tmh, cli_id) ) + if ( !tmem_set_client_from_id(client, client->tmem, cli_id) ) { - tmh_client_err("failed... can't set client\n"); + tmem_client_err("failed... can't set client\n"); goto fail; } client->cli_id = cli_id; - client->compress = tmh_compression_enabled(); - client->shared_auth_required = tmh_shared_auth(); + client->compress = tmem_compression_enabled(); + client->shared_auth_required = tmem_shared_auth(); for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++) client->shared_auth_uuid[i][0] = client->shared_auth_uuid[i][1] = -1L; @@ -1240,19 +1234,19 @@ static client_t *client_create(cli_id_t cli_id) client->eph_count = client->eph_count_max = 0; client->total_cycles = 0; client->succ_pers_puts = 0; client->succ_eph_gets = 0; client->succ_pers_gets = 0; - tmh_client_info("ok\n"); + tmem_client_info("ok\n"); return client; fail: - tmh_free_infra(client); + tmem_free_infra(client); return NULL; } static void client_free(client_t *client) { list_del(&client->client_list); - tmh_client_destroy(client->tmh); - tmh_free_infra(client); + tmem_client_destroy(client->tmem); + tmem_free_infra(client); } /* flush all data from a client and, optionally, free it */ @@ -1301,11 +1295,11 @@ static bool_t tmem_try_to_evict_pgp(pgp_t *pgp, bool_t *hold_pool_rwlock) if ( pool->is_dying ) return 0; - if ( tmh_lock_all && !obj->no_evict ) + if ( tmem_lock_all && !obj->no_evict ) return 1; if ( tmem_spin_trylock(&obj->obj_spinlock) ) { - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { firstbyte = pgp->firstbyte; if ( firstbyte == NOT_SHAREABLE ) @@ -1340,7 +1334,7 @@ obj_unlock: static int tmem_evict(void) { - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pgp_t *pgp = NULL, *pgp2, *pgp_del; obj_t *obj; pool_t *pool; @@ -1379,7 +1373,7 @@ found: ASSERT_SPINLOCK(&obj->obj_spinlock); pgp_del = pgp_delete_from_obj(obj, pgp->index); ASSERT(pgp_del == pgp); - if ( tmh_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) + if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) { ASSERT(pgp->pcd->pgp_ref_count == 1 || pgp->eviction_attempted); pcd_disassociate(pgp,pool,1); @@ -1406,13 +1400,13 @@ static unsigned long tmem_relinquish_npages(unsigned long n) { unsigned long avail_pages = 0; - while ( (avail_pages = tmh_avail_pages()) < n ) + while ( (avail_pages = tmem_page_list_pages) < n ) { if ( !tmem_evict() ) break; } if ( avail_pages ) - tmh_release_avail_pages_to_host(); + tmem_release_avail_pages_to_host(); return avail_pages; } @@ -1425,7 +1419,7 @@ static inline void tmem_ensure_avail_pages(void) { int failed_evict = 10; - while ( !tmh_free_mb() ) + while ( !tmem_free_mb() ) { if ( tmem_evict() ) continue; @@ -1453,13 +1447,13 @@ static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, if ( pgp->pfp != NULL ) pgp_free_data(pgp, pgp->us.obj->pool); START_CYC_COUNTER(compress); - ret = tmh_compress_from_client(cmfn, &dst, &size, clibuf); + ret = tmem_compress_from_client(cmfn, &dst, &size, clibuf); if ( ret <= 0 ) goto out; else if ( (size == 0) || (size >= tmem_subpage_maxsize()) ) { ret = 0; goto out; - } else if ( tmh_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { + } else if ( tmem_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { if ( (ret = pcd_associate(pgp,dst,size)) == -ENOMEM ) goto out; } else if ( (p = tmem_malloc_bytes(size,pgp->us.obj->pool)) == NULL ) { @@ -1520,12 +1514,12 @@ copy_uncompressed: if ( ( pgp->pfp = tmem_page_alloc(pool) ) == NULL ) goto failed_dup; pgp->size = 0; - /* tmh_copy_from_client properly handles len==0 and offsets != 0 */ - ret = tmh_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, - tmh_cli_buf_null); + /* tmem_copy_from_client properly handles len==0 and offsets != 0 */ + ret = tmem_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, + tmem_cli_buf_null); if ( ret < 0 ) goto bad_copy; - if ( tmh_dedup_enabled() && !is_persistent(pool) ) + if ( tmem_dedup_enabled() && !is_persistent(pool) ) { if ( pcd_associate(pgp,NULL,0) == -ENOMEM ) goto failed_dup; @@ -1645,12 +1639,12 @@ copy_uncompressed: ret = -ENOMEM; goto delete_and_free; } - /* tmh_copy_from_client properly handles len==0 (TMEM_NEW_PAGE) */ - ret = tmh_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, + /* tmem_copy_from_client properly handles len==0 (TMEM_NEW_PAGE) */ + ret = tmem_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, clibuf); if ( ret < 0 ) goto bad_copy; - if ( tmh_dedup_enabled() && !is_persistent(pool) ) + if ( tmem_dedup_enabled() && !is_persistent(pool) ) { if ( pcd_associate(pgp,NULL,0) == -ENOMEM ) goto delete_and_free; @@ -1743,18 +1737,18 @@ static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, return 0; } ASSERT(pgp->size != -1); - if ( tmh_dedup_enabled() && !is_persistent(pool) && + if ( tmem_dedup_enabled() && !is_persistent(pool) && pgp->firstbyte != NOT_SHAREABLE ) rc = pcd_copy_to_client(cmfn, pgp); else if ( pgp->size != 0 ) { START_CYC_COUNTER(decompress); - rc = tmh_decompress_to_client(cmfn, pgp->cdata, + rc = tmem_decompress_to_client(cmfn, pgp->cdata, pgp->size, clibuf); END_CYC_COUNTER(decompress); } else - rc = tmh_copy_to_client(cmfn, pgp->pfp, tmem_offset, + rc = tmem_copy_to_client(cmfn, pgp->pfp, tmem_offset, pfn_offset, len, clibuf); if ( rc <= 0 ) goto bad_copy; @@ -1778,7 +1772,7 @@ static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, list_del(&pgp->us.client_eph_pages); list_add_tail(&pgp->us.client_eph_pages,&client->ephemeral_page_list); tmem_spin_unlock(&eph_lists_spinlock); - obj->last_client = tmh_get_cli_id_from_current(); + obj->last_client = tmem_get_cli_id_from_current(); } } if ( obj != NULL ) @@ -1857,7 +1851,7 @@ out: static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) { - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pool_t *pool; if ( client->pools == NULL ) @@ -1887,57 +1881,57 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, int s_poolid, first_unused_s_poolid; int i; - if ( this_cli_id == CLI_ID_NULL ) - cli_id = tmh_get_cli_id_from_current(); + if ( this_cli_id == TMEM_CLI_ID_NULL ) + cli_id = tmem_get_cli_id_from_current(); else cli_id = this_cli_id; - tmh_client_info("tmem: allocating %s-%s tmem pool for %s=%d...", + tmem_client_info("tmem: allocating %s-%s tmem pool for %s=%d...", persistent ? "persistent" : "ephemeral" , - shared ? "shared" : "private", cli_id_str, cli_id); + shared ? "shared" : "private", tmem_cli_id_str, cli_id); if ( specversion != TMEM_SPEC_VERSION ) { - tmh_client_err("failed... unsupported spec version\n"); + tmem_client_err("failed... unsupported spec version\n"); return -EPERM; } if ( pagebits != (PAGE_SHIFT - 12) ) { - tmh_client_err("failed... unsupported pagesize %d\n", + tmem_client_err("failed... unsupported pagesize %d\n", 1 << (pagebits + 12)); return -EPERM; } if ( flags & TMEM_POOL_PRECOMPRESSED ) { - tmh_client_err("failed... precompression flag set but unsupported\n"); + tmem_client_err("failed... precompression flag set but unsupported\n"); return -EPERM; } if ( flags & TMEM_POOL_RESERVED_BITS ) { - tmh_client_err("failed... reserved bits must be zero\n"); + tmem_client_err("failed... reserved bits must be zero\n"); return -EPERM; } if ( (pool = pool_alloc()) == NULL ) { - tmh_client_err("failed... out of memory\n"); + tmem_client_err("failed... out of memory\n"); return -ENOMEM; } - if ( this_cli_id != CLI_ID_NULL ) + if ( this_cli_id != TMEM_CLI_ID_NULL ) { - if ( (client = tmh_client_from_cli_id(this_cli_id)) == NULL + if ( (client = tmem_client_from_cli_id(this_cli_id)) == NULL || d_poolid >= MAX_POOLS_PER_DOMAIN || client->pools[d_poolid] != NULL ) goto fail; } else { - client = tmh_client_from_current(); + client = tmem_client_from_current(); ASSERT(client != NULL); for ( d_poolid = 0; d_poolid < MAX_POOLS_PER_DOMAIN; d_poolid++ ) if ( client->pools[d_poolid] == NULL ) break; if ( d_poolid >= MAX_POOLS_PER_DOMAIN ) { - tmh_client_err("failed... no more pool slots available for this %s\n", - client_str); + tmem_client_err("failed... no more pool slots available for this %s\n", + tmem_client_str); goto fail; } } @@ -1966,7 +1960,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, { if ( shpool->uuid[0] == uuid_lo && shpool->uuid[1] == uuid_hi ) { - tmh_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", + tmem_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", uuid_hi, uuid_lo, d_poolid); client->pools[d_poolid] = global_shared_pools[s_poolid]; shared_pool_join(global_shared_pools[s_poolid], client); @@ -1979,7 +1973,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, } if ( first_unused_s_poolid == MAX_GLOBAL_SHARED_POOLS ) { - tmh_client_warn("tmem: failed... no global shared pool slots available\n"); + tmem_client_warn("tmem: failed... no global shared pool slots available\n"); goto fail; } else @@ -1995,7 +1989,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, pool->pool_id = d_poolid; pool->persistent = persistent; pool->uuid[0] = uuid_lo; pool->uuid[1] = uuid_hi; - tmh_client_info("pool_id=%d\n", d_poolid); + tmem_client_info("pool_id=%d\n", d_poolid); return d_poolid; fail: @@ -2014,19 +2008,19 @@ static int tmemc_freeze_pools(cli_id_t cli_id, int arg) char *s; s = destroy ? "destroyed" : ( freeze ? "frozen" : "thawed" ); - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) { list_for_each_entry(client,&global_client_list,client_list) client_freeze(client,freeze); - tmh_client_info("tmem: all pools %s for all %ss\n", s, client_str); + tmem_client_info("tmem: all pools %s for all %ss\n", s, tmem_client_str); } else { - if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; client_freeze(client,freeze); - tmh_client_info("tmem: all pools %s for %s=%d\n", - s, cli_id_str, cli_id); + tmem_client_info("tmem: all pools %s for %s=%d\n", + s, tmem_cli_id_str, cli_id); } return 0; } @@ -2035,10 +2029,10 @@ static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) { uint32_t npages, flushed_pages, flushed_kb; - if ( cli_id != CLI_ID_NULL ) + if ( cli_id != TMEM_CLI_ID_NULL ) { - tmh_client_warn("tmem: %s-specific flush not supported yet, use --all\n", - client_str); + tmem_client_warn("tmem: %s-specific flush not supported yet, use --all\n", + tmem_client_str); return -1; } /* convert kb to pages, rounding up if necessary */ @@ -2078,7 +2072,7 @@ static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, c->eph_count, c->eph_count_max, c->compressed_pages, c->compressed_sum_size, c->compress_poor, c->compress_nomem); - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; for ( i = 0; i < MAX_POOLS_PER_DOMAIN; i++ ) { @@ -2106,7 +2100,7 @@ static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; } return sum; @@ -2145,7 +2139,7 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; } return sum; @@ -2172,7 +2166,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, n += scnprintf(info+n,BSIZE-n,"\n"); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; return sum; } @@ -2190,7 +2184,7 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, "Tt:%lu,Te:%lu,Cf:%lu,Af:%lu,Pf:%lu,Ta:%lu," "Lm:%lu,Et:%lu,Ea:%lu,Rt:%lu,Ra:%lu,Rx:%lu,Fp:%lu%c", total_tmem_ops, errored_tmem_ops, failed_copies, - alloc_failed, alloc_page_failed, tmh_avail_pages(), + alloc_failed, alloc_page_failed, tmem_page_list_pages, low_on_memory, evicted_pgs, evict_attempts, relinq_pgs, relinq_attempts, max_evicts_per_relinq, total_flush_pool, use_long ? ',' : '\n'); @@ -2207,7 +2201,7 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, tot_good_eph_puts,deduped_puts,pcd_tot_tze_size,pcd_tot_csize); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; return sum; } @@ -2218,14 +2212,14 @@ static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, client_t *client; int off = 0; - if ( cli_id == CLI_ID_NULL ) { + if ( cli_id == TMEM_CLI_ID_NULL ) { off = tmemc_list_global(buf,0,len,use_long); off += tmemc_list_shared(buf,off,len-off,use_long); list_for_each_entry(client,&global_client_list,client_list) off += tmemc_list_client(client, buf, off, len-off, use_long); off += tmemc_list_global_perf(buf,off,len-off,use_long); } - else if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + else if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; else off = tmemc_list_client(client, buf, 0, len, use_long); @@ -2243,30 +2237,30 @@ static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) case TMEMC_SET_WEIGHT: old_weight = client->weight; client->weight = arg1; - tmh_client_info("tmem: weight set to %d for %s=%d\n", - arg1, cli_id_str, cli_id); + tmem_client_info("tmem: weight set to %d for %s=%d\n", + arg1, tmem_cli_id_str, cli_id); atomic_sub(old_weight,&client_weight_total); atomic_add(client->weight,&client_weight_total); break; case TMEMC_SET_CAP: client->cap = arg1; - tmh_client_info("tmem: cap set to %d for %s=%d\n", - arg1, cli_id_str, cli_id); + tmem_client_info("tmem: cap set to %d for %s=%d\n", + arg1, tmem_cli_id_str, cli_id); break; case TMEMC_SET_COMPRESS: - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { - tmh_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", - tmh_compression_enabled() ? "enabled" : "disabled", - client_str); + tmem_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", + tmem_compression_enabled() ? "enabled" : "disabled", + tmem_client_str); return -1; } client->compress = arg1 ? 1 : 0; - tmh_client_info("tmem: compression %s for %s=%d\n", - arg1 ? "enabled" : "disabled",cli_id_str,cli_id); + tmem_client_info("tmem: compression %s for %s=%d\n", + arg1 ? "enabled" : "disabled",tmem_cli_id_str,cli_id); break; default: - tmh_client_warn("tmem: unknown subop %d for tmemc_set_var\n", subop); + tmem_client_warn("tmem: unknown subop %d for tmemc_set_var\n", subop); return -1; } return 0; @@ -2276,10 +2270,10 @@ static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) { client_t *client; - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) list_for_each_entry(client,&global_client_list,client_list) tmemc_set_var_one(client, subop, arg1); - else if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + else if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; else tmemc_set_var_one(client, subop, arg1); @@ -2292,12 +2286,12 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, client_t *client; int i, free = -1; - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) { global_shared_auth = auth; return 1; } - client = tmh_client_from_cli_id(cli_id); + client = tmem_client_from_cli_id(cli_id); if ( client == NULL ) return -EINVAL; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++) @@ -2326,7 +2320,7 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, uint32_t subop, tmem_cli_va_param_t buf, uint32_t arg1) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; uint32_t p; @@ -2394,7 +2388,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, case TMEMC_SAVE_GET_POOL_UUID: if ( pool == NULL ) break; - tmh_copy_to_client_buf(buf, pool->uuid, 2); + tmem_copy_to_client_buf(buf, pool->uuid, 2); rc = 0; break; case TMEMC_SAVE_END: @@ -2415,7 +2409,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; pgp_t *pgp; @@ -2458,8 +2452,8 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, BUILD_BUG_ON(sizeof(h.oid) != sizeof(oid)); memcpy(h.oid, oid.oid, sizeof(h.oid)); h.index = pgp->index; - tmh_copy_to_client_buf(buf, &h, 1); - tmh_client_buf_add(buf, sizeof(h)); + tmem_copy_to_client_buf(buf, &h, 1); + tmem_client_buf_add(buf, sizeof(h)); ret = do_tmem_get(pool, &oid, pgp->index, 0, 0, 0, pagesize, buf); out: @@ -2470,7 +2464,7 @@ out: static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pgp_t *pgp; struct tmem_handle h; int ret = 0; @@ -2502,7 +2496,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, BUILD_BUG_ON(sizeof(h.oid) != sizeof(pgp->inv_oid)); memcpy(h.oid, pgp->inv_oid.oid, sizeof(h.oid)); h.index = pgp->index; - tmh_copy_to_client_buf(buf, &h, 1); + tmem_copy_to_client_buf(buf, &h, 1); ret = 1; out: tmem_spin_unlock(&pers_lists_spinlock); @@ -2512,7 +2506,7 @@ out: static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; @@ -2524,7 +2518,7 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, OID *oidp, uint32_t index) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; @@ -2540,7 +2534,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) uint32_t subop = op->u.ctrl.subop; OID *oidp = (OID *)(&op->u.ctrl.oid[0]); - if (!tmh_current_is_privileged()) + if (!tmem_current_is_privileged()) return -EPERM; switch(subop) @@ -2564,7 +2558,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) ret = tmemc_set_var(op->u.ctrl.cli_id,subop,op->u.ctrl.arg1); break; case TMEMC_QUERY_FREEABLE_MB: - ret = tmh_freeable_pages() >> (20 - PAGE_SHIFT); + ret = tmem_freeable_pages() >> (20 - PAGE_SHIFT); break; case TMEMC_SAVE_BEGIN: case TMEMC_RESTORE_BEGIN: @@ -2612,7 +2606,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) EXPORT long do_tmem_op(tmem_cli_op_t uops) { struct tmem_op op; - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pool_t *pool = NULL; OID *oidp; int rc = 0; @@ -2630,14 +2624,14 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) if ( !tmem_initialized ) return -ENODEV; - if ( !tmh_current_permitted() ) + if ( !tmem_current_permitted() ) return -EPERM; total_tmem_ops++; - if ( tmh_lock_all ) + if ( tmem_lock_all ) { - if ( tmh_lock_all > 1 ) + if ( tmem_lock_all > 1 ) spin_lock_irq(&tmem_spinlock); else spin_lock(&tmem_spinlock); @@ -2650,21 +2644,21 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) DUP_START_CYC_COUNTER(flush,succ_get); DUP_START_CYC_COUNTER(flush_obj,succ_get); - if ( client != NULL && tmh_client_is_dying(client) ) + if ( client != NULL && tmem_client_is_dying(client) ) { rc = -ENODEV; - if ( tmh_lock_all ) + if ( tmem_lock_all ) goto out; simple_error: errored_tmem_ops++; return rc; } - if ( unlikely(tmh_get_tmemop_from_client(&op, uops) != 0) ) + if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) ) { - tmh_client_err("tmem: can't get tmem struct from %s\n", client_str); + tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str); rc = -EFAULT; - if ( !tmh_lock_all ) + if ( !tmem_lock_all ) goto simple_error; goto out; } @@ -2694,10 +2688,10 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) { tmem_write_lock(&tmem_rwlock); tmem_write_lock_set = 1; - if ( (client = client_create(tmh_get_cli_id_from_current())) == NULL ) + if ( (client = client_create(tmem_get_cli_id_from_current())) == NULL ) { - tmh_client_err("tmem: can't create tmem structure for %s\n", - client_str); + tmem_client_err("tmem: can't create tmem structure for %s\n", + tmem_client_str); rc = -ENOMEM; goto out; } @@ -2721,7 +2715,7 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) if ( ((uint32_t)op.pool_id >= MAX_POOLS_PER_DOMAIN) || ((pool = client->pools[op.pool_id]) == NULL) ) { - tmh_client_err("tmem: operation requested on uncreated pool\n"); + tmem_client_err("tmem: operation requested on uncreated pool\n"); rc = -ENODEV; goto out; } @@ -2732,24 +2726,24 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) switch ( op.cmd ) { case TMEM_NEW_POOL: - rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.creat.flags, + rc = do_tmem_new_pool(TMEM_CLI_ID_NULL, 0, op.u.creat.flags, op.u.creat.uuid[0], op.u.creat.uuid[1]); break; case TMEM_NEW_PAGE: tmem_ensure_avail_pages(); rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, 0, - tmh_cli_buf_null); + tmem_cli_buf_null); break; case TMEM_PUT_PAGE: tmem_ensure_avail_pages(); rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, - PAGE_SIZE, tmh_cli_buf_null); + PAGE_SIZE, tmem_cli_buf_null); if (rc == 1) succ_put = 1; else non_succ_put = 1; break; case TMEM_GET_PAGE: rc = do_tmem_get(pool, oidp, op.u.gen.index, op.u.gen.cmfn, - 0, 0, PAGE_SIZE, tmh_cli_buf_null); + 0, 0, PAGE_SIZE, tmem_cli_buf_null); if (rc == 1) succ_get = 1; else non_succ_get = 1; break; @@ -2768,21 +2762,21 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) case TMEM_READ: rc = do_tmem_get(pool, oidp, op.u.gen.index, op.u.gen.cmfn, op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmh_cli_buf_null); + op.u.gen.len, tmem_cli_buf_null); break; case TMEM_WRITE: rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmh_cli_buf_null); + op.u.gen.len, tmem_cli_buf_null); break; case TMEM_XCHG: /* need to hold global lock to ensure xchg is atomic */ - tmh_client_warn("tmem_xchg op not implemented yet\n"); + tmem_client_warn("tmem_xchg op not implemented yet\n"); rc = 0; break; default: - tmh_client_warn("tmem: op %d not implemented\n", op.cmd); + tmem_client_warn("tmem: op %d not implemented\n", op.cmd); rc = 0; break; } @@ -2803,9 +2797,9 @@ out: else if ( flush_obj ) END_CYC_COUNTER_CLI(flush_obj,client); - if ( tmh_lock_all ) + if ( tmem_lock_all ) { - if ( tmh_lock_all > 1 ) + if ( tmem_lock_all > 1 ) spin_unlock_irq(&tmem_spinlock); else spin_unlock(&tmem_spinlock); @@ -2829,22 +2823,22 @@ EXPORT void tmem_destroy(void *v) if ( client == NULL ) return; - if ( !tmh_client_is_dying(client) ) + if ( !tmem_client_is_dying(client) ) { printk("tmem: tmem_destroy can only destroy dying client\n"); return; } - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else write_lock(&tmem_rwlock); printk("tmem: flushing tmem pools for %s=%d\n", - cli_id_str, client->cli_id); + tmem_cli_id_str, client->cli_id); client_flush(client, 1); - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else write_unlock(&tmem_rwlock); @@ -2855,15 +2849,15 @@ EXPORT void tmem_freeze_all(unsigned char key) { static int freeze = 0; - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else write_lock(&tmem_rwlock); freeze = !freeze; - tmemc_freeze_pools(CLI_ID_NULL,freeze); + tmemc_freeze_pools(TMEM_CLI_ID_NULL,freeze); - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else write_unlock(&tmem_rwlock); @@ -2877,7 +2871,7 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) unsigned long evicts_per_relinq = 0; int max_evictions = 10; - if (!tmh_enabled() || !tmh_freeable_pages()) + if (!tmem_enabled() || !tmem_freeable_pages()) return NULL; relinq_attempts++; @@ -2889,15 +2883,15 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) return NULL; } - if ( tmh_called_from_tmem(memflags) ) + if ( tmem_called_from_tmem(memflags) ) { - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else read_lock(&tmem_rwlock); } - while ( (pfp = tmh_alloc_page(NULL,1)) == NULL ) + while ( (pfp = tmem_alloc_page(NULL,1)) == NULL ) { if ( (max_evictions-- <= 0) || !tmem_evict()) break; @@ -2905,13 +2899,13 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) } if ( evicts_per_relinq > max_evicts_per_relinq ) max_evicts_per_relinq = evicts_per_relinq; - tmh_scrub_page(pfp, memflags); + tmem_scrub_page(pfp, memflags); if ( pfp != NULL ) relinq_pgs++; - if ( tmh_called_from_tmem(memflags) ) + if ( tmem_called_from_tmem(memflags) ) { - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else read_unlock(&tmem_rwlock); @@ -2920,33 +2914,33 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) return pfp; } -EXPORT unsigned long tmem_freeable_pages(void) +unsigned long tmem_freeable_pages(void) { - return tmh_freeable_pages(); + return tmem_page_list_pages + _atomic_read(freeable_page_count); } /* called at hypervisor startup */ static int __init init_tmem(void) { int i; - if ( !tmh_enabled() ) + if ( !tmem_enabled() ) return 0; - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) for (i = 0; i < 256; i++ ) { pcd_tree_roots[i] = RB_ROOT; rwlock_init(&pcd_tree_rwlocks[i]); } - if ( tmh_init() ) + if ( tmem_init() ) { printk("tmem: initialized comp=%d dedup=%d tze=%d global-lock=%d\n", - tmh_compression_enabled(), tmh_dedup_enabled(), tmh_tze_enabled(), - tmh_lock_all); - if ( tmh_dedup_enabled()&&tmh_compression_enabled()&&tmh_tze_enabled() ) + tmem_compression_enabled(), tmem_dedup_enabled(), tmem_tze_enabled(), + tmem_lock_all); + if ( tmem_dedup_enabled()&&tmem_compression_enabled()&&tmem_tze_enabled() ) { - tmh_tze_disable(); + tmem_tze_disable(); printk("tmem: tze and compression not compatible, disabling tze\n"); } tmem_initialized = 1; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index e1e83d2..bb2b601 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -46,7 +46,7 @@ static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, workmem); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, dstmem); static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); -void tmh_copy_page(char *to, char*from) +void tmem_copy_page(char *to, char*from) { DECL_LOCAL_CYC_COUNTER(pg_copy); START_CYC_COUNTER(pg_copy); @@ -109,7 +109,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, } #endif -EXPORT int tmh_copy_from_client(struct page_info *pfp, +EXPORT int tmem_copy_from_client(struct page_info *pfp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -140,7 +140,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, } smp_mb(); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) - tmh_copy_page(tmem_va, cli_va); + tmem_copy_page(tmem_va, cli_va); else if ( (tmem_offset+len <= PAGE_SIZE) && (pfn_offset+len <= PAGE_SIZE) ) { @@ -158,7 +158,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, return rc; } -EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, +EXPORT int tmem_compress_from_client(xen_pfn_t cmfn, void **out_va, size_t *out_len, tmem_cli_va_param_t clibuf) { int ret = 0; @@ -190,7 +190,7 @@ EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, +EXPORT int tmem_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -211,7 +211,7 @@ EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, tmem_mfn = page_to_mfn(pfp); tmem_va = map_domain_page(tmem_mfn); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) - tmh_copy_page(cli_va, tmem_va); + tmem_copy_page(cli_va, tmem_va); else if ( (tmem_offset+len <= PAGE_SIZE) && (pfn_offset+len <= PAGE_SIZE) ) { if ( cli_va ) @@ -229,7 +229,7 @@ EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, return rc; } -EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, +EXPORT int tmem_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; @@ -258,7 +258,7 @@ EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, return 1; } -EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, +EXPORT int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len) { void *cli_va; @@ -282,30 +282,30 @@ EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, /****************** XEN-SPECIFIC MEMORY ALLOCATION ********************/ -EXPORT struct xmem_pool *tmh_mempool = 0; -EXPORT unsigned int tmh_mempool_maxalloc = 0; +EXPORT struct xmem_pool *tmem_mempool = 0; +EXPORT unsigned int tmem_mempool_maxalloc = 0; -EXPORT DEFINE_SPINLOCK(tmh_page_list_lock); -EXPORT PAGE_LIST_HEAD(tmh_page_list); -EXPORT unsigned long tmh_page_list_pages = 0; +EXPORT DEFINE_SPINLOCK(tmem_page_list_lock); +EXPORT PAGE_LIST_HEAD(tmem_page_list); +EXPORT unsigned long tmem_page_list_pages = 0; -/* free anything on tmh_page_list to Xen's scrub list */ -EXPORT void tmh_release_avail_pages_to_host(void) +/* free anything on tmem_page_list to Xen's scrub list */ +EXPORT void tmem_release_avail_pages_to_host(void) { - spin_lock(&tmh_page_list_lock); - while ( !page_list_empty(&tmh_page_list) ) + spin_lock(&tmem_page_list_lock); + while ( !page_list_empty(&tmem_page_list) ) { - struct page_info *pg = page_list_remove_head(&tmh_page_list); + struct page_info *pg = page_list_remove_head(&tmem_page_list); scrub_one_page(pg); - tmh_page_list_pages--; + tmem_page_list_pages--; free_domheap_page(pg); } - ASSERT(tmh_page_list_pages == 0); - INIT_PAGE_LIST_HEAD(&tmh_page_list); - spin_unlock(&tmh_page_list_lock); + ASSERT(tmem_page_list_pages == 0); + INIT_PAGE_LIST_HEAD(&tmem_page_list); + spin_unlock(&tmem_page_list_lock); } -EXPORT void tmh_scrub_page(struct page_info *pi, unsigned int memflags) +EXPORT void tmem_scrub_page(struct page_info *pi, unsigned int memflags) { if ( pi == NULL ) return; @@ -313,84 +313,84 @@ EXPORT void tmh_scrub_page(struct page_info *pi, unsigned int memflags) scrub_one_page(pi); } -static noinline void *tmh_mempool_page_get(unsigned long size) +static noinline void *tmem_mempool_page_get(unsigned long size) { struct page_info *pi; ASSERT(size == PAGE_SIZE); - if ( (pi = tmh_alloc_page(NULL,0)) == NULL ) + if ( (pi = tmem_alloc_page(NULL,0)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); } -static void tmh_mempool_page_put(void *page_va) +static void tmem_mempool_page_put(void *page_va) { ASSERT(IS_PAGE_ALIGNED(page_va)); - tmh_free_page(virt_to_page(page_va)); + tmem_free_page(virt_to_page(page_va)); } -static int __init tmh_mempool_init(void) +static int __init tmem_mempool_init(void) { - tmh_mempool = xmem_pool_create("tmem", tmh_mempool_page_get, - tmh_mempool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmh_mempool ) - tmh_mempool_maxalloc = xmem_pool_maxalloc(tmh_mempool); - return tmh_mempool != NULL; + tmem_mempool = xmem_pool_create("tmem", tmem_mempool_page_get, + tmem_mempool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( tmem_mempool ) + tmem_mempool_maxalloc = xmem_pool_maxalloc(tmem_mempool); + return tmem_mempool != NULL; } /* persistent pools are per-domain */ -static void *tmh_persistent_pool_page_get(unsigned long size) +static void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; struct domain *d = current->domain; ASSERT(size == PAGE_SIZE); - if ( (pi = _tmh_alloc_page_thispool(d)) == NULL ) + if ( (pi = _tmem_alloc_page_thispool(d)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); } -static void tmh_persistent_pool_page_put(void *page_va) +static void tmem_persistent_pool_page_put(void *page_va) { struct page_info *pi; ASSERT(IS_PAGE_ALIGNED(page_va)); pi = mfn_to_page(virt_to_mfn(page_va)); ASSERT(IS_VALID_PAGE(pi)); - _tmh_free_page_thispool(pi); + _tmem_free_page_thispool(pi); } /****************** XEN-SPECIFIC CLIENT HANDLING ********************/ -EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id) +EXPORT tmem_client_t *tmem_client_init(cli_id_t cli_id) { - tmh_client_t *tmh; + tmem_client_t *tmem; char name[5]; int i, shift; - if ( (tmh = xmalloc(tmh_client_t)) == NULL ) + if ( (tmem = xmalloc(tmem_client_t)) == NULL ) return NULL; for (i = 0, shift = 12; i < 4; shift -=4, i++) name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; name[4] = '\0'; - tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get, - tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmh->persistent_pool == NULL ) + tmem->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, + tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( tmem->persistent_pool == NULL ) { - xfree(tmh); + xfree(tmem); return NULL; } - return tmh; + return tmem; } -EXPORT void tmh_client_destroy(tmh_client_t *tmh) +EXPORT void tmem_client_destroy(tmem_client_t *tmem) { - ASSERT(tmh->domain->is_dying); - xmem_pool_destroy(tmh->persistent_pool); - tmh->domain = NULL; + ASSERT(tmem->domain->is_dying); + xmem_pool_destroy(tmem->persistent_pool); + tmem->domain = NULL; } /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ @@ -443,11 +443,11 @@ static struct notifier_block cpu_nfb = { .notifier_call = cpu_callback }; -EXPORT int __init tmh_init(void) +EXPORT int __init tmem_init(void) { unsigned int cpu; - if ( !tmh_mempool_init() ) + if ( !tmem_mempool_init() ) return 0; dstmem_order = get_order_from_pages(LZO_DSTMEM_PAGES); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index b24246c..dc37861 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -26,7 +26,7 @@ struct tmem_host_dependent_client { struct domain *domain; struct xmem_pool *persistent_pool; }; -typedef struct tmem_host_dependent_client tmh_client_t; +typedef struct tmem_host_dependent_client tmem_client_t; typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ @@ -34,55 +34,55 @@ typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ ((void *)((((unsigned long)addr + (PAGE_SIZE - 1)) & PAGE_MASK)) == addr) #define IS_VALID_PAGE(_pi) ( mfn_valid(page_to_mfn(_pi)) ) -extern struct xmem_pool *tmh_mempool; -extern unsigned int tmh_mempool_maxalloc; -extern struct page_list_head tmh_page_list; -extern spinlock_t tmh_page_list_lock; -extern unsigned long tmh_page_list_pages; +extern struct xmem_pool *tmem_mempool; +extern unsigned int tmem_mempool_maxalloc; +extern struct page_list_head tmem_page_list; +extern spinlock_t tmem_page_list_lock; +extern unsigned long tmem_page_list_pages; extern atomic_t freeable_page_count; extern spinlock_t tmem_lock; extern spinlock_t tmem_spinlock; extern rwlock_t tmem_rwlock; -extern void tmh_copy_page(char *to, char*from); -extern int tmh_init(void); -#define tmh_hash hash_long +extern void tmem_copy_page(char *to, char*from); +extern int tmem_init(void); +#define tmem_hash hash_long -extern void tmh_release_avail_pages_to_host(void); -extern void tmh_scrub_page(struct page_info *pi, unsigned int memflags); +extern void tmem_release_avail_pages_to_host(void); +extern void tmem_scrub_page(struct page_info *pi, unsigned int memflags); extern bool_t opt_tmem_compress; -static inline bool_t tmh_compression_enabled(void) +static inline bool_t tmem_compression_enabled(void) { return opt_tmem_compress; } extern bool_t opt_tmem_dedup; -static inline bool_t tmh_dedup_enabled(void) +static inline bool_t tmem_dedup_enabled(void) { return opt_tmem_dedup; } extern bool_t opt_tmem_tze; -static inline bool_t tmh_tze_enabled(void) +static inline bool_t tmem_tze_enabled(void) { return opt_tmem_tze; } -static inline void tmh_tze_disable(void) +static inline void tmem_tze_disable(void) { opt_tmem_tze = 0; } extern bool_t opt_tmem_shared_auth; -static inline bool_t tmh_shared_auth(void) +static inline bool_t tmem_shared_auth(void) { return opt_tmem_shared_auth; } extern bool_t opt_tmem; -static inline bool_t tmh_enabled(void) +static inline bool_t tmem_enabled(void) { return opt_tmem; } @@ -93,30 +93,25 @@ extern int opt_tmem_lock; * Memory free page list management */ -static inline struct page_info *tmh_page_list_get(void) +static inline struct page_info *tmem_page_list_get(void) { struct page_info *pi; - spin_lock(&tmh_page_list_lock); - if ( (pi = page_list_remove_head(&tmh_page_list)) != NULL ) - tmh_page_list_pages--; - spin_unlock(&tmh_page_list_lock); + spin_lock(&tmem_page_list_lock); + if ( (pi = page_list_remove_head(&tmem_page_list)) != NULL ) + tmem_page_list_pages--; + spin_unlock(&tmem_page_list_lock); ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -static inline void tmh_page_list_put(struct page_info *pi) +static inline void tmem_page_list_put(struct page_info *pi) { ASSERT(IS_VALID_PAGE(pi)); - spin_lock(&tmh_page_list_lock); - page_list_add(pi, &tmh_page_list); - tmh_page_list_pages++; - spin_unlock(&tmh_page_list_lock); -} - -static inline unsigned long tmh_avail_pages(void) -{ - return tmh_page_list_pages; + spin_lock(&tmem_page_list_lock); + page_list_add(pi, &tmem_page_list); + tmem_page_list_pages++; + spin_unlock(&tmem_page_list_lock); } /* @@ -127,36 +122,36 @@ static inline bool_t domain_fully_allocated(struct domain *d) { return ( d->tot_pages >= d->max_pages ); } -#define tmh_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->tmh->domain) +#define tmem_client_memory_fully_allocated(_pool) \ + domain_fully_allocated(_pool->client->tmem->domain) -static inline void *_tmh_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { #if 0 if ( d->tot_pages >= d->max_pages ) return NULL; #endif - ASSERT( size < tmh_mempool_maxalloc ); + ASSERT( size < tmem_mempool_maxalloc ); if ( cmem_mempool == NULL ) return NULL; return xmem_pool_alloc(size, cmem_mempool); } -#define tmh_alloc_subpage_thispool(_pool, _s, _a) \ - _tmh_alloc_subpage_thispool(pool->client->tmh->persistent_pool, \ +#define tmem_alloc_subpage_thispool(_pool, _s, _a) \ + _tmem_alloc_subpage_thispool(pool->client->tmem->persistent_pool, \ _s, _a) -static inline void _tmh_free_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, void *ptr, size_t size) { - ASSERT( size < tmh_mempool_maxalloc ); + ASSERT( size < tmem_mempool_maxalloc ); ASSERT( cmem_mempool != NULL ); xmem_pool_free(ptr,cmem_mempool); } -#define tmh_free_subpage_thispool(_pool, _p, _s) \ - _tmh_free_subpage_thispool(_pool->client->tmh->persistent_pool, _p, _s) +#define tmem_free_subpage_thispool(_pool, _p, _s) \ + _tmem_free_subpage_thispool(_pool->client->tmem->persistent_pool, _p, _s) -static inline struct page_info *_tmh_alloc_page_thispool(struct domain *d) +static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -166,14 +161,14 @@ static inline struct page_info *_tmh_alloc_page_thispool(struct domain *d) if ( d->tot_pages >= d->max_pages ) return NULL; - if ( tmh_page_list_pages ) + if ( tmem_page_list_pages ) { - if ( (pi = tmh_page_list_get()) != NULL ) + if ( (pi = tmem_page_list_get()) != NULL ) { if ( donate_page(d,pi,0) == 0 ) goto out; else - tmh_page_list_put(pi); + tmem_page_list_put(pi); } } @@ -183,16 +178,16 @@ out: ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -#define tmh_alloc_page_thispool(_pool) \ - _tmh_alloc_page_thispool(_pool->client->tmh->domain) +#define tmem_alloc_page_thispool(_pool) \ + _tmem_alloc_page_thispool(_pool->client->tmem->domain) -static inline void _tmh_free_page_thispool(struct page_info *pi) +static inline void _tmem_free_page_thispool(struct page_info *pi) { struct domain *d = page_get_owner(pi); ASSERT(IS_VALID_PAGE(pi)); if ( (d == NULL) || steal_page(d,pi,0) == 0 ) - tmh_page_list_put(pi); + tmem_page_list_put(pi); else { scrub_one_page(pi); @@ -200,30 +195,30 @@ static inline void _tmh_free_page_thispool(struct page_info *pi) free_domheap_pages(pi,0); } } -#define tmh_free_page_thispool(_pool,_pg) \ - _tmh_free_page_thispool(_pg) +#define tmem_free_page_thispool(_pool,_pg) \ + _tmem_free_page_thispool(_pg) /* * Memory allocation for ephemeral (non-persistent) data */ -static inline void *tmh_alloc_subpage(void *pool, size_t size, +static inline void *tmem_alloc_subpage(void *pool, size_t size, size_t align) { - ASSERT( size < tmh_mempool_maxalloc ); - ASSERT( tmh_mempool != NULL ); - return xmem_pool_alloc(size, tmh_mempool); + ASSERT( size < tmem_mempool_maxalloc ); + ASSERT( tmem_mempool != NULL ); + return xmem_pool_alloc(size, tmem_mempool); } -static inline void tmh_free_subpage(void *ptr, size_t size) +static inline void tmem_free_subpage(void *ptr, size_t size) { - ASSERT( size < tmh_mempool_maxalloc ); - xmem_pool_free(ptr,tmh_mempool); + ASSERT( size < tmem_mempool_maxalloc ); + xmem_pool_free(ptr,tmem_mempool); } -static inline struct page_info *tmh_alloc_page(void *pool, int no_heap) +static inline struct page_info *tmem_alloc_page(void *pool, int no_heap) { - struct page_info *pi = tmh_page_list_get(); + struct page_info *pi = tmem_page_list_get(); if ( pi == NULL && !no_heap ) pi = alloc_domheap_pages(0,0,MEMF_tmem); @@ -233,55 +228,50 @@ static inline struct page_info *tmh_alloc_page(void *pool, int no_heap) return pi; } -static inline void tmh_free_page(struct page_info *pi) +static inline void tmem_free_page(struct page_info *pi) { ASSERT(IS_VALID_PAGE(pi)); - tmh_page_list_put(pi); + tmem_page_list_put(pi); atomic_dec(&freeable_page_count); } static inline unsigned int tmem_subpage_maxsize(void) { - return tmh_mempool_maxalloc; -} - -static inline unsigned long tmh_freeable_pages(void) -{ - return tmh_avail_pages() + _atomic_read(freeable_page_count); + return tmem_mempool_maxalloc; } -static inline unsigned long tmh_free_mb(void) +static inline unsigned long tmem_free_mb(void) { - return (tmh_avail_pages() + total_free_pages()) >> (20 - PAGE_SHIFT); + return (tmem_page_list_pages + total_free_pages()) >> (20 - PAGE_SHIFT); } /* * Memory allocation for "infrastructure" data */ -static inline void *tmh_alloc_infra(size_t size, size_t align) +static inline void *tmem_alloc_infra(size_t size, size_t align) { return _xmalloc(size,align); } -static inline void tmh_free_infra(void *p) +static inline void tmem_free_infra(void *p) { return xfree(p); } -#define tmh_lock_all opt_tmem_lock -#define tmh_called_from_tmem(_memflags) (_memflags & MEMF_tmem) +#define tmem_lock_all opt_tmem_lock +#define tmem_called_from_tmem(_memflags) (_memflags & MEMF_tmem) /* "Client" (==domain) abstraction */ struct client; typedef domid_t cli_id_t; -typedef struct domain tmh_cli_ptr_t; +typedef struct domain tmem_cli_ptr_t; -extern tmh_client_t *tmh_client_init(cli_id_t); -extern void tmh_client_destroy(tmh_client_t *); +extern tmem_client_t *tmem_client_init(cli_id_t); +extern void tmem_client_destroy(tmem_client_t *); -static inline struct client *tmh_client_from_cli_id(cli_id_t cli_id) +static inline struct client *tmem_client_from_cli_id(cli_id_t cli_id) { struct client *c; struct domain *d = rcu_lock_domain_by_id(cli_id); @@ -292,25 +282,25 @@ static inline struct client *tmh_client_from_cli_id(cli_id_t cli_id) return c; } -static inline struct client *tmh_client_from_current(void) +static inline struct client *tmem_client_from_current(void) { return (struct client *)(current->domain->tmem); } -#define tmh_client_is_dying(_client) (!!_client->tmh->domain->is_dying) +#define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) -static inline cli_id_t tmh_get_cli_id_from_current(void) +static inline cli_id_t tmem_get_cli_id_from_current(void) { return current->domain->domain_id; } -static inline tmh_cli_ptr_t *tmh_get_cli_ptr_from_current(void) +static inline tmem_cli_ptr_t *tmem_get_cli_ptr_from_current(void) { return current->domain; } -static inline bool_t tmh_set_client_from_id( - struct client *client, tmh_client_t *tmh, cli_id_t cli_id) +static inline bool_t tmem_set_client_from_id( + struct client *client, tmem_client_t *tmem, cli_id_t cli_id) { struct domain *d = rcu_lock_domain_by_id(cli_id); bool_t rc = 0; @@ -319,31 +309,31 @@ static inline bool_t tmh_set_client_from_id( if ( !d->is_dying ) { d->tmem = client; - tmh->domain = d; + tmem->domain = d; rc = 1; } rcu_unlock_domain(d); return rc; } -static inline bool_t tmh_current_permitted(void) +static inline bool_t tmem_current_permitted(void) { return !xsm_tmem_op(XSM_HOOK); } -static inline bool_t tmh_current_is_privileged(void) +static inline bool_t tmem_current_is_privileged(void) { return !xsm_tmem_control(XSM_PRIV); } -static inline uint8_t tmh_get_first_byte(struct page_info *pfp) +static inline uint8_t tmem_get_first_byte(struct page_info *pfp) { void *p = __map_domain_page(pfp); return (uint8_t)(*(char *)p); } -static inline int tmh_page_cmp(struct page_info *pfp1, struct page_info *pfp2) +static inline int tmem_page_cmp(struct page_info *pfp1, struct page_info *pfp2) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp2); @@ -360,7 +350,7 @@ ASSERT(p2 != NULL); return 1; } -static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t len2) +static inline int tmem_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t len2) { const char *p1 = (char *)va1; const char *p2 = (char *)va2; @@ -381,7 +371,7 @@ static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t return 1; } -static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) +static inline int tmem_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2; @@ -410,7 +400,7 @@ static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, vo /* return the size of the data in the pfp, ignoring trailing zeroes and * rounded up to the nearest multiple of 8 */ -static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) +static inline pagesize_t tmem_tze_pfp_scan(struct page_info *pfp) { const uint64_t *p = (uint64_t *)__map_domain_page(pfp); pagesize_t bytecount = PAGE_SIZE; @@ -421,7 +411,7 @@ static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) return bytecount; } -static inline void tmh_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) +static inline void tmem_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) { uint64_t *p1 = (uint64_t *)tva; const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp); @@ -438,7 +428,7 @@ typedef XEN_GUEST_HANDLE(char) cli_va_t; typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t; typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; -static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) +static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT if ( is_hvm_vcpu(current) ? @@ -470,42 +460,42 @@ static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) return copy_from_guest(op, uops, 1); } -#define tmh_cli_buf_null guest_handle_from_ptr(NULL, char) +#define tmem_cli_buf_null guest_handle_from_ptr(NULL, char) -static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, +static inline void tmem_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, int off, char *tmembuf, int len) { copy_to_guest_offset(clibuf,off,tmembuf,len); } -#define tmh_copy_to_client_buf(clibuf, tmembuf, cnt) \ +#define tmem_copy_to_client_buf(clibuf, tmembuf, cnt) \ copy_to_guest(guest_handle_cast(clibuf, void), tmembuf, cnt) -#define tmh_client_buf_add guest_handle_add_offset +#define tmem_client_buf_add guest_handle_add_offset -#define TMH_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) +#define TMEM_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) -#define tmh_cli_id_str "domid" -#define tmh_client_str "domain" +#define tmem_cli_id_str "domid" +#define tmem_client_str "domain" -int tmh_decompress_to_client(xen_pfn_t, void *, size_t, +int tmem_decompress_to_client(xen_pfn_t, void *, size_t, tmem_cli_va_param_t); -int tmh_compress_from_client(xen_pfn_t, void **, size_t *, +int tmem_compress_from_client(xen_pfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, +int tmem_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, +int tmem_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -extern int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); +extern int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); -#define tmh_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) -#define tmh_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -#define tmh_client_info(fmt, args...) printk(XENLOG_G_INFO fmt, ##args) +#define tmem_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) +#define tmem_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) +#define tmem_client_info(fmt, args...) printk(XENLOG_G_INFO fmt, ##args) #define TMEM_PERF #ifdef TMEM_PERF -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:35 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12: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 1Vk9GV-0004cM-3J; Sat, 23 Nov 2013 09:12:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GT-0004c3-AK for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:33 +0000 Received: from [85.158.139.211:22743] by server-15.bemta-5.messagelabs.com id 40/5D-08490-08170925; Sat, 23 Nov 2013 09:12:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385197947!3782667!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16392 invoked from network); 23 Nov 2013 09:12:28 -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; 23 Nov 2013 09:12:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GN-0002c1-8w for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GN-00048y-6D for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:27 +0000 Date: Sat, 23 Nov 2013 09:12:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: rename 'tmh_' with 'tmem_' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f4271763027700168f2aac9b561633c2fccca59 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:50 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:24 2013 -0500 tmem: cleanup: rename 'tmh_' with 'tmem_' tmem was designed can be ported to other platform besides xen easily, but I don't think anybody will port tmem to other platform. And this flexible character made tmem not easy for understand, there are too many 'tmh_' and 'tmem_' functions and variables. This patch replace all 'tmh_' functions/variables with 'tmem_' to make code more readable. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 416 ++++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 102 ++++++------ xen/include/xen/tmem_xen.h | 210 +++++++++++------------ 3 files changed, 356 insertions(+), 372 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f3a0d91..7d22e0c 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -29,12 +29,6 @@ #define TMEM_SPEC_VERSION 1 -/************ INTERFACE TO TMEM HOST-DEPENDENT (tmh) CODE ************/ - -#define CLI_ID_NULL TMH_CLI_ID_NULL -#define cli_id_str tmh_cli_id_str -#define client_str tmh_client_str - /************ DEBUG and STATISTICS (+ some compression testing) *******/ #ifndef NDEBUG @@ -110,7 +104,7 @@ struct tmem_page_content_descriptor; struct client { struct list_head client_list; struct tm_pool *pools[MAX_POOLS_PER_DOMAIN]; - tmh_client_t *tmh; + tmem_client_t *tmem; struct list_head ephemeral_page_list; long eph_count, eph_count_max; cli_id_t cli_id; @@ -275,22 +269,22 @@ static int tmem_initialized = 0; /************ CONCURRENCY ***********************************************/ -EXPORT DEFINE_SPINLOCK(tmem_spinlock); /* used iff tmh_lock_all */ -EXPORT DEFINE_RWLOCK(tmem_rwlock); /* used iff !tmh_lock_all */ +EXPORT DEFINE_SPINLOCK(tmem_spinlock); /* used iff tmem_lock_all */ +EXPORT DEFINE_RWLOCK(tmem_rwlock); /* used iff !tmem_lock_all */ static DEFINE_SPINLOCK(eph_lists_spinlock); /* protects global AND clients */ static DEFINE_SPINLOCK(pers_lists_spinlock); -#define tmem_spin_lock(_l) do {if (!tmh_lock_all) spin_lock(_l);}while(0) -#define tmem_spin_unlock(_l) do {if (!tmh_lock_all) spin_unlock(_l);}while(0) -#define tmem_read_lock(_l) do {if (!tmh_lock_all) read_lock(_l);}while(0) -#define tmem_read_unlock(_l) do {if (!tmh_lock_all) read_unlock(_l);}while(0) -#define tmem_write_lock(_l) do {if (!tmh_lock_all) write_lock(_l);}while(0) -#define tmem_write_unlock(_l) do {if (!tmh_lock_all) write_unlock(_l);}while(0) -#define tmem_write_trylock(_l) ((tmh_lock_all)?1:write_trylock(_l)) -#define tmem_spin_trylock(_l) (tmh_lock_all?1:spin_trylock(_l)) +#define tmem_spin_lock(_l) do {if (!tmem_lock_all) spin_lock(_l);}while(0) +#define tmem_spin_unlock(_l) do {if (!tmem_lock_all) spin_unlock(_l);}while(0) +#define tmem_read_lock(_l) do {if (!tmem_lock_all) read_lock(_l);}while(0) +#define tmem_read_unlock(_l) do {if (!tmem_lock_all) read_unlock(_l);}while(0) +#define tmem_write_lock(_l) do {if (!tmem_lock_all) write_lock(_l);}while(0) +#define tmem_write_unlock(_l) do {if (!tmem_lock_all) write_unlock(_l);}while(0) +#define tmem_write_trylock(_l) ((tmem_lock_all)?1:write_trylock(_l)) +#define tmem_spin_trylock(_l) (tmem_lock_all?1:spin_trylock(_l)) -#define ASSERT_SPINLOCK(_l) ASSERT(tmh_lock_all || spin_is_locked(_l)) -#define ASSERT_WRITELOCK(_l) ASSERT(tmh_lock_all || rw_is_write_locked(_l)) +#define ASSERT_SPINLOCK(_l) ASSERT(tmem_lock_all || spin_is_locked(_l)) +#define ASSERT_WRITELOCK(_l) ASSERT(tmem_lock_all || rw_is_write_locked(_l)) /* global counters (should use long_atomic_t access) */ static long global_eph_count = 0; /* atomicity depends on eph_lists_spinlock */ @@ -325,9 +319,9 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) void *v; if ( (pool != NULL) && is_persistent(pool) ) - v = tmh_alloc_subpage_thispool(pool,size,align); + v = tmem_alloc_subpage_thispool(pool,size,align); else - v = tmh_alloc_subpage(pool, size, align); + v = tmem_alloc_subpage(pool, size, align); if ( v == NULL ) alloc_failed++; return v; @@ -336,9 +330,9 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) { if ( pool == NULL || !is_persistent(pool) ) - tmh_free_subpage(p,size); + tmem_free_subpage(p,size); else - tmh_free_subpage_thispool(pool,p,size); + tmem_free_subpage_thispool(pool,p,size); } static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) @@ -346,9 +340,9 @@ static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) - pfp = tmh_alloc_page_thispool(pool); + pfp = tmem_alloc_page_thispool(pool); else - pfp = tmh_alloc_page(pool,0); + pfp = tmem_alloc_page(pool,0); if ( pfp == NULL ) alloc_page_failed++; else @@ -360,9 +354,9 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) - tmh_free_page(pfp); + tmem_free_page(pfp); else - tmh_free_page_thispool(pool,pfp); + tmem_free_page_thispool(pool,pfp); atomic_dec_and_assert(global_page_count); } @@ -376,18 +370,18 @@ static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) pcd_t *pcd; int ret; - ASSERT(tmh_dedup_enabled()); + ASSERT(tmem_dedup_enabled()); tmem_read_lock(&pcd_tree_rwlocks[firstbyte]); pcd = pgp->pcd; if ( pgp->size < PAGE_SIZE && pgp->size != 0 && pcd->size < PAGE_SIZE && pcd->size != 0 ) - ret = tmh_decompress_to_client(cmfn, pcd->cdata, pcd->size, - tmh_cli_buf_null); - else if ( tmh_tze_enabled() && pcd->size < PAGE_SIZE ) - ret = tmh_copy_tze_to_client(cmfn, pcd->tze, pcd->size); + ret = tmem_decompress_to_client(cmfn, pcd->cdata, pcd->size, + tmem_cli_buf_null); + else if ( tmem_tze_enabled() && pcd->size < PAGE_SIZE ) + ret = tmem_copy_tze_to_client(cmfn, pcd->tze, pcd->size); else - ret = tmh_copy_to_client(cmfn, pcd->pfp, 0, 0, PAGE_SIZE, - tmh_cli_buf_null); + ret = tmem_copy_to_client(cmfn, pcd->pfp, 0, 0, PAGE_SIZE, + tmem_cli_buf_null); tmem_read_unlock(&pcd_tree_rwlocks[firstbyte]); return ret; } @@ -405,7 +399,7 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ char *pcd_cdata = pgp->pcd->cdata; pagesize_t pcd_csize = pgp->pcd->size; - ASSERT(tmh_dedup_enabled()); + ASSERT(tmem_dedup_enabled()); ASSERT(firstbyte != NOT_SHAREABLE); ASSERT(firstbyte < 256); @@ -447,9 +441,9 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ tmem_free(pcd_tze,pcd_size,pool); } else { /* real physical page */ - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) pcd_tot_tze_size -= PAGE_SIZE; - if ( tmh_compression_enabled() ) + if ( tmem_compression_enabled() ) pcd_tot_csize -= PAGE_SIZE; tmem_page_free(pool,pfp); } @@ -464,10 +458,10 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) pcd_t *pcd; int cmp; pagesize_t pfp_size = 0; - uint8_t firstbyte = (cdata == NULL) ? tmh_get_first_byte(pgp->pfp) : *cdata; + uint8_t firstbyte = (cdata == NULL) ? tmem_get_first_byte(pgp->pfp) : *cdata; int ret = 0; - if ( !tmh_dedup_enabled() ) + if ( !tmem_dedup_enabled() ) return 0; ASSERT(pgp->us.obj != NULL); ASSERT(pgp->us.obj->pool != NULL); @@ -476,9 +470,9 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) { ASSERT(pgp->pfp != NULL); pfp_size = PAGE_SIZE; - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) { - pfp_size = tmh_tze_pfp_scan(pgp->pfp); + pfp_size = tmem_tze_pfp_scan(pgp->pfp); if ( pfp_size > PCD_TZE_MAX_SIZE ) pfp_size = PAGE_SIZE; } @@ -499,25 +493,25 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) { if ( pcd->size < PAGE_SIZE ) /* both new entry and rbtree entry are compressed */ - cmp = tmh_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); + cmp = tmem_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); else /* new entry is compressed, rbtree entry is not */ cmp = -1; } else if ( pcd->size < PAGE_SIZE ) /* rbtree entry is compressed, rbtree entry is not */ cmp = 1; - else if ( tmh_tze_enabled() ) { + else if ( tmem_tze_enabled() ) { if ( pcd->size < PAGE_SIZE ) /* both new entry and rbtree entry are trailing zero */ - cmp = tmh_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); + cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); else /* new entry is trailing zero, rbtree entry is not */ - cmp = tmh_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); + cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); } else { /* both new entry and rbtree entry are full physical pages */ ASSERT(pgp->pfp != NULL); ASSERT(pcd->pfp != NULL); - cmp = tmh_page_cmp(pgp->pfp,pcd->pfp); + cmp = tmem_page_cmp(pgp->pfp,pcd->pfp); } /* walk tree or match depending on cmp */ @@ -559,21 +553,21 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) pcd->size = csize; pcd_tot_csize += csize; } else if ( pfp_size == 0 ) { - ASSERT(tmh_tze_enabled()); + ASSERT(tmem_tze_enabled()); pcd->size = 0; pcd->tze = NULL; } else if ( pfp_size < PAGE_SIZE && ((pcd->tze = tmem_malloc_bytes(pfp_size,pgp->us.obj->pool)) != NULL) ) { - tmh_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); + tmem_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); pcd->size = pfp_size; pcd_tot_tze_size += pfp_size; tmem_page_free(pgp->us.obj->pool,pgp->pfp); } else { pcd->pfp = pgp->pfp; pcd->size = PAGE_SIZE; - if ( tmh_tze_enabled() ) + if ( tmem_tze_enabled() ) pcd_tot_tze_size += PAGE_SIZE; - if ( tmh_compression_enabled() ) + if ( tmem_compression_enabled() ) pcd_tot_csize += PAGE_SIZE; } rb_link_node(&pcd->pcd_rb_tree_node, parent, new); @@ -608,7 +602,7 @@ static NOINLINE pgp_t *pgp_alloc(obj_t *obj) INIT_LIST_HEAD(&pgp->global_eph_pages); INIT_LIST_HEAD(&pgp->us.client_eph_pages); pgp->pfp = NULL; - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { pgp->firstbyte = NOT_SHAREABLE; pgp->eviction_attempted = 0; @@ -639,7 +633,7 @@ static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) if ( pgp->pfp == NULL ) return; - if ( tmh_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) + if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) pcd_disassociate(pgp,pool,0); /* pgp->size lost */ else if ( pgp_size ) tmem_free(pgp->cdata,pgp_size,pool); @@ -876,7 +870,7 @@ void oid_set_invalid(OID *oidp) unsigned oid_hash(OID *oidp) { - return (tmh_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], + return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } @@ -895,7 +889,7 @@ restart_find: switch ( oid_compare(&obj->oid, oidp) ) { case 0: /* equal */ - if ( tmh_lock_all ) + if ( tmem_lock_all ) obj->no_evict = 1; else { @@ -942,7 +936,7 @@ static NOINLINE void obj_free(obj_t *obj, int no_rebalance) obj->pool = NULL; old_oid = obj->oid; oid_set_invalid(&obj->oid); - obj->last_client = CLI_ID_NULL; + obj->last_client = TMEM_CLI_ID_NULL; atomic_dec_and_assert(global_obj_count); /* use no_rebalance only if all objects are being destroyed anyway */ if ( !no_rebalance ) @@ -1001,7 +995,7 @@ static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) obj->oid = *oidp; obj->objnode_count = 0; obj->pgp_count = 0; - obj->last_client = CLI_ID_NULL; + obj->last_client = TMEM_CLI_ID_NULL; SET_SENTINEL(obj,OBJ); tmem_spin_lock(&obj->obj_spinlock); obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj); @@ -1056,7 +1050,7 @@ static pool_t * pool_alloc(void) pool_t *pool; int i; - if ( (pool = tmh_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) + if ( (pool = tmem_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1085,7 +1079,7 @@ static NOINLINE void pool_free(pool_t *pool) INVERT_SENTINEL(pool,POOL); pool->client = NULL; list_del(&pool->pool_list); - tmh_free_infra(pool); + tmem_free_infra(pool); } /* register new_client as a user of this shared pool and return new @@ -1100,8 +1094,8 @@ static int shared_pool_join(pool_t *pool, client_t *new_client) sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); if ( new_client->cli_id != pool->client->cli_id ) - tmh_client_info("adding new %s %d to shared pool owned by %s %d\n", - client_str, new_client->cli_id, client_str, pool->client->cli_id); + tmem_client_info("adding new %s %d to shared pool owned by %s %d\n", + tmem_client_str, new_client->cli_id, tmem_client_str, pool->client->cli_id); return ++pool->shared_count; } @@ -1130,8 +1124,8 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) old_client->eph_count -= _atomic_read(pool->pgp_count); list_splice_init(&old_client->ephemeral_page_list, &new_client->ephemeral_page_list); - tmh_client_info("reassigned shared pool from %s=%d to %s=%d pool_id=%d\n", - cli_id_str, old_client->cli_id, cli_id_str, new_client->cli_id, poolid); + tmem_client_info("reassigned shared pool from %s=%d to %s=%d pool_id=%d\n", + tmem_cli_id_str, old_client->cli_id, tmem_cli_id_str, new_client->cli_id, poolid); pool->pool_id = poolid; } @@ -1166,8 +1160,8 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) } return 0; } - tmh_client_warn("tmem: no match unsharing pool, %s=%d\n", - cli_id_str,pool->client->cli_id); + tmem_client_warn("tmem: no match unsharing pool, %s=%d\n", + tmem_cli_id_str,pool->client->cli_id); return -1; } @@ -1177,22 +1171,22 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) ASSERT(pool != NULL); if ( (is_shared(pool)) && (shared_pool_quit(pool,cli_id) > 0) ) { - tmh_client_warn("tmem: %s=%d no longer using shared pool %d owned by %s=%d\n", - cli_id_str, cli_id, pool->pool_id, cli_id_str,pool->client->cli_id); + tmem_client_warn("tmem: %s=%d no longer using shared pool %d owned by %s=%d\n", + tmem_cli_id_str, cli_id, pool->pool_id, tmem_cli_id_str,pool->client->cli_id); return; } - tmh_client_info("%s %s-%s tmem pool %s=%d pool_id=%d\n", + tmem_client_info("%s %s-%s tmem pool %s=%d pool_id=%d\n", destroy ? "destroying" : "flushing", is_persistent(pool) ? "persistent" : "ephemeral" , is_shared(pool) ? "shared" : "private", - cli_id_str, pool->client->cli_id, pool->pool_id); + tmem_cli_id_str, pool->client->cli_id, pool->pool_id); if ( pool->client->live_migrating ) { - tmh_client_warn("can't %s pool while %s is live-migrating\n", - destroy?"destroy":"flush", client_str); + tmem_client_warn("can't %s pool while %s is live-migrating\n", + destroy?"destroy":"flush", tmem_client_str); return; } - pool_destroy_objs(pool,0,CLI_ID_NULL); + pool_destroy_objs(pool,0,TMEM_CLI_ID_NULL); if ( destroy ) { pool->client->pools[pool->pool_id] = NULL; @@ -1204,30 +1198,30 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) static client_t *client_create(cli_id_t cli_id) { - client_t *client = tmh_alloc_infra(sizeof(client_t),__alignof__(client_t)); + client_t *client = tmem_alloc_infra(sizeof(client_t),__alignof__(client_t)); int i; - tmh_client_info("tmem: initializing tmem capability for %s=%d...", - cli_id_str, cli_id); + tmem_client_info("tmem: initializing tmem capability for %s=%d...", + tmem_cli_id_str, cli_id); if ( client == NULL ) { - tmh_client_err("failed... out of memory\n"); + tmem_client_err("failed... out of memory\n"); goto fail; } memset(client,0,sizeof(client_t)); - if ( (client->tmh = tmh_client_init(cli_id)) == NULL ) + if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { - tmh_client_err("failed... can't allocate host-dependent part of client\n"); + tmem_client_err("failed... can't allocate host-dependent part of client\n"); goto fail; } - if ( !tmh_set_client_from_id(client, client->tmh, cli_id) ) + if ( !tmem_set_client_from_id(client, client->tmem, cli_id) ) { - tmh_client_err("failed... can't set client\n"); + tmem_client_err("failed... can't set client\n"); goto fail; } client->cli_id = cli_id; - client->compress = tmh_compression_enabled(); - client->shared_auth_required = tmh_shared_auth(); + client->compress = tmem_compression_enabled(); + client->shared_auth_required = tmem_shared_auth(); for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++) client->shared_auth_uuid[i][0] = client->shared_auth_uuid[i][1] = -1L; @@ -1240,19 +1234,19 @@ static client_t *client_create(cli_id_t cli_id) client->eph_count = client->eph_count_max = 0; client->total_cycles = 0; client->succ_pers_puts = 0; client->succ_eph_gets = 0; client->succ_pers_gets = 0; - tmh_client_info("ok\n"); + tmem_client_info("ok\n"); return client; fail: - tmh_free_infra(client); + tmem_free_infra(client); return NULL; } static void client_free(client_t *client) { list_del(&client->client_list); - tmh_client_destroy(client->tmh); - tmh_free_infra(client); + tmem_client_destroy(client->tmem); + tmem_free_infra(client); } /* flush all data from a client and, optionally, free it */ @@ -1301,11 +1295,11 @@ static bool_t tmem_try_to_evict_pgp(pgp_t *pgp, bool_t *hold_pool_rwlock) if ( pool->is_dying ) return 0; - if ( tmh_lock_all && !obj->no_evict ) + if ( tmem_lock_all && !obj->no_evict ) return 1; if ( tmem_spin_trylock(&obj->obj_spinlock) ) { - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { firstbyte = pgp->firstbyte; if ( firstbyte == NOT_SHAREABLE ) @@ -1340,7 +1334,7 @@ obj_unlock: static int tmem_evict(void) { - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pgp_t *pgp = NULL, *pgp2, *pgp_del; obj_t *obj; pool_t *pool; @@ -1379,7 +1373,7 @@ found: ASSERT_SPINLOCK(&obj->obj_spinlock); pgp_del = pgp_delete_from_obj(obj, pgp->index); ASSERT(pgp_del == pgp); - if ( tmh_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) + if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) { ASSERT(pgp->pcd->pgp_ref_count == 1 || pgp->eviction_attempted); pcd_disassociate(pgp,pool,1); @@ -1406,13 +1400,13 @@ static unsigned long tmem_relinquish_npages(unsigned long n) { unsigned long avail_pages = 0; - while ( (avail_pages = tmh_avail_pages()) < n ) + while ( (avail_pages = tmem_page_list_pages) < n ) { if ( !tmem_evict() ) break; } if ( avail_pages ) - tmh_release_avail_pages_to_host(); + tmem_release_avail_pages_to_host(); return avail_pages; } @@ -1425,7 +1419,7 @@ static inline void tmem_ensure_avail_pages(void) { int failed_evict = 10; - while ( !tmh_free_mb() ) + while ( !tmem_free_mb() ) { if ( tmem_evict() ) continue; @@ -1453,13 +1447,13 @@ static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, if ( pgp->pfp != NULL ) pgp_free_data(pgp, pgp->us.obj->pool); START_CYC_COUNTER(compress); - ret = tmh_compress_from_client(cmfn, &dst, &size, clibuf); + ret = tmem_compress_from_client(cmfn, &dst, &size, clibuf); if ( ret <= 0 ) goto out; else if ( (size == 0) || (size >= tmem_subpage_maxsize()) ) { ret = 0; goto out; - } else if ( tmh_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { + } else if ( tmem_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { if ( (ret = pcd_associate(pgp,dst,size)) == -ENOMEM ) goto out; } else if ( (p = tmem_malloc_bytes(size,pgp->us.obj->pool)) == NULL ) { @@ -1520,12 +1514,12 @@ copy_uncompressed: if ( ( pgp->pfp = tmem_page_alloc(pool) ) == NULL ) goto failed_dup; pgp->size = 0; - /* tmh_copy_from_client properly handles len==0 and offsets != 0 */ - ret = tmh_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, - tmh_cli_buf_null); + /* tmem_copy_from_client properly handles len==0 and offsets != 0 */ + ret = tmem_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, + tmem_cli_buf_null); if ( ret < 0 ) goto bad_copy; - if ( tmh_dedup_enabled() && !is_persistent(pool) ) + if ( tmem_dedup_enabled() && !is_persistent(pool) ) { if ( pcd_associate(pgp,NULL,0) == -ENOMEM ) goto failed_dup; @@ -1645,12 +1639,12 @@ copy_uncompressed: ret = -ENOMEM; goto delete_and_free; } - /* tmh_copy_from_client properly handles len==0 (TMEM_NEW_PAGE) */ - ret = tmh_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, + /* tmem_copy_from_client properly handles len==0 (TMEM_NEW_PAGE) */ + ret = tmem_copy_from_client(pgp->pfp, cmfn, tmem_offset, pfn_offset, len, clibuf); if ( ret < 0 ) goto bad_copy; - if ( tmh_dedup_enabled() && !is_persistent(pool) ) + if ( tmem_dedup_enabled() && !is_persistent(pool) ) { if ( pcd_associate(pgp,NULL,0) == -ENOMEM ) goto delete_and_free; @@ -1743,18 +1737,18 @@ static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, return 0; } ASSERT(pgp->size != -1); - if ( tmh_dedup_enabled() && !is_persistent(pool) && + if ( tmem_dedup_enabled() && !is_persistent(pool) && pgp->firstbyte != NOT_SHAREABLE ) rc = pcd_copy_to_client(cmfn, pgp); else if ( pgp->size != 0 ) { START_CYC_COUNTER(decompress); - rc = tmh_decompress_to_client(cmfn, pgp->cdata, + rc = tmem_decompress_to_client(cmfn, pgp->cdata, pgp->size, clibuf); END_CYC_COUNTER(decompress); } else - rc = tmh_copy_to_client(cmfn, pgp->pfp, tmem_offset, + rc = tmem_copy_to_client(cmfn, pgp->pfp, tmem_offset, pfn_offset, len, clibuf); if ( rc <= 0 ) goto bad_copy; @@ -1778,7 +1772,7 @@ static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, list_del(&pgp->us.client_eph_pages); list_add_tail(&pgp->us.client_eph_pages,&client->ephemeral_page_list); tmem_spin_unlock(&eph_lists_spinlock); - obj->last_client = tmh_get_cli_id_from_current(); + obj->last_client = tmem_get_cli_id_from_current(); } } if ( obj != NULL ) @@ -1857,7 +1851,7 @@ out: static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) { - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pool_t *pool; if ( client->pools == NULL ) @@ -1887,57 +1881,57 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, int s_poolid, first_unused_s_poolid; int i; - if ( this_cli_id == CLI_ID_NULL ) - cli_id = tmh_get_cli_id_from_current(); + if ( this_cli_id == TMEM_CLI_ID_NULL ) + cli_id = tmem_get_cli_id_from_current(); else cli_id = this_cli_id; - tmh_client_info("tmem: allocating %s-%s tmem pool for %s=%d...", + tmem_client_info("tmem: allocating %s-%s tmem pool for %s=%d...", persistent ? "persistent" : "ephemeral" , - shared ? "shared" : "private", cli_id_str, cli_id); + shared ? "shared" : "private", tmem_cli_id_str, cli_id); if ( specversion != TMEM_SPEC_VERSION ) { - tmh_client_err("failed... unsupported spec version\n"); + tmem_client_err("failed... unsupported spec version\n"); return -EPERM; } if ( pagebits != (PAGE_SHIFT - 12) ) { - tmh_client_err("failed... unsupported pagesize %d\n", + tmem_client_err("failed... unsupported pagesize %d\n", 1 << (pagebits + 12)); return -EPERM; } if ( flags & TMEM_POOL_PRECOMPRESSED ) { - tmh_client_err("failed... precompression flag set but unsupported\n"); + tmem_client_err("failed... precompression flag set but unsupported\n"); return -EPERM; } if ( flags & TMEM_POOL_RESERVED_BITS ) { - tmh_client_err("failed... reserved bits must be zero\n"); + tmem_client_err("failed... reserved bits must be zero\n"); return -EPERM; } if ( (pool = pool_alloc()) == NULL ) { - tmh_client_err("failed... out of memory\n"); + tmem_client_err("failed... out of memory\n"); return -ENOMEM; } - if ( this_cli_id != CLI_ID_NULL ) + if ( this_cli_id != TMEM_CLI_ID_NULL ) { - if ( (client = tmh_client_from_cli_id(this_cli_id)) == NULL + if ( (client = tmem_client_from_cli_id(this_cli_id)) == NULL || d_poolid >= MAX_POOLS_PER_DOMAIN || client->pools[d_poolid] != NULL ) goto fail; } else { - client = tmh_client_from_current(); + client = tmem_client_from_current(); ASSERT(client != NULL); for ( d_poolid = 0; d_poolid < MAX_POOLS_PER_DOMAIN; d_poolid++ ) if ( client->pools[d_poolid] == NULL ) break; if ( d_poolid >= MAX_POOLS_PER_DOMAIN ) { - tmh_client_err("failed... no more pool slots available for this %s\n", - client_str); + tmem_client_err("failed... no more pool slots available for this %s\n", + tmem_client_str); goto fail; } } @@ -1966,7 +1960,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, { if ( shpool->uuid[0] == uuid_lo && shpool->uuid[1] == uuid_hi ) { - tmh_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", + tmem_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", uuid_hi, uuid_lo, d_poolid); client->pools[d_poolid] = global_shared_pools[s_poolid]; shared_pool_join(global_shared_pools[s_poolid], client); @@ -1979,7 +1973,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, } if ( first_unused_s_poolid == MAX_GLOBAL_SHARED_POOLS ) { - tmh_client_warn("tmem: failed... no global shared pool slots available\n"); + tmem_client_warn("tmem: failed... no global shared pool slots available\n"); goto fail; } else @@ -1995,7 +1989,7 @@ static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, pool->pool_id = d_poolid; pool->persistent = persistent; pool->uuid[0] = uuid_lo; pool->uuid[1] = uuid_hi; - tmh_client_info("pool_id=%d\n", d_poolid); + tmem_client_info("pool_id=%d\n", d_poolid); return d_poolid; fail: @@ -2014,19 +2008,19 @@ static int tmemc_freeze_pools(cli_id_t cli_id, int arg) char *s; s = destroy ? "destroyed" : ( freeze ? "frozen" : "thawed" ); - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) { list_for_each_entry(client,&global_client_list,client_list) client_freeze(client,freeze); - tmh_client_info("tmem: all pools %s for all %ss\n", s, client_str); + tmem_client_info("tmem: all pools %s for all %ss\n", s, tmem_client_str); } else { - if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; client_freeze(client,freeze); - tmh_client_info("tmem: all pools %s for %s=%d\n", - s, cli_id_str, cli_id); + tmem_client_info("tmem: all pools %s for %s=%d\n", + s, tmem_cli_id_str, cli_id); } return 0; } @@ -2035,10 +2029,10 @@ static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) { uint32_t npages, flushed_pages, flushed_kb; - if ( cli_id != CLI_ID_NULL ) + if ( cli_id != TMEM_CLI_ID_NULL ) { - tmh_client_warn("tmem: %s-specific flush not supported yet, use --all\n", - client_str); + tmem_client_warn("tmem: %s-specific flush not supported yet, use --all\n", + tmem_client_str); return -1; } /* convert kb to pages, rounding up if necessary */ @@ -2078,7 +2072,7 @@ static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, c->eph_count, c->eph_count_max, c->compressed_pages, c->compressed_sum_size, c->compress_poor, c->compress_nomem); - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; for ( i = 0; i < MAX_POOLS_PER_DOMAIN; i++ ) { @@ -2106,7 +2100,7 @@ static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; } return sum; @@ -2145,7 +2139,7 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; } return sum; @@ -2172,7 +2166,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, n += scnprintf(info+n,BSIZE-n,"\n"); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; return sum; } @@ -2190,7 +2184,7 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, "Tt:%lu,Te:%lu,Cf:%lu,Af:%lu,Pf:%lu,Ta:%lu," "Lm:%lu,Et:%lu,Ea:%lu,Rt:%lu,Ra:%lu,Rx:%lu,Fp:%lu%c", total_tmem_ops, errored_tmem_ops, failed_copies, - alloc_failed, alloc_page_failed, tmh_avail_pages(), + alloc_failed, alloc_page_failed, tmem_page_list_pages, low_on_memory, evicted_pgs, evict_attempts, relinq_pgs, relinq_attempts, max_evicts_per_relinq, total_flush_pool, use_long ? ',' : '\n'); @@ -2207,7 +2201,7 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, tot_good_eph_puts,deduped_puts,pcd_tot_tze_size,pcd_tot_csize); if ( sum + n >= len ) return sum; - tmh_copy_to_client_buf_offset(buf,off+sum,info,n+1); + tmem_copy_to_client_buf_offset(buf,off+sum,info,n+1); sum += n; return sum; } @@ -2218,14 +2212,14 @@ static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, client_t *client; int off = 0; - if ( cli_id == CLI_ID_NULL ) { + if ( cli_id == TMEM_CLI_ID_NULL ) { off = tmemc_list_global(buf,0,len,use_long); off += tmemc_list_shared(buf,off,len-off,use_long); list_for_each_entry(client,&global_client_list,client_list) off += tmemc_list_client(client, buf, off, len-off, use_long); off += tmemc_list_global_perf(buf,off,len-off,use_long); } - else if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + else if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; else off = tmemc_list_client(client, buf, 0, len, use_long); @@ -2243,30 +2237,30 @@ static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) case TMEMC_SET_WEIGHT: old_weight = client->weight; client->weight = arg1; - tmh_client_info("tmem: weight set to %d for %s=%d\n", - arg1, cli_id_str, cli_id); + tmem_client_info("tmem: weight set to %d for %s=%d\n", + arg1, tmem_cli_id_str, cli_id); atomic_sub(old_weight,&client_weight_total); atomic_add(client->weight,&client_weight_total); break; case TMEMC_SET_CAP: client->cap = arg1; - tmh_client_info("tmem: cap set to %d for %s=%d\n", - arg1, cli_id_str, cli_id); + tmem_client_info("tmem: cap set to %d for %s=%d\n", + arg1, tmem_cli_id_str, cli_id); break; case TMEMC_SET_COMPRESS: - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) { - tmh_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", - tmh_compression_enabled() ? "enabled" : "disabled", - client_str); + tmem_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", + tmem_compression_enabled() ? "enabled" : "disabled", + tmem_client_str); return -1; } client->compress = arg1 ? 1 : 0; - tmh_client_info("tmem: compression %s for %s=%d\n", - arg1 ? "enabled" : "disabled",cli_id_str,cli_id); + tmem_client_info("tmem: compression %s for %s=%d\n", + arg1 ? "enabled" : "disabled",tmem_cli_id_str,cli_id); break; default: - tmh_client_warn("tmem: unknown subop %d for tmemc_set_var\n", subop); + tmem_client_warn("tmem: unknown subop %d for tmemc_set_var\n", subop); return -1; } return 0; @@ -2276,10 +2270,10 @@ static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) { client_t *client; - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) list_for_each_entry(client,&global_client_list,client_list) tmemc_set_var_one(client, subop, arg1); - else if ( (client = tmh_client_from_cli_id(cli_id)) == NULL) + else if ( (client = tmem_client_from_cli_id(cli_id)) == NULL) return -1; else tmemc_set_var_one(client, subop, arg1); @@ -2292,12 +2286,12 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, client_t *client; int i, free = -1; - if ( cli_id == CLI_ID_NULL ) + if ( cli_id == TMEM_CLI_ID_NULL ) { global_shared_auth = auth; return 1; } - client = tmh_client_from_cli_id(cli_id); + client = tmem_client_from_cli_id(cli_id); if ( client == NULL ) return -EINVAL; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++) @@ -2326,7 +2320,7 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, uint32_t subop, tmem_cli_va_param_t buf, uint32_t arg1) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; uint32_t p; @@ -2394,7 +2388,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, case TMEMC_SAVE_GET_POOL_UUID: if ( pool == NULL ) break; - tmh_copy_to_client_buf(buf, pool->uuid, 2); + tmem_copy_to_client_buf(buf, pool->uuid, 2); rc = 0; break; case TMEMC_SAVE_END: @@ -2415,7 +2409,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; pgp_t *pgp; @@ -2458,8 +2452,8 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, BUILD_BUG_ON(sizeof(h.oid) != sizeof(oid)); memcpy(h.oid, oid.oid, sizeof(h.oid)); h.index = pgp->index; - tmh_copy_to_client_buf(buf, &h, 1); - tmh_client_buf_add(buf, sizeof(h)); + tmem_copy_to_client_buf(buf, &h, 1); + tmem_client_buf_add(buf, sizeof(h)); ret = do_tmem_get(pool, &oid, pgp->index, 0, 0, 0, pagesize, buf); out: @@ -2470,7 +2464,7 @@ out: static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pgp_t *pgp; struct tmem_handle h; int ret = 0; @@ -2502,7 +2496,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, BUILD_BUG_ON(sizeof(h.oid) != sizeof(pgp->inv_oid)); memcpy(h.oid, pgp->inv_oid.oid, sizeof(h.oid)); h.index = pgp->index; - tmh_copy_to_client_buf(buf, &h, 1); + tmem_copy_to_client_buf(buf, &h, 1); ret = 1; out: tmem_spin_unlock(&pers_lists_spinlock); @@ -2512,7 +2506,7 @@ out: static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; @@ -2524,7 +2518,7 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, OID *oidp, uint32_t index) { - client_t *client = tmh_client_from_cli_id(cli_id); + client_t *client = tmem_client_from_cli_id(cli_id); pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; @@ -2540,7 +2534,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) uint32_t subop = op->u.ctrl.subop; OID *oidp = (OID *)(&op->u.ctrl.oid[0]); - if (!tmh_current_is_privileged()) + if (!tmem_current_is_privileged()) return -EPERM; switch(subop) @@ -2564,7 +2558,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) ret = tmemc_set_var(op->u.ctrl.cli_id,subop,op->u.ctrl.arg1); break; case TMEMC_QUERY_FREEABLE_MB: - ret = tmh_freeable_pages() >> (20 - PAGE_SHIFT); + ret = tmem_freeable_pages() >> (20 - PAGE_SHIFT); break; case TMEMC_SAVE_BEGIN: case TMEMC_RESTORE_BEGIN: @@ -2612,7 +2606,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) EXPORT long do_tmem_op(tmem_cli_op_t uops) { struct tmem_op op; - client_t *client = tmh_client_from_current(); + client_t *client = tmem_client_from_current(); pool_t *pool = NULL; OID *oidp; int rc = 0; @@ -2630,14 +2624,14 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) if ( !tmem_initialized ) return -ENODEV; - if ( !tmh_current_permitted() ) + if ( !tmem_current_permitted() ) return -EPERM; total_tmem_ops++; - if ( tmh_lock_all ) + if ( tmem_lock_all ) { - if ( tmh_lock_all > 1 ) + if ( tmem_lock_all > 1 ) spin_lock_irq(&tmem_spinlock); else spin_lock(&tmem_spinlock); @@ -2650,21 +2644,21 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) DUP_START_CYC_COUNTER(flush,succ_get); DUP_START_CYC_COUNTER(flush_obj,succ_get); - if ( client != NULL && tmh_client_is_dying(client) ) + if ( client != NULL && tmem_client_is_dying(client) ) { rc = -ENODEV; - if ( tmh_lock_all ) + if ( tmem_lock_all ) goto out; simple_error: errored_tmem_ops++; return rc; } - if ( unlikely(tmh_get_tmemop_from_client(&op, uops) != 0) ) + if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) ) { - tmh_client_err("tmem: can't get tmem struct from %s\n", client_str); + tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str); rc = -EFAULT; - if ( !tmh_lock_all ) + if ( !tmem_lock_all ) goto simple_error; goto out; } @@ -2694,10 +2688,10 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) { tmem_write_lock(&tmem_rwlock); tmem_write_lock_set = 1; - if ( (client = client_create(tmh_get_cli_id_from_current())) == NULL ) + if ( (client = client_create(tmem_get_cli_id_from_current())) == NULL ) { - tmh_client_err("tmem: can't create tmem structure for %s\n", - client_str); + tmem_client_err("tmem: can't create tmem structure for %s\n", + tmem_client_str); rc = -ENOMEM; goto out; } @@ -2721,7 +2715,7 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) if ( ((uint32_t)op.pool_id >= MAX_POOLS_PER_DOMAIN) || ((pool = client->pools[op.pool_id]) == NULL) ) { - tmh_client_err("tmem: operation requested on uncreated pool\n"); + tmem_client_err("tmem: operation requested on uncreated pool\n"); rc = -ENODEV; goto out; } @@ -2732,24 +2726,24 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) switch ( op.cmd ) { case TMEM_NEW_POOL: - rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.creat.flags, + rc = do_tmem_new_pool(TMEM_CLI_ID_NULL, 0, op.u.creat.flags, op.u.creat.uuid[0], op.u.creat.uuid[1]); break; case TMEM_NEW_PAGE: tmem_ensure_avail_pages(); rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, 0, - tmh_cli_buf_null); + tmem_cli_buf_null); break; case TMEM_PUT_PAGE: tmem_ensure_avail_pages(); rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, - PAGE_SIZE, tmh_cli_buf_null); + PAGE_SIZE, tmem_cli_buf_null); if (rc == 1) succ_put = 1; else non_succ_put = 1; break; case TMEM_GET_PAGE: rc = do_tmem_get(pool, oidp, op.u.gen.index, op.u.gen.cmfn, - 0, 0, PAGE_SIZE, tmh_cli_buf_null); + 0, 0, PAGE_SIZE, tmem_cli_buf_null); if (rc == 1) succ_get = 1; else non_succ_get = 1; break; @@ -2768,21 +2762,21 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) case TMEM_READ: rc = do_tmem_get(pool, oidp, op.u.gen.index, op.u.gen.cmfn, op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmh_cli_buf_null); + op.u.gen.len, tmem_cli_buf_null); break; case TMEM_WRITE: rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmh_cli_buf_null); + op.u.gen.len, tmem_cli_buf_null); break; case TMEM_XCHG: /* need to hold global lock to ensure xchg is atomic */ - tmh_client_warn("tmem_xchg op not implemented yet\n"); + tmem_client_warn("tmem_xchg op not implemented yet\n"); rc = 0; break; default: - tmh_client_warn("tmem: op %d not implemented\n", op.cmd); + tmem_client_warn("tmem: op %d not implemented\n", op.cmd); rc = 0; break; } @@ -2803,9 +2797,9 @@ out: else if ( flush_obj ) END_CYC_COUNTER_CLI(flush_obj,client); - if ( tmh_lock_all ) + if ( tmem_lock_all ) { - if ( tmh_lock_all > 1 ) + if ( tmem_lock_all > 1 ) spin_unlock_irq(&tmem_spinlock); else spin_unlock(&tmem_spinlock); @@ -2829,22 +2823,22 @@ EXPORT void tmem_destroy(void *v) if ( client == NULL ) return; - if ( !tmh_client_is_dying(client) ) + if ( !tmem_client_is_dying(client) ) { printk("tmem: tmem_destroy can only destroy dying client\n"); return; } - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else write_lock(&tmem_rwlock); printk("tmem: flushing tmem pools for %s=%d\n", - cli_id_str, client->cli_id); + tmem_cli_id_str, client->cli_id); client_flush(client, 1); - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else write_unlock(&tmem_rwlock); @@ -2855,15 +2849,15 @@ EXPORT void tmem_freeze_all(unsigned char key) { static int freeze = 0; - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else write_lock(&tmem_rwlock); freeze = !freeze; - tmemc_freeze_pools(CLI_ID_NULL,freeze); + tmemc_freeze_pools(TMEM_CLI_ID_NULL,freeze); - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else write_unlock(&tmem_rwlock); @@ -2877,7 +2871,7 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) unsigned long evicts_per_relinq = 0; int max_evictions = 10; - if (!tmh_enabled() || !tmh_freeable_pages()) + if (!tmem_enabled() || !tmem_freeable_pages()) return NULL; relinq_attempts++; @@ -2889,15 +2883,15 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) return NULL; } - if ( tmh_called_from_tmem(memflags) ) + if ( tmem_called_from_tmem(memflags) ) { - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_lock(&tmem_spinlock); else read_lock(&tmem_rwlock); } - while ( (pfp = tmh_alloc_page(NULL,1)) == NULL ) + while ( (pfp = tmem_alloc_page(NULL,1)) == NULL ) { if ( (max_evictions-- <= 0) || !tmem_evict()) break; @@ -2905,13 +2899,13 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) } if ( evicts_per_relinq > max_evicts_per_relinq ) max_evicts_per_relinq = evicts_per_relinq; - tmh_scrub_page(pfp, memflags); + tmem_scrub_page(pfp, memflags); if ( pfp != NULL ) relinq_pgs++; - if ( tmh_called_from_tmem(memflags) ) + if ( tmem_called_from_tmem(memflags) ) { - if ( tmh_lock_all ) + if ( tmem_lock_all ) spin_unlock(&tmem_spinlock); else read_unlock(&tmem_rwlock); @@ -2920,33 +2914,33 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) return pfp; } -EXPORT unsigned long tmem_freeable_pages(void) +unsigned long tmem_freeable_pages(void) { - return tmh_freeable_pages(); + return tmem_page_list_pages + _atomic_read(freeable_page_count); } /* called at hypervisor startup */ static int __init init_tmem(void) { int i; - if ( !tmh_enabled() ) + if ( !tmem_enabled() ) return 0; - if ( tmh_dedup_enabled() ) + if ( tmem_dedup_enabled() ) for (i = 0; i < 256; i++ ) { pcd_tree_roots[i] = RB_ROOT; rwlock_init(&pcd_tree_rwlocks[i]); } - if ( tmh_init() ) + if ( tmem_init() ) { printk("tmem: initialized comp=%d dedup=%d tze=%d global-lock=%d\n", - tmh_compression_enabled(), tmh_dedup_enabled(), tmh_tze_enabled(), - tmh_lock_all); - if ( tmh_dedup_enabled()&&tmh_compression_enabled()&&tmh_tze_enabled() ) + tmem_compression_enabled(), tmem_dedup_enabled(), tmem_tze_enabled(), + tmem_lock_all); + if ( tmem_dedup_enabled()&&tmem_compression_enabled()&&tmem_tze_enabled() ) { - tmh_tze_disable(); + tmem_tze_disable(); printk("tmem: tze and compression not compatible, disabling tze\n"); } tmem_initialized = 1; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index e1e83d2..bb2b601 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -46,7 +46,7 @@ static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, workmem); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, dstmem); static DEFINE_PER_CPU_READ_MOSTLY(void *, scratch_page); -void tmh_copy_page(char *to, char*from) +void tmem_copy_page(char *to, char*from) { DECL_LOCAL_CYC_COUNTER(pg_copy); START_CYC_COUNTER(pg_copy); @@ -109,7 +109,7 @@ static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp, } #endif -EXPORT int tmh_copy_from_client(struct page_info *pfp, +EXPORT int tmem_copy_from_client(struct page_info *pfp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -140,7 +140,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, } smp_mb(); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) - tmh_copy_page(tmem_va, cli_va); + tmem_copy_page(tmem_va, cli_va); else if ( (tmem_offset+len <= PAGE_SIZE) && (pfn_offset+len <= PAGE_SIZE) ) { @@ -158,7 +158,7 @@ EXPORT int tmh_copy_from_client(struct page_info *pfp, return rc; } -EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, +EXPORT int tmem_compress_from_client(xen_pfn_t cmfn, void **out_va, size_t *out_len, tmem_cli_va_param_t clibuf) { int ret = 0; @@ -190,7 +190,7 @@ EXPORT int tmh_compress_from_client(xen_pfn_t cmfn, return 1; } -EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, +EXPORT int tmem_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { @@ -211,7 +211,7 @@ EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, tmem_mfn = page_to_mfn(pfp); tmem_va = map_domain_page(tmem_mfn); if ( len == PAGE_SIZE && !tmem_offset && !pfn_offset && cli_va ) - tmh_copy_page(cli_va, tmem_va); + tmem_copy_page(cli_va, tmem_va); else if ( (tmem_offset+len <= PAGE_SIZE) && (pfn_offset+len <= PAGE_SIZE) ) { if ( cli_va ) @@ -229,7 +229,7 @@ EXPORT int tmh_copy_to_client(xen_pfn_t cmfn, struct page_info *pfp, return rc; } -EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, +EXPORT int tmem_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, size_t size, tmem_cli_va_param_t clibuf) { unsigned long cli_mfn = 0; @@ -258,7 +258,7 @@ EXPORT int tmh_decompress_to_client(xen_pfn_t cmfn, void *tmem_va, return 1; } -EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, +EXPORT int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len) { void *cli_va; @@ -282,30 +282,30 @@ EXPORT int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, /****************** XEN-SPECIFIC MEMORY ALLOCATION ********************/ -EXPORT struct xmem_pool *tmh_mempool = 0; -EXPORT unsigned int tmh_mempool_maxalloc = 0; +EXPORT struct xmem_pool *tmem_mempool = 0; +EXPORT unsigned int tmem_mempool_maxalloc = 0; -EXPORT DEFINE_SPINLOCK(tmh_page_list_lock); -EXPORT PAGE_LIST_HEAD(tmh_page_list); -EXPORT unsigned long tmh_page_list_pages = 0; +EXPORT DEFINE_SPINLOCK(tmem_page_list_lock); +EXPORT PAGE_LIST_HEAD(tmem_page_list); +EXPORT unsigned long tmem_page_list_pages = 0; -/* free anything on tmh_page_list to Xen's scrub list */ -EXPORT void tmh_release_avail_pages_to_host(void) +/* free anything on tmem_page_list to Xen's scrub list */ +EXPORT void tmem_release_avail_pages_to_host(void) { - spin_lock(&tmh_page_list_lock); - while ( !page_list_empty(&tmh_page_list) ) + spin_lock(&tmem_page_list_lock); + while ( !page_list_empty(&tmem_page_list) ) { - struct page_info *pg = page_list_remove_head(&tmh_page_list); + struct page_info *pg = page_list_remove_head(&tmem_page_list); scrub_one_page(pg); - tmh_page_list_pages--; + tmem_page_list_pages--; free_domheap_page(pg); } - ASSERT(tmh_page_list_pages == 0); - INIT_PAGE_LIST_HEAD(&tmh_page_list); - spin_unlock(&tmh_page_list_lock); + ASSERT(tmem_page_list_pages == 0); + INIT_PAGE_LIST_HEAD(&tmem_page_list); + spin_unlock(&tmem_page_list_lock); } -EXPORT void tmh_scrub_page(struct page_info *pi, unsigned int memflags) +EXPORT void tmem_scrub_page(struct page_info *pi, unsigned int memflags) { if ( pi == NULL ) return; @@ -313,84 +313,84 @@ EXPORT void tmh_scrub_page(struct page_info *pi, unsigned int memflags) scrub_one_page(pi); } -static noinline void *tmh_mempool_page_get(unsigned long size) +static noinline void *tmem_mempool_page_get(unsigned long size) { struct page_info *pi; ASSERT(size == PAGE_SIZE); - if ( (pi = tmh_alloc_page(NULL,0)) == NULL ) + if ( (pi = tmem_alloc_page(NULL,0)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); } -static void tmh_mempool_page_put(void *page_va) +static void tmem_mempool_page_put(void *page_va) { ASSERT(IS_PAGE_ALIGNED(page_va)); - tmh_free_page(virt_to_page(page_va)); + tmem_free_page(virt_to_page(page_va)); } -static int __init tmh_mempool_init(void) +static int __init tmem_mempool_init(void) { - tmh_mempool = xmem_pool_create("tmem", tmh_mempool_page_get, - tmh_mempool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmh_mempool ) - tmh_mempool_maxalloc = xmem_pool_maxalloc(tmh_mempool); - return tmh_mempool != NULL; + tmem_mempool = xmem_pool_create("tmem", tmem_mempool_page_get, + tmem_mempool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( tmem_mempool ) + tmem_mempool_maxalloc = xmem_pool_maxalloc(tmem_mempool); + return tmem_mempool != NULL; } /* persistent pools are per-domain */ -static void *tmh_persistent_pool_page_get(unsigned long size) +static void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; struct domain *d = current->domain; ASSERT(size == PAGE_SIZE); - if ( (pi = _tmh_alloc_page_thispool(d)) == NULL ) + if ( (pi = _tmem_alloc_page_thispool(d)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); } -static void tmh_persistent_pool_page_put(void *page_va) +static void tmem_persistent_pool_page_put(void *page_va) { struct page_info *pi; ASSERT(IS_PAGE_ALIGNED(page_va)); pi = mfn_to_page(virt_to_mfn(page_va)); ASSERT(IS_VALID_PAGE(pi)); - _tmh_free_page_thispool(pi); + _tmem_free_page_thispool(pi); } /****************** XEN-SPECIFIC CLIENT HANDLING ********************/ -EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id) +EXPORT tmem_client_t *tmem_client_init(cli_id_t cli_id) { - tmh_client_t *tmh; + tmem_client_t *tmem; char name[5]; int i, shift; - if ( (tmh = xmalloc(tmh_client_t)) == NULL ) + if ( (tmem = xmalloc(tmem_client_t)) == NULL ) return NULL; for (i = 0, shift = 12; i < 4; shift -=4, i++) name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; name[4] = '\0'; - tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get, - tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmh->persistent_pool == NULL ) + tmem->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, + tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( tmem->persistent_pool == NULL ) { - xfree(tmh); + xfree(tmem); return NULL; } - return tmh; + return tmem; } -EXPORT void tmh_client_destroy(tmh_client_t *tmh) +EXPORT void tmem_client_destroy(tmem_client_t *tmem) { - ASSERT(tmh->domain->is_dying); - xmem_pool_destroy(tmh->persistent_pool); - tmh->domain = NULL; + ASSERT(tmem->domain->is_dying); + xmem_pool_destroy(tmem->persistent_pool); + tmem->domain = NULL; } /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ @@ -443,11 +443,11 @@ static struct notifier_block cpu_nfb = { .notifier_call = cpu_callback }; -EXPORT int __init tmh_init(void) +EXPORT int __init tmem_init(void) { unsigned int cpu; - if ( !tmh_mempool_init() ) + if ( !tmem_mempool_init() ) return 0; dstmem_order = get_order_from_pages(LZO_DSTMEM_PAGES); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index b24246c..dc37861 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -26,7 +26,7 @@ struct tmem_host_dependent_client { struct domain *domain; struct xmem_pool *persistent_pool; }; -typedef struct tmem_host_dependent_client tmh_client_t; +typedef struct tmem_host_dependent_client tmem_client_t; typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ @@ -34,55 +34,55 @@ typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ ((void *)((((unsigned long)addr + (PAGE_SIZE - 1)) & PAGE_MASK)) == addr) #define IS_VALID_PAGE(_pi) ( mfn_valid(page_to_mfn(_pi)) ) -extern struct xmem_pool *tmh_mempool; -extern unsigned int tmh_mempool_maxalloc; -extern struct page_list_head tmh_page_list; -extern spinlock_t tmh_page_list_lock; -extern unsigned long tmh_page_list_pages; +extern struct xmem_pool *tmem_mempool; +extern unsigned int tmem_mempool_maxalloc; +extern struct page_list_head tmem_page_list; +extern spinlock_t tmem_page_list_lock; +extern unsigned long tmem_page_list_pages; extern atomic_t freeable_page_count; extern spinlock_t tmem_lock; extern spinlock_t tmem_spinlock; extern rwlock_t tmem_rwlock; -extern void tmh_copy_page(char *to, char*from); -extern int tmh_init(void); -#define tmh_hash hash_long +extern void tmem_copy_page(char *to, char*from); +extern int tmem_init(void); +#define tmem_hash hash_long -extern void tmh_release_avail_pages_to_host(void); -extern void tmh_scrub_page(struct page_info *pi, unsigned int memflags); +extern void tmem_release_avail_pages_to_host(void); +extern void tmem_scrub_page(struct page_info *pi, unsigned int memflags); extern bool_t opt_tmem_compress; -static inline bool_t tmh_compression_enabled(void) +static inline bool_t tmem_compression_enabled(void) { return opt_tmem_compress; } extern bool_t opt_tmem_dedup; -static inline bool_t tmh_dedup_enabled(void) +static inline bool_t tmem_dedup_enabled(void) { return opt_tmem_dedup; } extern bool_t opt_tmem_tze; -static inline bool_t tmh_tze_enabled(void) +static inline bool_t tmem_tze_enabled(void) { return opt_tmem_tze; } -static inline void tmh_tze_disable(void) +static inline void tmem_tze_disable(void) { opt_tmem_tze = 0; } extern bool_t opt_tmem_shared_auth; -static inline bool_t tmh_shared_auth(void) +static inline bool_t tmem_shared_auth(void) { return opt_tmem_shared_auth; } extern bool_t opt_tmem; -static inline bool_t tmh_enabled(void) +static inline bool_t tmem_enabled(void) { return opt_tmem; } @@ -93,30 +93,25 @@ extern int opt_tmem_lock; * Memory free page list management */ -static inline struct page_info *tmh_page_list_get(void) +static inline struct page_info *tmem_page_list_get(void) { struct page_info *pi; - spin_lock(&tmh_page_list_lock); - if ( (pi = page_list_remove_head(&tmh_page_list)) != NULL ) - tmh_page_list_pages--; - spin_unlock(&tmh_page_list_lock); + spin_lock(&tmem_page_list_lock); + if ( (pi = page_list_remove_head(&tmem_page_list)) != NULL ) + tmem_page_list_pages--; + spin_unlock(&tmem_page_list_lock); ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -static inline void tmh_page_list_put(struct page_info *pi) +static inline void tmem_page_list_put(struct page_info *pi) { ASSERT(IS_VALID_PAGE(pi)); - spin_lock(&tmh_page_list_lock); - page_list_add(pi, &tmh_page_list); - tmh_page_list_pages++; - spin_unlock(&tmh_page_list_lock); -} - -static inline unsigned long tmh_avail_pages(void) -{ - return tmh_page_list_pages; + spin_lock(&tmem_page_list_lock); + page_list_add(pi, &tmem_page_list); + tmem_page_list_pages++; + spin_unlock(&tmem_page_list_lock); } /* @@ -127,36 +122,36 @@ static inline bool_t domain_fully_allocated(struct domain *d) { return ( d->tot_pages >= d->max_pages ); } -#define tmh_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->tmh->domain) +#define tmem_client_memory_fully_allocated(_pool) \ + domain_fully_allocated(_pool->client->tmem->domain) -static inline void *_tmh_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { #if 0 if ( d->tot_pages >= d->max_pages ) return NULL; #endif - ASSERT( size < tmh_mempool_maxalloc ); + ASSERT( size < tmem_mempool_maxalloc ); if ( cmem_mempool == NULL ) return NULL; return xmem_pool_alloc(size, cmem_mempool); } -#define tmh_alloc_subpage_thispool(_pool, _s, _a) \ - _tmh_alloc_subpage_thispool(pool->client->tmh->persistent_pool, \ +#define tmem_alloc_subpage_thispool(_pool, _s, _a) \ + _tmem_alloc_subpage_thispool(pool->client->tmem->persistent_pool, \ _s, _a) -static inline void _tmh_free_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, void *ptr, size_t size) { - ASSERT( size < tmh_mempool_maxalloc ); + ASSERT( size < tmem_mempool_maxalloc ); ASSERT( cmem_mempool != NULL ); xmem_pool_free(ptr,cmem_mempool); } -#define tmh_free_subpage_thispool(_pool, _p, _s) \ - _tmh_free_subpage_thispool(_pool->client->tmh->persistent_pool, _p, _s) +#define tmem_free_subpage_thispool(_pool, _p, _s) \ + _tmem_free_subpage_thispool(_pool->client->tmem->persistent_pool, _p, _s) -static inline struct page_info *_tmh_alloc_page_thispool(struct domain *d) +static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -166,14 +161,14 @@ static inline struct page_info *_tmh_alloc_page_thispool(struct domain *d) if ( d->tot_pages >= d->max_pages ) return NULL; - if ( tmh_page_list_pages ) + if ( tmem_page_list_pages ) { - if ( (pi = tmh_page_list_get()) != NULL ) + if ( (pi = tmem_page_list_get()) != NULL ) { if ( donate_page(d,pi,0) == 0 ) goto out; else - tmh_page_list_put(pi); + tmem_page_list_put(pi); } } @@ -183,16 +178,16 @@ out: ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -#define tmh_alloc_page_thispool(_pool) \ - _tmh_alloc_page_thispool(_pool->client->tmh->domain) +#define tmem_alloc_page_thispool(_pool) \ + _tmem_alloc_page_thispool(_pool->client->tmem->domain) -static inline void _tmh_free_page_thispool(struct page_info *pi) +static inline void _tmem_free_page_thispool(struct page_info *pi) { struct domain *d = page_get_owner(pi); ASSERT(IS_VALID_PAGE(pi)); if ( (d == NULL) || steal_page(d,pi,0) == 0 ) - tmh_page_list_put(pi); + tmem_page_list_put(pi); else { scrub_one_page(pi); @@ -200,30 +195,30 @@ static inline void _tmh_free_page_thispool(struct page_info *pi) free_domheap_pages(pi,0); } } -#define tmh_free_page_thispool(_pool,_pg) \ - _tmh_free_page_thispool(_pg) +#define tmem_free_page_thispool(_pool,_pg) \ + _tmem_free_page_thispool(_pg) /* * Memory allocation for ephemeral (non-persistent) data */ -static inline void *tmh_alloc_subpage(void *pool, size_t size, +static inline void *tmem_alloc_subpage(void *pool, size_t size, size_t align) { - ASSERT( size < tmh_mempool_maxalloc ); - ASSERT( tmh_mempool != NULL ); - return xmem_pool_alloc(size, tmh_mempool); + ASSERT( size < tmem_mempool_maxalloc ); + ASSERT( tmem_mempool != NULL ); + return xmem_pool_alloc(size, tmem_mempool); } -static inline void tmh_free_subpage(void *ptr, size_t size) +static inline void tmem_free_subpage(void *ptr, size_t size) { - ASSERT( size < tmh_mempool_maxalloc ); - xmem_pool_free(ptr,tmh_mempool); + ASSERT( size < tmem_mempool_maxalloc ); + xmem_pool_free(ptr,tmem_mempool); } -static inline struct page_info *tmh_alloc_page(void *pool, int no_heap) +static inline struct page_info *tmem_alloc_page(void *pool, int no_heap) { - struct page_info *pi = tmh_page_list_get(); + struct page_info *pi = tmem_page_list_get(); if ( pi == NULL && !no_heap ) pi = alloc_domheap_pages(0,0,MEMF_tmem); @@ -233,55 +228,50 @@ static inline struct page_info *tmh_alloc_page(void *pool, int no_heap) return pi; } -static inline void tmh_free_page(struct page_info *pi) +static inline void tmem_free_page(struct page_info *pi) { ASSERT(IS_VALID_PAGE(pi)); - tmh_page_list_put(pi); + tmem_page_list_put(pi); atomic_dec(&freeable_page_count); } static inline unsigned int tmem_subpage_maxsize(void) { - return tmh_mempool_maxalloc; -} - -static inline unsigned long tmh_freeable_pages(void) -{ - return tmh_avail_pages() + _atomic_read(freeable_page_count); + return tmem_mempool_maxalloc; } -static inline unsigned long tmh_free_mb(void) +static inline unsigned long tmem_free_mb(void) { - return (tmh_avail_pages() + total_free_pages()) >> (20 - PAGE_SHIFT); + return (tmem_page_list_pages + total_free_pages()) >> (20 - PAGE_SHIFT); } /* * Memory allocation for "infrastructure" data */ -static inline void *tmh_alloc_infra(size_t size, size_t align) +static inline void *tmem_alloc_infra(size_t size, size_t align) { return _xmalloc(size,align); } -static inline void tmh_free_infra(void *p) +static inline void tmem_free_infra(void *p) { return xfree(p); } -#define tmh_lock_all opt_tmem_lock -#define tmh_called_from_tmem(_memflags) (_memflags & MEMF_tmem) +#define tmem_lock_all opt_tmem_lock +#define tmem_called_from_tmem(_memflags) (_memflags & MEMF_tmem) /* "Client" (==domain) abstraction */ struct client; typedef domid_t cli_id_t; -typedef struct domain tmh_cli_ptr_t; +typedef struct domain tmem_cli_ptr_t; -extern tmh_client_t *tmh_client_init(cli_id_t); -extern void tmh_client_destroy(tmh_client_t *); +extern tmem_client_t *tmem_client_init(cli_id_t); +extern void tmem_client_destroy(tmem_client_t *); -static inline struct client *tmh_client_from_cli_id(cli_id_t cli_id) +static inline struct client *tmem_client_from_cli_id(cli_id_t cli_id) { struct client *c; struct domain *d = rcu_lock_domain_by_id(cli_id); @@ -292,25 +282,25 @@ static inline struct client *tmh_client_from_cli_id(cli_id_t cli_id) return c; } -static inline struct client *tmh_client_from_current(void) +static inline struct client *tmem_client_from_current(void) { return (struct client *)(current->domain->tmem); } -#define tmh_client_is_dying(_client) (!!_client->tmh->domain->is_dying) +#define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) -static inline cli_id_t tmh_get_cli_id_from_current(void) +static inline cli_id_t tmem_get_cli_id_from_current(void) { return current->domain->domain_id; } -static inline tmh_cli_ptr_t *tmh_get_cli_ptr_from_current(void) +static inline tmem_cli_ptr_t *tmem_get_cli_ptr_from_current(void) { return current->domain; } -static inline bool_t tmh_set_client_from_id( - struct client *client, tmh_client_t *tmh, cli_id_t cli_id) +static inline bool_t tmem_set_client_from_id( + struct client *client, tmem_client_t *tmem, cli_id_t cli_id) { struct domain *d = rcu_lock_domain_by_id(cli_id); bool_t rc = 0; @@ -319,31 +309,31 @@ static inline bool_t tmh_set_client_from_id( if ( !d->is_dying ) { d->tmem = client; - tmh->domain = d; + tmem->domain = d; rc = 1; } rcu_unlock_domain(d); return rc; } -static inline bool_t tmh_current_permitted(void) +static inline bool_t tmem_current_permitted(void) { return !xsm_tmem_op(XSM_HOOK); } -static inline bool_t tmh_current_is_privileged(void) +static inline bool_t tmem_current_is_privileged(void) { return !xsm_tmem_control(XSM_PRIV); } -static inline uint8_t tmh_get_first_byte(struct page_info *pfp) +static inline uint8_t tmem_get_first_byte(struct page_info *pfp) { void *p = __map_domain_page(pfp); return (uint8_t)(*(char *)p); } -static inline int tmh_page_cmp(struct page_info *pfp1, struct page_info *pfp2) +static inline int tmem_page_cmp(struct page_info *pfp1, struct page_info *pfp2) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp2); @@ -360,7 +350,7 @@ ASSERT(p2 != NULL); return 1; } -static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t len2) +static inline int tmem_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t len2) { const char *p1 = (char *)va1; const char *p2 = (char *)va2; @@ -381,7 +371,7 @@ static inline int tmh_pcd_cmp(void *va1, pagesize_t len1, void *va2, pagesize_t return 1; } -static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) +static inline int tmem_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, void *tva, pagesize_t tze_len) { const uint64_t *p1 = (uint64_t *)__map_domain_page(pfp1); const uint64_t *p2; @@ -410,7 +400,7 @@ static inline int tmh_tze_pfp_cmp(struct page_info *pfp1, pagesize_t pfp_len, vo /* return the size of the data in the pfp, ignoring trailing zeroes and * rounded up to the nearest multiple of 8 */ -static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) +static inline pagesize_t tmem_tze_pfp_scan(struct page_info *pfp) { const uint64_t *p = (uint64_t *)__map_domain_page(pfp); pagesize_t bytecount = PAGE_SIZE; @@ -421,7 +411,7 @@ static inline pagesize_t tmh_tze_pfp_scan(struct page_info *pfp) return bytecount; } -static inline void tmh_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) +static inline void tmem_tze_copy_from_pfp(void *tva, struct page_info *pfp, pagesize_t len) { uint64_t *p1 = (uint64_t *)tva; const uint64_t *p2 = (uint64_t *)__map_domain_page(pfp); @@ -438,7 +428,7 @@ typedef XEN_GUEST_HANDLE(char) cli_va_t; typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t; typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; -static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) +static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT if ( is_hvm_vcpu(current) ? @@ -470,42 +460,42 @@ static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) return copy_from_guest(op, uops, 1); } -#define tmh_cli_buf_null guest_handle_from_ptr(NULL, char) +#define tmem_cli_buf_null guest_handle_from_ptr(NULL, char) -static inline void tmh_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, +static inline void tmem_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, int off, char *tmembuf, int len) { copy_to_guest_offset(clibuf,off,tmembuf,len); } -#define tmh_copy_to_client_buf(clibuf, tmembuf, cnt) \ +#define tmem_copy_to_client_buf(clibuf, tmembuf, cnt) \ copy_to_guest(guest_handle_cast(clibuf, void), tmembuf, cnt) -#define tmh_client_buf_add guest_handle_add_offset +#define tmem_client_buf_add guest_handle_add_offset -#define TMH_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) +#define TMEM_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) -#define tmh_cli_id_str "domid" -#define tmh_client_str "domain" +#define tmem_cli_id_str "domid" +#define tmem_client_str "domain" -int tmh_decompress_to_client(xen_pfn_t, void *, size_t, +int tmem_decompress_to_client(xen_pfn_t, void *, size_t, tmem_cli_va_param_t); -int tmh_compress_from_client(xen_pfn_t, void **, size_t *, +int tmem_compress_from_client(xen_pfn_t, void **, size_t *, tmem_cli_va_param_t); -int tmh_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, +int tmem_copy_from_client(struct page_info *, xen_pfn_t, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -int tmh_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, +int tmem_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); -extern int tmh_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); +extern int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); -#define tmh_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) -#define tmh_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -#define tmh_client_info(fmt, args...) printk(XENLOG_G_INFO fmt, ##args) +#define tmem_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) +#define tmem_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) +#define tmem_client_info(fmt, args...) printk(XENLOG_G_INFO fmt, ##args) #define TMEM_PERF #ifdef TMEM_PERF -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Ge-0004eH-9X; Sat, 23 Nov 2013 09:12:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gc-0004dw-LV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:43 +0000 Received: from [85.158.137.68:46338] by server-9.bemta-3.messagelabs.com id 1C/23-13104-98170925; Sat, 23 Nov 2013 09:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385197957!3334608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14433 invoked from network); 23 Nov 2013 09:12:38 -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; 23 Nov 2013 09:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GX-0002cA-De for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GX-00049O-C8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:37 +0000 Date: Sat, 23 Nov 2013 09:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop most of the typedefs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2fed42779c85992350f6c84d73516bfeb7063df Author: Bob Liu AuthorDate: Fri Nov 8 09:03:51 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop most of the typedefs There are many typedefs in tmem most of which are useless and make code unstraightforward. This patch try to cleanup those typedefs. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 359 +++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 2 +- xen/include/xen/tmem_xen.h | 14 +- 3 files changed, 182 insertions(+), 193 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 7d22e0c..3d8e67f 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -98,16 +98,16 @@ DECL_CYC_COUNTER(decompress); #define MAX_POOLS_PER_DOMAIN 16 #define MAX_GLOBAL_SHARED_POOLS 16 -struct tm_pool; +struct tmem_pool; struct tmem_page_descriptor; struct tmem_page_content_descriptor; struct client { struct list_head client_list; - struct tm_pool *pools[MAX_POOLS_PER_DOMAIN]; + struct tmem_pool *pools[MAX_POOLS_PER_DOMAIN]; tmem_client_t *tmem; struct list_head ephemeral_page_list; long eph_count, eph_count_max; - cli_id_t cli_id; + domid_t cli_id; uint32_t weight; uint32_t cap; bool_t compress; @@ -127,24 +127,22 @@ struct client { /* shared pool authentication */ uint64_t shared_auth_uuid[MAX_GLOBAL_SHARED_POOLS][2]; }; -typedef struct client client_t; struct share_list { struct list_head share_list; - client_t *client; + struct client *client; }; -typedef struct share_list sharelist_t; #define OBJ_HASH_BUCKETS 256 /* must be power of two */ #define OBJ_HASH_BUCKETS_MASK (OBJ_HASH_BUCKETS-1) -struct tm_pool { +struct tmem_pool { bool_t shared; bool_t persistent; bool_t is_dying; int pageshift; /* 0 == 2**12 */ struct list_head pool_list; - client_t *client; + struct client *client; uint64_t uuid[2]; /* 0 for private, non-zero for shared */ uint32_t pool_id; rwlock_t pool_rwlock; @@ -169,7 +167,6 @@ struct tm_pool { unsigned long flush_objs, flush_objs_found; DECL_SENTINEL }; -typedef struct tm_pool pool_t; #define is_persistent(_p) (_p->persistent) #define is_ephemeral(_p) (!(_p->persistent)) @@ -179,29 +176,25 @@ typedef struct tm_pool pool_t; struct oid { uint64_t oid[3]; }; -typedef struct oid OID; struct tmem_object_root { DECL_SENTINEL - OID oid; + struct oid oid; struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ unsigned long objnode_count; /* atomicity depends on obj_spinlock */ long pgp_count; /* atomicity depends on obj_spinlock */ struct radix_tree_root tree_root; /* tree of pages within object */ - pool_t *pool; - cli_id_t last_client; + struct tmem_pool *pool; + domid_t last_client; spinlock_t obj_spinlock; bool_t no_evict; /* if globally locked, pseudo-locks against eviction */ }; -typedef struct tmem_object_root obj_t; -typedef struct radix_tree_node rtn_t; struct tmem_object_node { - obj_t *obj; + struct tmem_object_root *obj; DECL_SENTINEL - rtn_t rtn; + struct radix_tree_node rtn; }; -typedef struct tmem_object_node objnode_t; struct tmem_page_descriptor { union { @@ -214,9 +207,9 @@ struct tmem_page_descriptor { struct list_head client_eph_pages; struct list_head pool_pers_pages; }; - obj_t *obj; + struct tmem_object_root *obj; } us; - OID inv_oid; /* used for invalid list only */ + struct oid inv_oid; /* used for invalid list only */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, else compressed data (cdata) */ @@ -236,7 +229,6 @@ struct tmem_page_descriptor { }; DECL_SENTINEL }; -typedef struct tmem_page_descriptor pgp_t; #define PCD_TZE_MAX_SIZE (PAGE_SIZE - (PAGE_SIZE/64)) @@ -253,7 +245,6 @@ struct tmem_page_content_descriptor { * else if tze, 0<=size *pfp */ }; -typedef struct tmem_page_content_descriptor pcd_t; struct rb_root pcd_tree_roots[256]; /* choose based on first byte of page */ rwlock_t pcd_tree_rwlocks[256]; /* poor man's concurrency for now */ @@ -262,7 +253,7 @@ static LIST_HEAD(global_ephemeral_page_list); /* all pages in ephemeral pools */ static LIST_HEAD(global_client_list); static LIST_HEAD(global_pool_list); -static pool_t *global_shared_pools[MAX_GLOBAL_SHARED_POOLS] = { 0 }; +static struct tmem_pool *global_shared_pools[MAX_GLOBAL_SHARED_POOLS] = { 0 }; static bool_t global_shared_auth = 0; static atomic_t client_weight_total = ATOMIC_INIT(0); static int tmem_initialized = 0; @@ -314,7 +305,7 @@ static atomic_t global_rtree_node_count = ATOMIC_INIT(0); #define tmem_malloc_bytes(_size,_pool) \ _tmem_malloc(_size, 1, _pool) -static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) +static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool *pool) { void *v; @@ -327,7 +318,7 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) return v; } -static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) +static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) { if ( pool == NULL || !is_persistent(pool) ) tmem_free_subpage(p,size); @@ -335,7 +326,7 @@ static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) tmem_free_subpage_thispool(pool,p,size); } -static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) +static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) { struct page_info *pfp = NULL; @@ -350,7 +341,7 @@ static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) return pfp; } -static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) +static NOINLINE void tmem_page_free(struct tmem_pool *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) @@ -364,10 +355,10 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) #define NOT_SHAREABLE ((uint16_t)-1UL) -static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) +static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, struct tmem_page_descriptor *pgp) { uint8_t firstbyte = pgp->firstbyte; - pcd_t *pcd; + struct tmem_page_content_descriptor *pcd; int ret; ASSERT(tmem_dedup_enabled()); @@ -388,9 +379,9 @@ static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) /* ensure pgp no longer points to pcd, nor vice-versa */ /* take pcd rwlock unless have_pcd_rwlock is set, always unlock when done */ -static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_rwlock) +static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool *pool, bool_t have_pcd_rwlock) { - pcd_t *pcd = pgp->pcd; + struct tmem_page_content_descriptor *pcd = pgp->pcd; struct page_info *pfp = pgp->pcd->pfp; uint16_t firstbyte = pgp->firstbyte; char *pcd_tze = pgp->pcd->tze; @@ -425,7 +416,7 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ /* reinit the struct for safety for now */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* now free up the pcd memory */ - tmem_free(pcd,sizeof(pcd_t),NULL); + tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { @@ -451,11 +442,11 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ } -static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) +static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize_t csize) { struct rb_node **new, *parent = NULL; struct rb_root *root; - pcd_t *pcd; + struct tmem_page_content_descriptor *pcd; int cmp; pagesize_t pfp_size = 0; uint8_t firstbyte = (cdata == NULL) ? tmem_get_first_byte(pgp->pfp) : *cdata; @@ -486,7 +477,7 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) new = &(root->rb_node); while ( *new ) { - pcd = container_of(*new, pcd_t, pcd_rb_tree_node); + pcd = container_of(*new, struct tmem_page_content_descriptor, pcd_rb_tree_node); parent = *new; /* compare new entry and rbtree entry, set cmp accordingly */ if ( cdata != NULL ) @@ -531,14 +522,14 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) } /* exited while loop with no match, so alloc a pcd and put it in the tree */ - if ( (pcd = tmem_malloc(pcd_t, NULL)) == NULL ) + if ( (pcd = tmem_malloc(struct tmem_page_content_descriptor, NULL)) == NULL ) { ret = -ENOMEM; goto unlock; } else if ( cdata != NULL ) { if ( (pcd->cdata = tmem_malloc_bytes(csize,pgp->us.obj->pool)) == NULL ) { - tmem_free(pcd,sizeof(pcd_t),NULL); + tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); ret = -ENOMEM; goto unlock; } @@ -587,16 +578,16 @@ unlock: /************ PAGE DESCRIPTOR MANIPULATION ROUTINES *******************/ -/* allocate a pgp_t and associate it with an object */ -static NOINLINE pgp_t *pgp_alloc(obj_t *obj) +/* allocate a struct tmem_page_descriptor and associate it with an object */ +static NOINLINE struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root *obj) { - pgp_t *pgp; - pool_t *pool; + struct tmem_page_descriptor *pgp; + struct tmem_pool *pool; ASSERT(obj != NULL); ASSERT(obj->pool != NULL); pool = obj->pool; - if ( (pgp = tmem_malloc(pgp_t, pool)) == NULL ) + if ( (pgp = tmem_malloc(struct tmem_page_descriptor, pool)) == NULL ) return NULL; pgp->us.obj = obj; INIT_LIST_HEAD(&pgp->global_eph_pages); @@ -617,7 +608,7 @@ static NOINLINE pgp_t *pgp_alloc(obj_t *obj) return pgp; } -static pgp_t *pgp_lookup_in_obj(obj_t *obj, uint32_t index) +static struct tmem_page_descriptor *pgp_lookup_in_obj(struct tmem_object_root *obj, uint32_t index) { ASSERT(obj != NULL); ASSERT_SPINLOCK(&obj->obj_spinlock); @@ -627,7 +618,7 @@ static pgp_t *pgp_lookup_in_obj(obj_t *obj, uint32_t index) return radix_tree_lookup(&obj->tree_root, index); } -static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) +static NOINLINE void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *pool) { pagesize_t pgp_size = pgp->size; @@ -648,9 +639,9 @@ static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) pgp->size = -1; } -static NOINLINE void pgp_free(pgp_t *pgp, int from_delete) +static NOINLINE void pgp_free(struct tmem_page_descriptor *pgp, int from_delete) { - pool_t *pool = NULL; + struct tmem_pool *pool = NULL; ASSERT_SENTINEL(pgp,PGD); ASSERT(pgp->us.obj != NULL); @@ -679,25 +670,25 @@ static NOINLINE void pgp_free(pgp_t *pgp, int from_delete) INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(pgp_t),pool); + tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); } -static NOINLINE void pgp_free_from_inv_list(client_t *client, pgp_t *pgp) +static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_page_descriptor *pgp) { - pool_t *pool = client->pools[pgp->pool_id]; + struct tmem_pool *pool = client->pools[pgp->pool_id]; ASSERT_SENTINEL(pool,POOL); ASSERT_SENTINEL(pgp,PGD); INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(pgp_t),pool); + tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); } /* remove the page from appropriate lists but not from parent object */ -static void pgp_delist(pgp_t *pgp, bool_t no_eph_lock) +static void pgp_delist(struct tmem_page_descriptor *pgp, bool_t no_eph_lock) { - client_t *client; + struct client *client; ASSERT(pgp != NULL); ASSERT(pgp->us.obj != NULL); @@ -736,7 +727,7 @@ static void pgp_delist(pgp_t *pgp, bool_t no_eph_lock) } /* remove page from lists (but not from parent object) and free it */ -static NOINLINE void pgp_delete(pgp_t *pgp, bool_t no_eph_lock) +static NOINLINE void pgp_delete(struct tmem_page_descriptor *pgp, bool_t no_eph_lock) { uint64_t life; @@ -752,7 +743,7 @@ static NOINLINE void pgp_delete(pgp_t *pgp, bool_t no_eph_lock) /* called only indirectly by radix_tree_destroy */ static NOINLINE void pgp_destroy(void *v) { - pgp_t *pgp = (pgp_t *)v; + struct tmem_page_descriptor *pgp = (struct tmem_page_descriptor *)v; ASSERT_SPINLOCK(&pgp->us.obj->obj_spinlock); pgp_delist(pgp,0); @@ -762,7 +753,7 @@ static NOINLINE void pgp_destroy(void *v) pgp_free(pgp,0); } -static int pgp_add_to_obj(obj_t *obj, uint32_t index, pgp_t *pgp) +static int pgp_add_to_obj(struct tmem_object_root *obj, uint32_t index, struct tmem_page_descriptor *pgp) { int ret; @@ -773,9 +764,9 @@ static int pgp_add_to_obj(obj_t *obj, uint32_t index, pgp_t *pgp) return ret; } -static NOINLINE pgp_t *pgp_delete_from_obj(obj_t *obj, uint32_t index) +static NOINLINE struct tmem_page_descriptor *pgp_delete_from_obj(struct tmem_object_root *obj, uint32_t index) { - pgp_t *pgp; + struct tmem_page_descriptor *pgp; ASSERT(obj != NULL); ASSERT_SPINLOCK(&obj->obj_spinlock); @@ -793,20 +784,20 @@ static NOINLINE pgp_t *pgp_delete_from_obj(obj_t *obj, uint32_t index) /************ RADIX TREE NODE MANIPULATION ROUTINES *******************/ /* called only indirectly from radix_tree_insert */ -static NOINLINE rtn_t *rtn_alloc(void *arg) +static NOINLINE struct radix_tree_node *rtn_alloc(void *arg) { - objnode_t *objnode; - obj_t *obj = (obj_t *)arg; + struct tmem_object_node *objnode; + struct tmem_object_root *obj = (struct tmem_object_root *)arg; ASSERT_SENTINEL(obj,OBJ); ASSERT(obj->pool != NULL); ASSERT_SENTINEL(obj->pool,POOL); - objnode = tmem_malloc(objnode_t,obj->pool); + objnode = tmem_malloc(struct tmem_object_node,obj->pool); if (objnode == NULL) return NULL; objnode->obj = obj; SET_SENTINEL(objnode,OBJNODE); - memset(&objnode->rtn, 0, sizeof(rtn_t)); + memset(&objnode->rtn, 0, sizeof(struct radix_tree_node)); if (++obj->pool->objnode_count > obj->pool->objnode_count_max) obj->pool->objnode_count_max = obj->pool->objnode_count; atomic_inc_and_max(global_rtree_node_count); @@ -815,13 +806,13 @@ static NOINLINE rtn_t *rtn_alloc(void *arg) } /* called only indirectly from radix_tree_delete/destroy */ -static void rtn_free(rtn_t *rtn, void *arg) +static void rtn_free(struct radix_tree_node *rtn, void *arg) { - pool_t *pool; - objnode_t *objnode; + struct tmem_pool *pool; + struct tmem_object_node *objnode; ASSERT(rtn != NULL); - objnode = container_of(rtn,objnode_t,rtn); + objnode = container_of(rtn,struct tmem_object_node,rtn); ASSERT_SENTINEL(objnode,OBJNODE); INVERT_SENTINEL(objnode,OBJNODE); ASSERT(objnode->obj != NULL); @@ -833,13 +824,13 @@ static void rtn_free(rtn_t *rtn, void *arg) pool->objnode_count--; objnode->obj->objnode_count--; objnode->obj = NULL; - tmem_free(objnode,sizeof(objnode_t),pool); + tmem_free(objnode,sizeof(struct tmem_object_node),pool); atomic_dec_and_assert(global_rtree_node_count); } /************ POOL OBJECT COLLECTION MANIPULATION ROUTINES *******************/ -int oid_compare(OID *left, OID *right) +int oid_compare(struct oid *left, struct oid *right) { if ( left->oid[2] == right->oid[2] ) { @@ -863,29 +854,29 @@ int oid_compare(OID *left, OID *right) return 1; } -void oid_set_invalid(OID *oidp) +void oid_set_invalid(struct oid *oidp) { oidp->oid[0] = oidp->oid[1] = oidp->oid[2] = -1UL; } -unsigned oid_hash(OID *oidp) +unsigned oid_hash(struct oid *oidp) { return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } /* searches for object==oid in pool, returns locked object if found */ -static NOINLINE obj_t * obj_find(pool_t *pool, OID *oidp) +static NOINLINE struct tmem_object_root * obj_find(struct tmem_pool *pool, struct oid *oidp) { struct rb_node *node; - obj_t *obj; + struct tmem_object_root *obj; restart_find: tmem_read_lock(&pool->pool_rwlock); node = pool->obj_rb_root[oid_hash(oidp)].rb_node; while ( node ) { - obj = container_of(node, obj_t, rb_tree_node); + obj = container_of(node, struct tmem_object_root, rb_tree_node); switch ( oid_compare(&obj->oid, oidp) ) { case 0: /* equal */ @@ -913,10 +904,10 @@ restart_find: } /* free an object that has no more pgps in it */ -static NOINLINE void obj_free(obj_t *obj, int no_rebalance) +static NOINLINE void obj_free(struct tmem_object_root *obj, int no_rebalance) { - pool_t *pool; - OID old_oid; + struct tmem_pool *pool; + struct oid old_oid; ASSERT_SPINLOCK(&obj->obj_spinlock); ASSERT(obj != NULL); @@ -942,18 +933,18 @@ static NOINLINE void obj_free(obj_t *obj, int no_rebalance) if ( !no_rebalance ) rb_erase(&obj->rb_tree_node,&pool->obj_rb_root[oid_hash(&old_oid)]); tmem_spin_unlock(&obj->obj_spinlock); - tmem_free(obj,sizeof(obj_t),pool); + tmem_free(obj,sizeof(struct tmem_object_root),pool); } -static NOINLINE int obj_rb_insert(struct rb_root *root, obj_t *obj) +static NOINLINE int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) { struct rb_node **new, *parent = NULL; - obj_t *this; + struct tmem_object_root *this; new = &(root->rb_node); while ( *new ) { - this = container_of(*new, obj_t, rb_tree_node); + this = container_of(*new, struct tmem_object_root, rb_tree_node); parent = *new; switch ( oid_compare(&this->oid, &obj->oid) ) { @@ -976,13 +967,13 @@ static NOINLINE int obj_rb_insert(struct rb_root *root, obj_t *obj) * allocate, initialize, and insert an tmem_object_root * (should be called only if find failed) */ -static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) +static NOINLINE struct tmem_object_root * obj_new(struct tmem_pool *pool, struct oid *oidp) { - obj_t *obj; + struct tmem_object_root *obj; ASSERT(pool != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( (obj = tmem_malloc(obj_t,pool)) == NULL ) + if ( (obj = tmem_malloc(struct tmem_object_root,pool)) == NULL ) return NULL; pool->obj_count++; if (pool->obj_count > pool->obj_count_max) @@ -1005,7 +996,7 @@ static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) } /* free an object after destroying any pgps in it */ -static NOINLINE void obj_destroy(obj_t *obj, int no_rebalance) +static NOINLINE void obj_destroy(struct tmem_object_root *obj, int no_rebalance) { ASSERT_WRITELOCK(&obj->pool->pool_rwlock); radix_tree_destroy(&obj->tree_root, pgp_destroy); @@ -1013,10 +1004,10 @@ static NOINLINE void obj_destroy(obj_t *obj, int no_rebalance) } /* destroys all objs in a pool, or only if obj->last_client matches cli_id */ -static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) +static void pool_destroy_objs(struct tmem_pool *pool, bool_t selective, domid_t cli_id) { struct rb_node *node; - obj_t *obj; + struct tmem_object_root *obj; int i; tmem_write_lock(&pool->pool_rwlock); @@ -1026,7 +1017,7 @@ static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) node = rb_first(&pool->obj_rb_root[i]); while ( node != NULL ) { - obj = container_of(node, obj_t, rb_tree_node); + obj = container_of(node, struct tmem_object_root, rb_tree_node); tmem_spin_lock(&obj->obj_spinlock); node = rb_next(node); ASSERT(obj->no_evict == 0); @@ -1045,12 +1036,12 @@ static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) /************ POOL MANIPULATION ROUTINES ******************************/ -static pool_t * pool_alloc(void) +static struct tmem_pool * pool_alloc(void) { - pool_t *pool; + struct tmem_pool *pool; int i; - if ( (pool = tmem_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) + if ( (pool = tmem_alloc_infra(sizeof(struct tmem_pool),__alignof__(struct tmem_pool))) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1073,7 +1064,7 @@ static pool_t * pool_alloc(void) return pool; } -static NOINLINE void pool_free(pool_t *pool) +static NOINLINE void pool_free(struct tmem_pool *pool) { ASSERT_SENTINEL(pool,POOL); INVERT_SENTINEL(pool,POOL); @@ -1084,12 +1075,12 @@ static NOINLINE void pool_free(pool_t *pool) /* register new_client as a user of this shared pool and return new total number of registered users */ -static int shared_pool_join(pool_t *pool, client_t *new_client) +static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) { - sharelist_t *sl; + struct share_list *sl; ASSERT(is_shared(pool)); - if ( (sl = tmem_malloc(sharelist_t,NULL)) == NULL ) + if ( (sl = tmem_malloc(struct share_list,NULL)) == NULL ) return -1; sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); @@ -1100,11 +1091,11 @@ static int shared_pool_join(pool_t *pool, client_t *new_client) } /* reassign "ownership" of the pool to another client that shares this pool */ -static NOINLINE void shared_pool_reassign(pool_t *pool) +static NOINLINE void shared_pool_reassign(struct tmem_pool *pool) { - sharelist_t *sl; + struct share_list *sl; int poolid; - client_t *old_client = pool->client, *new_client; + struct client *old_client = pool->client, *new_client; ASSERT(is_shared(pool)); if ( list_empty(&pool->share_list) ) @@ -1113,7 +1104,7 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) return; } old_client->pools[pool->pool_id] = NULL; - sl = list_entry(pool->share_list.next, sharelist_t, share_list); + sl = list_entry(pool->share_list.next, struct share_list, share_list); ASSERT(sl->client != old_client); pool->client = new_client = sl->client; for (poolid = 0; poolid < MAX_POOLS_PER_DOMAIN; poolid++) @@ -1131,9 +1122,9 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) /* destroy all objects with last_client same as passed cli_id, remove pool's cli_id from list of sharers of this pool */ -static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) +static NOINLINE int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) { - sharelist_t *sl; + struct share_list *sl; int s_poolid; ASSERT(is_shared(pool)); @@ -1146,7 +1137,7 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) if (sl->client->cli_id != cli_id) continue; list_del(&sl->share_list); - tmem_free(sl,sizeof(sharelist_t),pool); + tmem_free(sl,sizeof(struct share_list),pool); --pool->shared_count; if (pool->client->cli_id == cli_id) shared_pool_reassign(pool); @@ -1166,7 +1157,7 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) } /* flush all data (owned by cli_id) from a pool and, optionally, free it */ -static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) +static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) { ASSERT(pool != NULL); if ( (is_shared(pool)) && (shared_pool_quit(pool,cli_id) > 0) ) @@ -1196,9 +1187,9 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) /************ CLIENT MANIPULATION OPERATIONS **************************/ -static client_t *client_create(cli_id_t cli_id) +static struct client *client_create(domid_t cli_id) { - client_t *client = tmem_alloc_infra(sizeof(client_t),__alignof__(client_t)); + struct client *client = tmem_alloc_infra(sizeof(struct client),__alignof__(struct client)); int i; tmem_client_info("tmem: initializing tmem capability for %s=%d...", @@ -1208,7 +1199,7 @@ static client_t *client_create(cli_id_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - memset(client,0,sizeof(client_t)); + memset(client,0,sizeof(struct client)); if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { tmem_client_err("failed... can't allocate host-dependent part of client\n"); @@ -1242,7 +1233,7 @@ static client_t *client_create(cli_id_t cli_id) return NULL; } -static void client_free(client_t *client) +static void client_free(struct client *client) { list_del(&client->client_list); tmem_client_destroy(client->tmem); @@ -1250,10 +1241,10 @@ static void client_free(client_t *client) } /* flush all data from a client and, optionally, free it */ -static void client_flush(client_t *client, bool_t destroy) +static void client_flush(struct client *client, bool_t destroy) { int i; - pool_t *pool; + struct tmem_pool *pool; for (i = 0; i < MAX_POOLS_PER_DOMAIN; i++) { @@ -1267,7 +1258,7 @@ static void client_flush(client_t *client, bool_t destroy) client_free(client); } -static bool_t client_over_quota(client_t *client) +static bool_t client_over_quota(struct client *client) { int total = _atomic_read(client_weight_total); @@ -1279,18 +1270,18 @@ static bool_t client_over_quota(client_t *client) ((total*100L) / client->weight) ); } -static void client_freeze(client_t *client, int freeze) +static void client_freeze(struct client *client, int freeze) { client->frozen = freeze; } /************ MEMORY REVOCATION ROUTINES *******************************/ -static bool_t tmem_try_to_evict_pgp(pgp_t *pgp, bool_t *hold_pool_rwlock) +static bool_t tmem_try_to_evict_pgp(struct tmem_page_descriptor *pgp, bool_t *hold_pool_rwlock) { - obj_t *obj = pgp->us.obj; - pool_t *pool = obj->pool; - client_t *client = pool->client; + struct tmem_object_root *obj = pgp->us.obj; + struct tmem_pool *pool = obj->pool; + struct client *client = pool->client; uint16_t firstbyte = pgp->firstbyte; if ( pool->is_dying ) @@ -1334,10 +1325,10 @@ obj_unlock: static int tmem_evict(void) { - client_t *client = tmem_client_from_current(); - pgp_t *pgp = NULL, *pgp2, *pgp_del; - obj_t *obj; - pool_t *pool; + struct client *client = tmem_client_from_current(); + struct tmem_page_descriptor *pgp = NULL, *pgp2, *pgp_del; + struct tmem_object_root *obj; + struct tmem_pool *pool; int ret = 0; bool_t hold_pool_rwlock = 0; @@ -1430,7 +1421,7 @@ static inline void tmem_ensure_avail_pages(void) /************ TMEM CORE OPERATIONS ************************************/ -static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, +static NOINLINE int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { void *dst, *p; @@ -1473,14 +1464,14 @@ out: return ret; } -static NOINLINE int do_tmem_dup_put(pgp_t *pgp, xen_pfn_t cmfn, +static NOINLINE int do_tmem_dup_put(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - pool_t *pool; - obj_t *obj; - client_t *client; - pgp_t *pgpfound = NULL; + struct tmem_pool *pool; + struct tmem_object_root *obj; + struct client *client; + struct tmem_page_descriptor *pgpfound = NULL; int ret; ASSERT(pgp != NULL); @@ -1563,14 +1554,14 @@ cleanup: } -static NOINLINE int do_tmem_put(pool_t *pool, - OID *oidp, uint32_t index, +static NOINLINE int do_tmem_put(struct tmem_pool *pool, + struct oid *oidp, uint32_t index, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - obj_t *obj = NULL, *objfound = NULL, *objnew = NULL; - pgp_t *pgp = NULL, *pgpdel = NULL; - client_t *client = pool->client; + struct tmem_object_root *obj = NULL, *objfound = NULL, *objnew = NULL; + struct tmem_page_descriptor *pgp = NULL, *pgpdel = NULL; + struct client *client = pool->client; int ret = client->frozen ? -EFROZEN : -ENOMEM; ASSERT(pool != NULL); @@ -1707,13 +1698,13 @@ free: return ret; } -static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, +static NOINLINE int do_tmem_get(struct tmem_pool *pool, struct oid *oidp, uint32_t index, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - obj_t *obj; - pgp_t *pgp; - client_t *client = pool->client; + struct tmem_object_root *obj; + struct tmem_page_descriptor *pgp; + struct client *client = pool->client; DECL_LOCAL_CYC_COUNTER(decompress); int rc; @@ -1794,10 +1785,10 @@ bad_copy: return rc; } -static NOINLINE int do_tmem_flush_page(pool_t *pool, OID *oidp, uint32_t index) +static NOINLINE int do_tmem_flush_page(struct tmem_pool *pool, struct oid *oidp, uint32_t index) { - obj_t *obj; - pgp_t *pgp; + struct tmem_object_root *obj; + struct tmem_page_descriptor *pgp; pool->flushs++; obj = obj_find(pool,oidp); @@ -1829,9 +1820,9 @@ out: return 1; } -static NOINLINE int do_tmem_flush_object(pool_t *pool, OID *oidp) +static NOINLINE int do_tmem_flush_object(struct tmem_pool *pool, struct oid *oidp) { - obj_t *obj; + struct tmem_object_root *obj; pool->flush_objs++; obj = obj_find(pool,oidp); @@ -1851,8 +1842,8 @@ out: static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) { - client_t *client = tmem_client_from_current(); - pool_t *pool; + struct client *client = tmem_client_from_current(); + struct tmem_pool *pool; if ( client->pools == NULL ) return 0; @@ -1865,19 +1856,19 @@ static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) return 1; } -static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, +static NOINLINE int do_tmem_new_pool(domid_t this_cli_id, uint32_t d_poolid, uint32_t flags, uint64_t uuid_lo, uint64_t uuid_hi) { - client_t *client; - cli_id_t cli_id; + struct client *client; + domid_t cli_id; int persistent = flags & TMEM_POOL_PERSIST; int shared = flags & TMEM_POOL_SHARED; int pagebits = (flags >> TMEM_POOL_PAGESIZE_SHIFT) & TMEM_POOL_PAGESIZE_MASK; int specversion = (flags >> TMEM_POOL_VERSION_SHIFT) & TMEM_POOL_VERSION_MASK; - pool_t *pool, *shpool; + struct tmem_pool *pool, *shpool; int s_poolid, first_unused_s_poolid; int i; @@ -2000,9 +1991,9 @@ fail: /************ TMEM CONTROL OPERATIONS ************************************/ /* freeze/thaw all pools belonging to client cli_id (all domains if -1) */ -static int tmemc_freeze_pools(cli_id_t cli_id, int arg) +static int tmemc_freeze_pools(domid_t cli_id, int arg) { - client_t *client; + struct client *client; bool_t freeze = (arg == TMEMC_FREEZE) ? 1 : 0; bool_t destroy = (arg == TMEMC_DESTROY) ? 1 : 0; char *s; @@ -2025,7 +2016,7 @@ static int tmemc_freeze_pools(cli_id_t cli_id, int arg) return 0; } -static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) +static int tmemc_flush_mem(domid_t cli_id, uint32_t kb) { uint32_t npages, flushed_pages, flushed_kb; @@ -2053,12 +2044,12 @@ static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) */ #define BSIZE 1024 -static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, +static int tmemc_list_client(struct client *c, tmem_cli_va_param_t buf, int off, uint32_t len, bool_t use_long) { char info[BSIZE]; int i, n = 0, sum = 0; - pool_t *p; + struct tmem_pool *p; bool_t s; n = scnprintf(info,BSIZE,"C=CI:%d,ww:%d,ca:%d,co:%d,fr:%d," @@ -2111,8 +2102,8 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, { char info[BSIZE]; int i, n = 0, sum = 0; - pool_t *p; - sharelist_t *sl; + struct tmem_pool *p; + struct share_list *sl; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++ ) { @@ -2206,10 +2197,10 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, return sum; } -static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, +static int tmemc_list(domid_t cli_id, tmem_cli_va_param_t buf, uint32_t len, bool_t use_long) { - client_t *client; + struct client *client; int off = 0; if ( cli_id == TMEM_CLI_ID_NULL ) { @@ -2227,9 +2218,9 @@ static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, return 0; } -static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) +static int tmemc_set_var_one(struct client *client, uint32_t subop, uint32_t arg1) { - cli_id_t cli_id = client->cli_id; + domid_t cli_id = client->cli_id; uint32_t old_weight; switch (subop) @@ -2266,9 +2257,9 @@ static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) return 0; } -static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) +static int tmemc_set_var(domid_t cli_id, uint32_t subop, uint32_t arg1) { - client_t *client; + struct client *client; if ( cli_id == TMEM_CLI_ID_NULL ) list_for_each_entry(client,&global_client_list,client_list) @@ -2280,10 +2271,10 @@ static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) return 0; } -static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, +static NOINLINE int tmemc_shared_pool_auth(domid_t cli_id, uint64_t uuid_lo, uint64_t uuid_hi, bool_t auth) { - client_t *client; + struct client *client; int i, free = -1; if ( cli_id == TMEM_CLI_ID_NULL ) @@ -2320,11 +2311,11 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, uint32_t subop, tmem_cli_va_param_t buf, uint32_t arg1) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; uint32_t p; - pgp_t *pgp, *pgp2; + struct tmem_page_descriptor *pgp, *pgp2; int rc = -1; switch(subop) @@ -2409,11 +2400,11 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; - pgp_t *pgp; - OID oid; + struct tmem_page_descriptor *pgp; + struct oid oid; int ret = 0; struct tmem_handle h; unsigned int pagesize; @@ -2436,7 +2427,7 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, { /* process the first one */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, - pgp_t,us.pool_pers_pages); + struct tmem_page_descriptor,us.pool_pers_pages); } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { @@ -2445,7 +2436,7 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, goto out; } pgp = list_entry((&pool->cur_pgp->us.pool_pers_pages)->next, - pgp_t,us.pool_pers_pages); + struct tmem_page_descriptor,us.pool_pers_pages); pool->cur_pgp = pgp; oid = pgp->us.obj->oid; h.pool_id = pool_id; @@ -2464,8 +2455,8 @@ out: static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pgp_t *pgp; + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_page_descriptor *pgp; struct tmem_handle h; int ret = 0; @@ -2479,7 +2470,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, if ( client->cur_pgp == NULL ) { pgp = list_entry((&client->persistent_invalidated_list)->next, - pgp_t,client_inv_pages); + struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; } else if ( list_is_last(&client->cur_pgp->client_inv_pages, &client->persistent_invalidated_list) ) @@ -2489,7 +2480,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, goto out; } else { pgp = list_entry((&client->cur_pgp->client_inv_pages)->next, - pgp_t,client_inv_pages); + struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; } h.pool_id = pgp->pool_id; @@ -2503,11 +2494,11 @@ out: return ret; } -static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, +static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp, uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; if ( pool == NULL ) @@ -2515,11 +2506,11 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, return do_tmem_put(pool, oidp, index, 0, 0, 0, bufsize, buf); } -static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, OID *oidp, +static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oidp, uint32_t index) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; if ( pool == NULL ) @@ -2532,7 +2523,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) int ret; uint32_t pool_id = op->pool_id; uint32_t subop = op->u.ctrl.subop; - OID *oidp = (OID *)(&op->u.ctrl.oid[0]); + struct oid *oidp = (struct oid *)(&op->u.ctrl.oid[0]); if (!tmem_current_is_privileged()) return -EPERM; @@ -2606,9 +2597,9 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) EXPORT long do_tmem_op(tmem_cli_op_t uops) { struct tmem_op op; - client_t *client = tmem_client_from_current(); - pool_t *pool = NULL; - OID *oidp; + struct client *client = tmem_client_from_current(); + struct tmem_pool *pool = NULL; + struct oid *oidp; int rc = 0; bool_t succ_get = 0, succ_put = 0; bool_t non_succ_get = 0, non_succ_put = 0; @@ -2722,7 +2713,7 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) ASSERT_SENTINEL(pool,POOL); } - oidp = (OID *)&op.u.gen.oid[0]; + oidp = (struct oid *)&op.u.gen.oid[0]; switch ( op.cmd ) { case TMEM_NEW_POOL: @@ -2818,7 +2809,7 @@ out: /* this should be called when the host is destroying a client */ EXPORT void tmem_destroy(void *v) { - client_t *client = (client_t *)v; + struct client *client = (struct client *)v; if ( client == NULL ) return; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index bb2b601..e92eab6 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -365,7 +365,7 @@ static void tmem_persistent_pool_page_put(void *page_va) /****************** XEN-SPECIFIC CLIENT HANDLING ********************/ -EXPORT tmem_client_t *tmem_client_init(cli_id_t cli_id) +EXPORT tmem_client_t *tmem_client_init(domid_t cli_id) { tmem_client_t *tmem; char name[5]; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index dc37861..bbe1eb6 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -265,13 +265,11 @@ static inline void tmem_free_infra(void *p) /* "Client" (==domain) abstraction */ struct client; -typedef domid_t cli_id_t; -typedef struct domain tmem_cli_ptr_t; -extern tmem_client_t *tmem_client_init(cli_id_t); +extern tmem_client_t *tmem_client_init(domid_t); extern void tmem_client_destroy(tmem_client_t *); -static inline struct client *tmem_client_from_cli_id(cli_id_t cli_id) +static inline struct client *tmem_client_from_cli_id(domid_t cli_id) { struct client *c; struct domain *d = rcu_lock_domain_by_id(cli_id); @@ -289,18 +287,18 @@ static inline struct client *tmem_client_from_current(void) #define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) -static inline cli_id_t tmem_get_cli_id_from_current(void) +static inline domid_t tmem_get_cli_id_from_current(void) { return current->domain->domain_id; } -static inline tmem_cli_ptr_t *tmem_get_cli_ptr_from_current(void) +static inline struct domain *tmem_get_cli_ptr_from_current(void) { return current->domain; } static inline bool_t tmem_set_client_from_id( - struct client *client, tmem_client_t *tmem, cli_id_t cli_id) + struct client *client, tmem_client_t *tmem, domid_t cli_id) { struct domain *d = rcu_lock_domain_by_id(cli_id); bool_t rc = 0; @@ -474,7 +472,7 @@ static inline void tmem_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, #define tmem_client_buf_add guest_handle_add_offset -#define TMEM_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) +#define TMEM_CLI_ID_NULL ((domid_t)((domid_t)-1L)) #define tmem_cli_id_str "domid" #define tmem_client_str "domain" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:44 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Ge-0004eH-9X; Sat, 23 Nov 2013 09:12:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gc-0004dw-LV for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:43 +0000 Received: from [85.158.137.68:46338] by server-9.bemta-3.messagelabs.com id 1C/23-13104-98170925; Sat, 23 Nov 2013 09:12:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385197957!3334608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14433 invoked from network); 23 Nov 2013 09:12:38 -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; 23 Nov 2013 09:12:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9GX-0002cA-De for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9GX-00049O-C8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:37 +0000 Date: Sat, 23 Nov 2013 09:12:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop most of the typedefs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2fed42779c85992350f6c84d73516bfeb7063df Author: Bob Liu AuthorDate: Fri Nov 8 09:03:51 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop most of the typedefs There are many typedefs in tmem most of which are useless and make code unstraightforward. This patch try to cleanup those typedefs. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 359 +++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 2 +- xen/include/xen/tmem_xen.h | 14 +- 3 files changed, 182 insertions(+), 193 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 7d22e0c..3d8e67f 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -98,16 +98,16 @@ DECL_CYC_COUNTER(decompress); #define MAX_POOLS_PER_DOMAIN 16 #define MAX_GLOBAL_SHARED_POOLS 16 -struct tm_pool; +struct tmem_pool; struct tmem_page_descriptor; struct tmem_page_content_descriptor; struct client { struct list_head client_list; - struct tm_pool *pools[MAX_POOLS_PER_DOMAIN]; + struct tmem_pool *pools[MAX_POOLS_PER_DOMAIN]; tmem_client_t *tmem; struct list_head ephemeral_page_list; long eph_count, eph_count_max; - cli_id_t cli_id; + domid_t cli_id; uint32_t weight; uint32_t cap; bool_t compress; @@ -127,24 +127,22 @@ struct client { /* shared pool authentication */ uint64_t shared_auth_uuid[MAX_GLOBAL_SHARED_POOLS][2]; }; -typedef struct client client_t; struct share_list { struct list_head share_list; - client_t *client; + struct client *client; }; -typedef struct share_list sharelist_t; #define OBJ_HASH_BUCKETS 256 /* must be power of two */ #define OBJ_HASH_BUCKETS_MASK (OBJ_HASH_BUCKETS-1) -struct tm_pool { +struct tmem_pool { bool_t shared; bool_t persistent; bool_t is_dying; int pageshift; /* 0 == 2**12 */ struct list_head pool_list; - client_t *client; + struct client *client; uint64_t uuid[2]; /* 0 for private, non-zero for shared */ uint32_t pool_id; rwlock_t pool_rwlock; @@ -169,7 +167,6 @@ struct tm_pool { unsigned long flush_objs, flush_objs_found; DECL_SENTINEL }; -typedef struct tm_pool pool_t; #define is_persistent(_p) (_p->persistent) #define is_ephemeral(_p) (!(_p->persistent)) @@ -179,29 +176,25 @@ typedef struct tm_pool pool_t; struct oid { uint64_t oid[3]; }; -typedef struct oid OID; struct tmem_object_root { DECL_SENTINEL - OID oid; + struct oid oid; struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ unsigned long objnode_count; /* atomicity depends on obj_spinlock */ long pgp_count; /* atomicity depends on obj_spinlock */ struct radix_tree_root tree_root; /* tree of pages within object */ - pool_t *pool; - cli_id_t last_client; + struct tmem_pool *pool; + domid_t last_client; spinlock_t obj_spinlock; bool_t no_evict; /* if globally locked, pseudo-locks against eviction */ }; -typedef struct tmem_object_root obj_t; -typedef struct radix_tree_node rtn_t; struct tmem_object_node { - obj_t *obj; + struct tmem_object_root *obj; DECL_SENTINEL - rtn_t rtn; + struct radix_tree_node rtn; }; -typedef struct tmem_object_node objnode_t; struct tmem_page_descriptor { union { @@ -214,9 +207,9 @@ struct tmem_page_descriptor { struct list_head client_eph_pages; struct list_head pool_pers_pages; }; - obj_t *obj; + struct tmem_object_root *obj; } us; - OID inv_oid; /* used for invalid list only */ + struct oid inv_oid; /* used for invalid list only */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, else compressed data (cdata) */ @@ -236,7 +229,6 @@ struct tmem_page_descriptor { }; DECL_SENTINEL }; -typedef struct tmem_page_descriptor pgp_t; #define PCD_TZE_MAX_SIZE (PAGE_SIZE - (PAGE_SIZE/64)) @@ -253,7 +245,6 @@ struct tmem_page_content_descriptor { * else if tze, 0<=size *pfp */ }; -typedef struct tmem_page_content_descriptor pcd_t; struct rb_root pcd_tree_roots[256]; /* choose based on first byte of page */ rwlock_t pcd_tree_rwlocks[256]; /* poor man's concurrency for now */ @@ -262,7 +253,7 @@ static LIST_HEAD(global_ephemeral_page_list); /* all pages in ephemeral pools */ static LIST_HEAD(global_client_list); static LIST_HEAD(global_pool_list); -static pool_t *global_shared_pools[MAX_GLOBAL_SHARED_POOLS] = { 0 }; +static struct tmem_pool *global_shared_pools[MAX_GLOBAL_SHARED_POOLS] = { 0 }; static bool_t global_shared_auth = 0; static atomic_t client_weight_total = ATOMIC_INIT(0); static int tmem_initialized = 0; @@ -314,7 +305,7 @@ static atomic_t global_rtree_node_count = ATOMIC_INIT(0); #define tmem_malloc_bytes(_size,_pool) \ _tmem_malloc(_size, 1, _pool) -static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) +static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool *pool) { void *v; @@ -327,7 +318,7 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, pool_t *pool) return v; } -static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) +static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) { if ( pool == NULL || !is_persistent(pool) ) tmem_free_subpage(p,size); @@ -335,7 +326,7 @@ static NOINLINE void tmem_free(void *p, size_t size, pool_t *pool) tmem_free_subpage_thispool(pool,p,size); } -static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) +static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) { struct page_info *pfp = NULL; @@ -350,7 +341,7 @@ static NOINLINE struct page_info *tmem_page_alloc(pool_t *pool) return pfp; } -static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) +static NOINLINE void tmem_page_free(struct tmem_pool *pool, struct page_info *pfp) { ASSERT(pfp); if ( pool == NULL || !is_persistent(pool) ) @@ -364,10 +355,10 @@ static NOINLINE void tmem_page_free(pool_t *pool, struct page_info *pfp) #define NOT_SHAREABLE ((uint16_t)-1UL) -static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) +static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, struct tmem_page_descriptor *pgp) { uint8_t firstbyte = pgp->firstbyte; - pcd_t *pcd; + struct tmem_page_content_descriptor *pcd; int ret; ASSERT(tmem_dedup_enabled()); @@ -388,9 +379,9 @@ static NOINLINE int pcd_copy_to_client(xen_pfn_t cmfn, pgp_t *pgp) /* ensure pgp no longer points to pcd, nor vice-versa */ /* take pcd rwlock unless have_pcd_rwlock is set, always unlock when done */ -static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_rwlock) +static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool *pool, bool_t have_pcd_rwlock) { - pcd_t *pcd = pgp->pcd; + struct tmem_page_content_descriptor *pcd = pgp->pcd; struct page_info *pfp = pgp->pcd->pfp; uint16_t firstbyte = pgp->firstbyte; char *pcd_tze = pgp->pcd->tze; @@ -425,7 +416,7 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ /* reinit the struct for safety for now */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* now free up the pcd memory */ - tmem_free(pcd,sizeof(pcd_t),NULL); + tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { @@ -451,11 +442,11 @@ static NOINLINE void pcd_disassociate(pgp_t *pgp, pool_t *pool, bool_t have_pcd_ } -static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) +static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize_t csize) { struct rb_node **new, *parent = NULL; struct rb_root *root; - pcd_t *pcd; + struct tmem_page_content_descriptor *pcd; int cmp; pagesize_t pfp_size = 0; uint8_t firstbyte = (cdata == NULL) ? tmem_get_first_byte(pgp->pfp) : *cdata; @@ -486,7 +477,7 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) new = &(root->rb_node); while ( *new ) { - pcd = container_of(*new, pcd_t, pcd_rb_tree_node); + pcd = container_of(*new, struct tmem_page_content_descriptor, pcd_rb_tree_node); parent = *new; /* compare new entry and rbtree entry, set cmp accordingly */ if ( cdata != NULL ) @@ -531,14 +522,14 @@ static NOINLINE int pcd_associate(pgp_t *pgp, char *cdata, pagesize_t csize) } /* exited while loop with no match, so alloc a pcd and put it in the tree */ - if ( (pcd = tmem_malloc(pcd_t, NULL)) == NULL ) + if ( (pcd = tmem_malloc(struct tmem_page_content_descriptor, NULL)) == NULL ) { ret = -ENOMEM; goto unlock; } else if ( cdata != NULL ) { if ( (pcd->cdata = tmem_malloc_bytes(csize,pgp->us.obj->pool)) == NULL ) { - tmem_free(pcd,sizeof(pcd_t),NULL); + tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); ret = -ENOMEM; goto unlock; } @@ -587,16 +578,16 @@ unlock: /************ PAGE DESCRIPTOR MANIPULATION ROUTINES *******************/ -/* allocate a pgp_t and associate it with an object */ -static NOINLINE pgp_t *pgp_alloc(obj_t *obj) +/* allocate a struct tmem_page_descriptor and associate it with an object */ +static NOINLINE struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root *obj) { - pgp_t *pgp; - pool_t *pool; + struct tmem_page_descriptor *pgp; + struct tmem_pool *pool; ASSERT(obj != NULL); ASSERT(obj->pool != NULL); pool = obj->pool; - if ( (pgp = tmem_malloc(pgp_t, pool)) == NULL ) + if ( (pgp = tmem_malloc(struct tmem_page_descriptor, pool)) == NULL ) return NULL; pgp->us.obj = obj; INIT_LIST_HEAD(&pgp->global_eph_pages); @@ -617,7 +608,7 @@ static NOINLINE pgp_t *pgp_alloc(obj_t *obj) return pgp; } -static pgp_t *pgp_lookup_in_obj(obj_t *obj, uint32_t index) +static struct tmem_page_descriptor *pgp_lookup_in_obj(struct tmem_object_root *obj, uint32_t index) { ASSERT(obj != NULL); ASSERT_SPINLOCK(&obj->obj_spinlock); @@ -627,7 +618,7 @@ static pgp_t *pgp_lookup_in_obj(obj_t *obj, uint32_t index) return radix_tree_lookup(&obj->tree_root, index); } -static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) +static NOINLINE void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *pool) { pagesize_t pgp_size = pgp->size; @@ -648,9 +639,9 @@ static NOINLINE void pgp_free_data(pgp_t *pgp, pool_t *pool) pgp->size = -1; } -static NOINLINE void pgp_free(pgp_t *pgp, int from_delete) +static NOINLINE void pgp_free(struct tmem_page_descriptor *pgp, int from_delete) { - pool_t *pool = NULL; + struct tmem_pool *pool = NULL; ASSERT_SENTINEL(pgp,PGD); ASSERT(pgp->us.obj != NULL); @@ -679,25 +670,25 @@ static NOINLINE void pgp_free(pgp_t *pgp, int from_delete) INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(pgp_t),pool); + tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); } -static NOINLINE void pgp_free_from_inv_list(client_t *client, pgp_t *pgp) +static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_page_descriptor *pgp) { - pool_t *pool = client->pools[pgp->pool_id]; + struct tmem_pool *pool = client->pools[pgp->pool_id]; ASSERT_SENTINEL(pool,POOL); ASSERT_SENTINEL(pgp,PGD); INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(pgp_t),pool); + tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); } /* remove the page from appropriate lists but not from parent object */ -static void pgp_delist(pgp_t *pgp, bool_t no_eph_lock) +static void pgp_delist(struct tmem_page_descriptor *pgp, bool_t no_eph_lock) { - client_t *client; + struct client *client; ASSERT(pgp != NULL); ASSERT(pgp->us.obj != NULL); @@ -736,7 +727,7 @@ static void pgp_delist(pgp_t *pgp, bool_t no_eph_lock) } /* remove page from lists (but not from parent object) and free it */ -static NOINLINE void pgp_delete(pgp_t *pgp, bool_t no_eph_lock) +static NOINLINE void pgp_delete(struct tmem_page_descriptor *pgp, bool_t no_eph_lock) { uint64_t life; @@ -752,7 +743,7 @@ static NOINLINE void pgp_delete(pgp_t *pgp, bool_t no_eph_lock) /* called only indirectly by radix_tree_destroy */ static NOINLINE void pgp_destroy(void *v) { - pgp_t *pgp = (pgp_t *)v; + struct tmem_page_descriptor *pgp = (struct tmem_page_descriptor *)v; ASSERT_SPINLOCK(&pgp->us.obj->obj_spinlock); pgp_delist(pgp,0); @@ -762,7 +753,7 @@ static NOINLINE void pgp_destroy(void *v) pgp_free(pgp,0); } -static int pgp_add_to_obj(obj_t *obj, uint32_t index, pgp_t *pgp) +static int pgp_add_to_obj(struct tmem_object_root *obj, uint32_t index, struct tmem_page_descriptor *pgp) { int ret; @@ -773,9 +764,9 @@ static int pgp_add_to_obj(obj_t *obj, uint32_t index, pgp_t *pgp) return ret; } -static NOINLINE pgp_t *pgp_delete_from_obj(obj_t *obj, uint32_t index) +static NOINLINE struct tmem_page_descriptor *pgp_delete_from_obj(struct tmem_object_root *obj, uint32_t index) { - pgp_t *pgp; + struct tmem_page_descriptor *pgp; ASSERT(obj != NULL); ASSERT_SPINLOCK(&obj->obj_spinlock); @@ -793,20 +784,20 @@ static NOINLINE pgp_t *pgp_delete_from_obj(obj_t *obj, uint32_t index) /************ RADIX TREE NODE MANIPULATION ROUTINES *******************/ /* called only indirectly from radix_tree_insert */ -static NOINLINE rtn_t *rtn_alloc(void *arg) +static NOINLINE struct radix_tree_node *rtn_alloc(void *arg) { - objnode_t *objnode; - obj_t *obj = (obj_t *)arg; + struct tmem_object_node *objnode; + struct tmem_object_root *obj = (struct tmem_object_root *)arg; ASSERT_SENTINEL(obj,OBJ); ASSERT(obj->pool != NULL); ASSERT_SENTINEL(obj->pool,POOL); - objnode = tmem_malloc(objnode_t,obj->pool); + objnode = tmem_malloc(struct tmem_object_node,obj->pool); if (objnode == NULL) return NULL; objnode->obj = obj; SET_SENTINEL(objnode,OBJNODE); - memset(&objnode->rtn, 0, sizeof(rtn_t)); + memset(&objnode->rtn, 0, sizeof(struct radix_tree_node)); if (++obj->pool->objnode_count > obj->pool->objnode_count_max) obj->pool->objnode_count_max = obj->pool->objnode_count; atomic_inc_and_max(global_rtree_node_count); @@ -815,13 +806,13 @@ static NOINLINE rtn_t *rtn_alloc(void *arg) } /* called only indirectly from radix_tree_delete/destroy */ -static void rtn_free(rtn_t *rtn, void *arg) +static void rtn_free(struct radix_tree_node *rtn, void *arg) { - pool_t *pool; - objnode_t *objnode; + struct tmem_pool *pool; + struct tmem_object_node *objnode; ASSERT(rtn != NULL); - objnode = container_of(rtn,objnode_t,rtn); + objnode = container_of(rtn,struct tmem_object_node,rtn); ASSERT_SENTINEL(objnode,OBJNODE); INVERT_SENTINEL(objnode,OBJNODE); ASSERT(objnode->obj != NULL); @@ -833,13 +824,13 @@ static void rtn_free(rtn_t *rtn, void *arg) pool->objnode_count--; objnode->obj->objnode_count--; objnode->obj = NULL; - tmem_free(objnode,sizeof(objnode_t),pool); + tmem_free(objnode,sizeof(struct tmem_object_node),pool); atomic_dec_and_assert(global_rtree_node_count); } /************ POOL OBJECT COLLECTION MANIPULATION ROUTINES *******************/ -int oid_compare(OID *left, OID *right) +int oid_compare(struct oid *left, struct oid *right) { if ( left->oid[2] == right->oid[2] ) { @@ -863,29 +854,29 @@ int oid_compare(OID *left, OID *right) return 1; } -void oid_set_invalid(OID *oidp) +void oid_set_invalid(struct oid *oidp) { oidp->oid[0] = oidp->oid[1] = oidp->oid[2] = -1UL; } -unsigned oid_hash(OID *oidp) +unsigned oid_hash(struct oid *oidp) { return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } /* searches for object==oid in pool, returns locked object if found */ -static NOINLINE obj_t * obj_find(pool_t *pool, OID *oidp) +static NOINLINE struct tmem_object_root * obj_find(struct tmem_pool *pool, struct oid *oidp) { struct rb_node *node; - obj_t *obj; + struct tmem_object_root *obj; restart_find: tmem_read_lock(&pool->pool_rwlock); node = pool->obj_rb_root[oid_hash(oidp)].rb_node; while ( node ) { - obj = container_of(node, obj_t, rb_tree_node); + obj = container_of(node, struct tmem_object_root, rb_tree_node); switch ( oid_compare(&obj->oid, oidp) ) { case 0: /* equal */ @@ -913,10 +904,10 @@ restart_find: } /* free an object that has no more pgps in it */ -static NOINLINE void obj_free(obj_t *obj, int no_rebalance) +static NOINLINE void obj_free(struct tmem_object_root *obj, int no_rebalance) { - pool_t *pool; - OID old_oid; + struct tmem_pool *pool; + struct oid old_oid; ASSERT_SPINLOCK(&obj->obj_spinlock); ASSERT(obj != NULL); @@ -942,18 +933,18 @@ static NOINLINE void obj_free(obj_t *obj, int no_rebalance) if ( !no_rebalance ) rb_erase(&obj->rb_tree_node,&pool->obj_rb_root[oid_hash(&old_oid)]); tmem_spin_unlock(&obj->obj_spinlock); - tmem_free(obj,sizeof(obj_t),pool); + tmem_free(obj,sizeof(struct tmem_object_root),pool); } -static NOINLINE int obj_rb_insert(struct rb_root *root, obj_t *obj) +static NOINLINE int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) { struct rb_node **new, *parent = NULL; - obj_t *this; + struct tmem_object_root *this; new = &(root->rb_node); while ( *new ) { - this = container_of(*new, obj_t, rb_tree_node); + this = container_of(*new, struct tmem_object_root, rb_tree_node); parent = *new; switch ( oid_compare(&this->oid, &obj->oid) ) { @@ -976,13 +967,13 @@ static NOINLINE int obj_rb_insert(struct rb_root *root, obj_t *obj) * allocate, initialize, and insert an tmem_object_root * (should be called only if find failed) */ -static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) +static NOINLINE struct tmem_object_root * obj_new(struct tmem_pool *pool, struct oid *oidp) { - obj_t *obj; + struct tmem_object_root *obj; ASSERT(pool != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( (obj = tmem_malloc(obj_t,pool)) == NULL ) + if ( (obj = tmem_malloc(struct tmem_object_root,pool)) == NULL ) return NULL; pool->obj_count++; if (pool->obj_count > pool->obj_count_max) @@ -1005,7 +996,7 @@ static NOINLINE obj_t * obj_new(pool_t *pool, OID *oidp) } /* free an object after destroying any pgps in it */ -static NOINLINE void obj_destroy(obj_t *obj, int no_rebalance) +static NOINLINE void obj_destroy(struct tmem_object_root *obj, int no_rebalance) { ASSERT_WRITELOCK(&obj->pool->pool_rwlock); radix_tree_destroy(&obj->tree_root, pgp_destroy); @@ -1013,10 +1004,10 @@ static NOINLINE void obj_destroy(obj_t *obj, int no_rebalance) } /* destroys all objs in a pool, or only if obj->last_client matches cli_id */ -static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) +static void pool_destroy_objs(struct tmem_pool *pool, bool_t selective, domid_t cli_id) { struct rb_node *node; - obj_t *obj; + struct tmem_object_root *obj; int i; tmem_write_lock(&pool->pool_rwlock); @@ -1026,7 +1017,7 @@ static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) node = rb_first(&pool->obj_rb_root[i]); while ( node != NULL ) { - obj = container_of(node, obj_t, rb_tree_node); + obj = container_of(node, struct tmem_object_root, rb_tree_node); tmem_spin_lock(&obj->obj_spinlock); node = rb_next(node); ASSERT(obj->no_evict == 0); @@ -1045,12 +1036,12 @@ static void pool_destroy_objs(pool_t *pool, bool_t selective, cli_id_t cli_id) /************ POOL MANIPULATION ROUTINES ******************************/ -static pool_t * pool_alloc(void) +static struct tmem_pool * pool_alloc(void) { - pool_t *pool; + struct tmem_pool *pool; int i; - if ( (pool = tmem_alloc_infra(sizeof(pool_t),__alignof__(pool_t))) == NULL ) + if ( (pool = tmem_alloc_infra(sizeof(struct tmem_pool),__alignof__(struct tmem_pool))) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1073,7 +1064,7 @@ static pool_t * pool_alloc(void) return pool; } -static NOINLINE void pool_free(pool_t *pool) +static NOINLINE void pool_free(struct tmem_pool *pool) { ASSERT_SENTINEL(pool,POOL); INVERT_SENTINEL(pool,POOL); @@ -1084,12 +1075,12 @@ static NOINLINE void pool_free(pool_t *pool) /* register new_client as a user of this shared pool and return new total number of registered users */ -static int shared_pool_join(pool_t *pool, client_t *new_client) +static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) { - sharelist_t *sl; + struct share_list *sl; ASSERT(is_shared(pool)); - if ( (sl = tmem_malloc(sharelist_t,NULL)) == NULL ) + if ( (sl = tmem_malloc(struct share_list,NULL)) == NULL ) return -1; sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); @@ -1100,11 +1091,11 @@ static int shared_pool_join(pool_t *pool, client_t *new_client) } /* reassign "ownership" of the pool to another client that shares this pool */ -static NOINLINE void shared_pool_reassign(pool_t *pool) +static NOINLINE void shared_pool_reassign(struct tmem_pool *pool) { - sharelist_t *sl; + struct share_list *sl; int poolid; - client_t *old_client = pool->client, *new_client; + struct client *old_client = pool->client, *new_client; ASSERT(is_shared(pool)); if ( list_empty(&pool->share_list) ) @@ -1113,7 +1104,7 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) return; } old_client->pools[pool->pool_id] = NULL; - sl = list_entry(pool->share_list.next, sharelist_t, share_list); + sl = list_entry(pool->share_list.next, struct share_list, share_list); ASSERT(sl->client != old_client); pool->client = new_client = sl->client; for (poolid = 0; poolid < MAX_POOLS_PER_DOMAIN; poolid++) @@ -1131,9 +1122,9 @@ static NOINLINE void shared_pool_reassign(pool_t *pool) /* destroy all objects with last_client same as passed cli_id, remove pool's cli_id from list of sharers of this pool */ -static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) +static NOINLINE int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) { - sharelist_t *sl; + struct share_list *sl; int s_poolid; ASSERT(is_shared(pool)); @@ -1146,7 +1137,7 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) if (sl->client->cli_id != cli_id) continue; list_del(&sl->share_list); - tmem_free(sl,sizeof(sharelist_t),pool); + tmem_free(sl,sizeof(struct share_list),pool); --pool->shared_count; if (pool->client->cli_id == cli_id) shared_pool_reassign(pool); @@ -1166,7 +1157,7 @@ static NOINLINE int shared_pool_quit(pool_t *pool, cli_id_t cli_id) } /* flush all data (owned by cli_id) from a pool and, optionally, free it */ -static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) +static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) { ASSERT(pool != NULL); if ( (is_shared(pool)) && (shared_pool_quit(pool,cli_id) > 0) ) @@ -1196,9 +1187,9 @@ static void pool_flush(pool_t *pool, cli_id_t cli_id, bool_t destroy) /************ CLIENT MANIPULATION OPERATIONS **************************/ -static client_t *client_create(cli_id_t cli_id) +static struct client *client_create(domid_t cli_id) { - client_t *client = tmem_alloc_infra(sizeof(client_t),__alignof__(client_t)); + struct client *client = tmem_alloc_infra(sizeof(struct client),__alignof__(struct client)); int i; tmem_client_info("tmem: initializing tmem capability for %s=%d...", @@ -1208,7 +1199,7 @@ static client_t *client_create(cli_id_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - memset(client,0,sizeof(client_t)); + memset(client,0,sizeof(struct client)); if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { tmem_client_err("failed... can't allocate host-dependent part of client\n"); @@ -1242,7 +1233,7 @@ static client_t *client_create(cli_id_t cli_id) return NULL; } -static void client_free(client_t *client) +static void client_free(struct client *client) { list_del(&client->client_list); tmem_client_destroy(client->tmem); @@ -1250,10 +1241,10 @@ static void client_free(client_t *client) } /* flush all data from a client and, optionally, free it */ -static void client_flush(client_t *client, bool_t destroy) +static void client_flush(struct client *client, bool_t destroy) { int i; - pool_t *pool; + struct tmem_pool *pool; for (i = 0; i < MAX_POOLS_PER_DOMAIN; i++) { @@ -1267,7 +1258,7 @@ static void client_flush(client_t *client, bool_t destroy) client_free(client); } -static bool_t client_over_quota(client_t *client) +static bool_t client_over_quota(struct client *client) { int total = _atomic_read(client_weight_total); @@ -1279,18 +1270,18 @@ static bool_t client_over_quota(client_t *client) ((total*100L) / client->weight) ); } -static void client_freeze(client_t *client, int freeze) +static void client_freeze(struct client *client, int freeze) { client->frozen = freeze; } /************ MEMORY REVOCATION ROUTINES *******************************/ -static bool_t tmem_try_to_evict_pgp(pgp_t *pgp, bool_t *hold_pool_rwlock) +static bool_t tmem_try_to_evict_pgp(struct tmem_page_descriptor *pgp, bool_t *hold_pool_rwlock) { - obj_t *obj = pgp->us.obj; - pool_t *pool = obj->pool; - client_t *client = pool->client; + struct tmem_object_root *obj = pgp->us.obj; + struct tmem_pool *pool = obj->pool; + struct client *client = pool->client; uint16_t firstbyte = pgp->firstbyte; if ( pool->is_dying ) @@ -1334,10 +1325,10 @@ obj_unlock: static int tmem_evict(void) { - client_t *client = tmem_client_from_current(); - pgp_t *pgp = NULL, *pgp2, *pgp_del; - obj_t *obj; - pool_t *pool; + struct client *client = tmem_client_from_current(); + struct tmem_page_descriptor *pgp = NULL, *pgp2, *pgp_del; + struct tmem_object_root *obj; + struct tmem_pool *pool; int ret = 0; bool_t hold_pool_rwlock = 0; @@ -1430,7 +1421,7 @@ static inline void tmem_ensure_avail_pages(void) /************ TMEM CORE OPERATIONS ************************************/ -static NOINLINE int do_tmem_put_compress(pgp_t *pgp, xen_pfn_t cmfn, +static NOINLINE int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { void *dst, *p; @@ -1473,14 +1464,14 @@ out: return ret; } -static NOINLINE int do_tmem_dup_put(pgp_t *pgp, xen_pfn_t cmfn, +static NOINLINE int do_tmem_dup_put(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - pool_t *pool; - obj_t *obj; - client_t *client; - pgp_t *pgpfound = NULL; + struct tmem_pool *pool; + struct tmem_object_root *obj; + struct client *client; + struct tmem_page_descriptor *pgpfound = NULL; int ret; ASSERT(pgp != NULL); @@ -1563,14 +1554,14 @@ cleanup: } -static NOINLINE int do_tmem_put(pool_t *pool, - OID *oidp, uint32_t index, +static NOINLINE int do_tmem_put(struct tmem_pool *pool, + struct oid *oidp, uint32_t index, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - obj_t *obj = NULL, *objfound = NULL, *objnew = NULL; - pgp_t *pgp = NULL, *pgpdel = NULL; - client_t *client = pool->client; + struct tmem_object_root *obj = NULL, *objfound = NULL, *objnew = NULL; + struct tmem_page_descriptor *pgp = NULL, *pgpdel = NULL; + struct client *client = pool->client; int ret = client->frozen ? -EFROZEN : -ENOMEM; ASSERT(pool != NULL); @@ -1707,13 +1698,13 @@ free: return ret; } -static NOINLINE int do_tmem_get(pool_t *pool, OID *oidp, uint32_t index, +static NOINLINE int do_tmem_get(struct tmem_pool *pool, struct oid *oidp, uint32_t index, xen_pfn_t cmfn, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t clibuf) { - obj_t *obj; - pgp_t *pgp; - client_t *client = pool->client; + struct tmem_object_root *obj; + struct tmem_page_descriptor *pgp; + struct client *client = pool->client; DECL_LOCAL_CYC_COUNTER(decompress); int rc; @@ -1794,10 +1785,10 @@ bad_copy: return rc; } -static NOINLINE int do_tmem_flush_page(pool_t *pool, OID *oidp, uint32_t index) +static NOINLINE int do_tmem_flush_page(struct tmem_pool *pool, struct oid *oidp, uint32_t index) { - obj_t *obj; - pgp_t *pgp; + struct tmem_object_root *obj; + struct tmem_page_descriptor *pgp; pool->flushs++; obj = obj_find(pool,oidp); @@ -1829,9 +1820,9 @@ out: return 1; } -static NOINLINE int do_tmem_flush_object(pool_t *pool, OID *oidp) +static NOINLINE int do_tmem_flush_object(struct tmem_pool *pool, struct oid *oidp) { - obj_t *obj; + struct tmem_object_root *obj; pool->flush_objs++; obj = obj_find(pool,oidp); @@ -1851,8 +1842,8 @@ out: static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) { - client_t *client = tmem_client_from_current(); - pool_t *pool; + struct client *client = tmem_client_from_current(); + struct tmem_pool *pool; if ( client->pools == NULL ) return 0; @@ -1865,19 +1856,19 @@ static NOINLINE int do_tmem_destroy_pool(uint32_t pool_id) return 1; } -static NOINLINE int do_tmem_new_pool(cli_id_t this_cli_id, +static NOINLINE int do_tmem_new_pool(domid_t this_cli_id, uint32_t d_poolid, uint32_t flags, uint64_t uuid_lo, uint64_t uuid_hi) { - client_t *client; - cli_id_t cli_id; + struct client *client; + domid_t cli_id; int persistent = flags & TMEM_POOL_PERSIST; int shared = flags & TMEM_POOL_SHARED; int pagebits = (flags >> TMEM_POOL_PAGESIZE_SHIFT) & TMEM_POOL_PAGESIZE_MASK; int specversion = (flags >> TMEM_POOL_VERSION_SHIFT) & TMEM_POOL_VERSION_MASK; - pool_t *pool, *shpool; + struct tmem_pool *pool, *shpool; int s_poolid, first_unused_s_poolid; int i; @@ -2000,9 +1991,9 @@ fail: /************ TMEM CONTROL OPERATIONS ************************************/ /* freeze/thaw all pools belonging to client cli_id (all domains if -1) */ -static int tmemc_freeze_pools(cli_id_t cli_id, int arg) +static int tmemc_freeze_pools(domid_t cli_id, int arg) { - client_t *client; + struct client *client; bool_t freeze = (arg == TMEMC_FREEZE) ? 1 : 0; bool_t destroy = (arg == TMEMC_DESTROY) ? 1 : 0; char *s; @@ -2025,7 +2016,7 @@ static int tmemc_freeze_pools(cli_id_t cli_id, int arg) return 0; } -static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) +static int tmemc_flush_mem(domid_t cli_id, uint32_t kb) { uint32_t npages, flushed_pages, flushed_kb; @@ -2053,12 +2044,12 @@ static int tmemc_flush_mem(cli_id_t cli_id, uint32_t kb) */ #define BSIZE 1024 -static int tmemc_list_client(client_t *c, tmem_cli_va_param_t buf, +static int tmemc_list_client(struct client *c, tmem_cli_va_param_t buf, int off, uint32_t len, bool_t use_long) { char info[BSIZE]; int i, n = 0, sum = 0; - pool_t *p; + struct tmem_pool *p; bool_t s; n = scnprintf(info,BSIZE,"C=CI:%d,ww:%d,ca:%d,co:%d,fr:%d," @@ -2111,8 +2102,8 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, { char info[BSIZE]; int i, n = 0, sum = 0; - pool_t *p; - sharelist_t *sl; + struct tmem_pool *p; + struct share_list *sl; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++ ) { @@ -2206,10 +2197,10 @@ static int tmemc_list_global(tmem_cli_va_param_t buf, int off, uint32_t len, return sum; } -static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, +static int tmemc_list(domid_t cli_id, tmem_cli_va_param_t buf, uint32_t len, bool_t use_long) { - client_t *client; + struct client *client; int off = 0; if ( cli_id == TMEM_CLI_ID_NULL ) { @@ -2227,9 +2218,9 @@ static int tmemc_list(cli_id_t cli_id, tmem_cli_va_param_t buf, uint32_t len, return 0; } -static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) +static int tmemc_set_var_one(struct client *client, uint32_t subop, uint32_t arg1) { - cli_id_t cli_id = client->cli_id; + domid_t cli_id = client->cli_id; uint32_t old_weight; switch (subop) @@ -2266,9 +2257,9 @@ static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1) return 0; } -static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) +static int tmemc_set_var(domid_t cli_id, uint32_t subop, uint32_t arg1) { - client_t *client; + struct client *client; if ( cli_id == TMEM_CLI_ID_NULL ) list_for_each_entry(client,&global_client_list,client_list) @@ -2280,10 +2271,10 @@ static int tmemc_set_var(cli_id_t cli_id, uint32_t subop, uint32_t arg1) return 0; } -static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, +static NOINLINE int tmemc_shared_pool_auth(domid_t cli_id, uint64_t uuid_lo, uint64_t uuid_hi, bool_t auth) { - client_t *client; + struct client *client; int i, free = -1; if ( cli_id == TMEM_CLI_ID_NULL ) @@ -2320,11 +2311,11 @@ static NOINLINE int tmemc_shared_pool_auth(cli_id_t cli_id, uint64_t uuid_lo, static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, uint32_t subop, tmem_cli_va_param_t buf, uint32_t arg1) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; uint32_t p; - pgp_t *pgp, *pgp2; + struct tmem_page_descriptor *pgp, *pgp2; int rc = -1; switch(subop) @@ -2409,11 +2400,11 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; - pgp_t *pgp; - OID oid; + struct tmem_page_descriptor *pgp; + struct oid oid; int ret = 0; struct tmem_handle h; unsigned int pagesize; @@ -2436,7 +2427,7 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, { /* process the first one */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, - pgp_t,us.pool_pers_pages); + struct tmem_page_descriptor,us.pool_pers_pages); } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { @@ -2445,7 +2436,7 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, goto out; } pgp = list_entry((&pool->cur_pgp->us.pool_pers_pages)->next, - pgp_t,us.pool_pers_pages); + struct tmem_page_descriptor,us.pool_pers_pages); pool->cur_pgp = pgp; oid = pgp->us.obj->oid; h.pool_id = pool_id; @@ -2464,8 +2455,8 @@ out: static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pgp_t *pgp; + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_page_descriptor *pgp; struct tmem_handle h; int ret = 0; @@ -2479,7 +2470,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, if ( client->cur_pgp == NULL ) { pgp = list_entry((&client->persistent_invalidated_list)->next, - pgp_t,client_inv_pages); + struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; } else if ( list_is_last(&client->cur_pgp->client_inv_pages, &client->persistent_invalidated_list) ) @@ -2489,7 +2480,7 @@ static NOINLINE int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, goto out; } else { pgp = list_entry((&client->cur_pgp->client_inv_pages)->next, - pgp_t,client_inv_pages); + struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; } h.pool_id = pgp->pool_id; @@ -2503,11 +2494,11 @@ out: return ret; } -static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, +static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp, uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; if ( pool == NULL ) @@ -2515,11 +2506,11 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, OID *oidp, return do_tmem_put(pool, oidp, index, 0, 0, 0, bufsize, buf); } -static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, OID *oidp, +static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oidp, uint32_t index) { - client_t *client = tmem_client_from_cli_id(cli_id); - pool_t *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) + struct client *client = tmem_client_from_cli_id(cli_id); + struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; if ( pool == NULL ) @@ -2532,7 +2523,7 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) int ret; uint32_t pool_id = op->pool_id; uint32_t subop = op->u.ctrl.subop; - OID *oidp = (OID *)(&op->u.ctrl.oid[0]); + struct oid *oidp = (struct oid *)(&op->u.ctrl.oid[0]); if (!tmem_current_is_privileged()) return -EPERM; @@ -2606,9 +2597,9 @@ static NOINLINE int do_tmem_control(struct tmem_op *op) EXPORT long do_tmem_op(tmem_cli_op_t uops) { struct tmem_op op; - client_t *client = tmem_client_from_current(); - pool_t *pool = NULL; - OID *oidp; + struct client *client = tmem_client_from_current(); + struct tmem_pool *pool = NULL; + struct oid *oidp; int rc = 0; bool_t succ_get = 0, succ_put = 0; bool_t non_succ_get = 0, non_succ_put = 0; @@ -2722,7 +2713,7 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) ASSERT_SENTINEL(pool,POOL); } - oidp = (OID *)&op.u.gen.oid[0]; + oidp = (struct oid *)&op.u.gen.oid[0]; switch ( op.cmd ) { case TMEM_NEW_POOL: @@ -2818,7 +2809,7 @@ out: /* this should be called when the host is destroying a client */ EXPORT void tmem_destroy(void *v) { - client_t *client = (client_t *)v; + struct client *client = (struct client *)v; if ( client == NULL ) return; diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index bb2b601..e92eab6 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -365,7 +365,7 @@ static void tmem_persistent_pool_page_put(void *page_va) /****************** XEN-SPECIFIC CLIENT HANDLING ********************/ -EXPORT tmem_client_t *tmem_client_init(cli_id_t cli_id) +EXPORT tmem_client_t *tmem_client_init(domid_t cli_id) { tmem_client_t *tmem; char name[5]; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index dc37861..bbe1eb6 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -265,13 +265,11 @@ static inline void tmem_free_infra(void *p) /* "Client" (==domain) abstraction */ struct client; -typedef domid_t cli_id_t; -typedef struct domain tmem_cli_ptr_t; -extern tmem_client_t *tmem_client_init(cli_id_t); +extern tmem_client_t *tmem_client_init(domid_t); extern void tmem_client_destroy(tmem_client_t *); -static inline struct client *tmem_client_from_cli_id(cli_id_t cli_id) +static inline struct client *tmem_client_from_cli_id(domid_t cli_id) { struct client *c; struct domain *d = rcu_lock_domain_by_id(cli_id); @@ -289,18 +287,18 @@ static inline struct client *tmem_client_from_current(void) #define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) -static inline cli_id_t tmem_get_cli_id_from_current(void) +static inline domid_t tmem_get_cli_id_from_current(void) { return current->domain->domain_id; } -static inline tmem_cli_ptr_t *tmem_get_cli_ptr_from_current(void) +static inline struct domain *tmem_get_cli_ptr_from_current(void) { return current->domain; } static inline bool_t tmem_set_client_from_id( - struct client *client, tmem_client_t *tmem, cli_id_t cli_id) + struct client *client, tmem_client_t *tmem, domid_t cli_id) { struct domain *d = rcu_lock_domain_by_id(cli_id); bool_t rc = 0; @@ -474,7 +472,7 @@ static inline void tmem_copy_to_client_buf_offset(tmem_cli_va_param_t clibuf, #define tmem_client_buf_add guest_handle_add_offset -#define TMEM_CLI_ID_NULL ((cli_id_t)((domid_t)-1L)) +#define TMEM_CLI_ID_NULL ((domid_t)((domid_t)-1L)) #define tmem_cli_id_str "domid" #define tmem_client_str "domain" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gl-0004fu-Ea; Sat, 23 Nov 2013 09:12:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gk-0004ff-H8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:50 +0000 Received: from [85.158.137.68:35049] by server-1.bemta-3.messagelabs.com id EC/33-29598-19170925; Sat, 23 Nov 2013 09:12:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385197967!3334627!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14843 invoked from network); 23 Nov 2013 09:12:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gh-0002cH-L5 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Gh-00049p-HM for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:47 +0000 Date: Sat, 23 Nov 2013 09:12:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop function tmem_alloc/free_infra X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d05eed005e784190b4560f51f14a31dad2e31c54 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:52 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop function tmem_alloc/free_infra Useless function can be replaced by xmalloc/xfree directly. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 11 +++++------ xen/include/xen/tmem_xen.h | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 3d8e67f..589a515 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1041,7 +1041,7 @@ static struct tmem_pool * pool_alloc(void) struct tmem_pool *pool; int i; - if ( (pool = tmem_alloc_infra(sizeof(struct tmem_pool),__alignof__(struct tmem_pool))) == NULL ) + if ( (pool = xmalloc(struct tmem_pool)) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1070,7 +1070,7 @@ static NOINLINE void pool_free(struct tmem_pool *pool) INVERT_SENTINEL(pool,POOL); pool->client = NULL; list_del(&pool->pool_list); - tmem_free_infra(pool); + xfree(pool); } /* register new_client as a user of this shared pool and return new @@ -1189,7 +1189,7 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) static struct client *client_create(domid_t cli_id) { - struct client *client = tmem_alloc_infra(sizeof(struct client),__alignof__(struct client)); + struct client *client = xzalloc(struct client); int i; tmem_client_info("tmem: initializing tmem capability for %s=%d...", @@ -1199,7 +1199,6 @@ static struct client *client_create(domid_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - memset(client,0,sizeof(struct client)); if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { tmem_client_err("failed... can't allocate host-dependent part of client\n"); @@ -1229,7 +1228,7 @@ static struct client *client_create(domid_t cli_id) return client; fail: - tmem_free_infra(client); + xfree(client); return NULL; } @@ -1237,7 +1236,7 @@ static void client_free(struct client *client) { list_del(&client->client_list); tmem_client_destroy(client->tmem); - tmem_free_infra(client); + xfree(client); } /* flush all data from a client and, optionally, free it */ diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index bbe1eb6..d4eafaf 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -245,20 +245,6 @@ static inline unsigned long tmem_free_mb(void) return (tmem_page_list_pages + total_free_pages()) >> (20 - PAGE_SHIFT); } -/* - * Memory allocation for "infrastructure" data - */ - -static inline void *tmem_alloc_infra(size_t size, size_t align) -{ - return _xmalloc(size,align); -} - -static inline void tmem_free_infra(void *p) -{ - return xfree(p); -} - #define tmem_lock_all opt_tmem_lock #define tmem_called_from_tmem(_memflags) (_memflags & MEMF_tmem) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:12:51 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:12:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gl-0004fu-Ea; Sat, 23 Nov 2013 09:12:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gk-0004ff-H8 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:50 +0000 Received: from [85.158.137.68:35049] by server-1.bemta-3.messagelabs.com id EC/33-29598-19170925; Sat, 23 Nov 2013 09:12:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1385197967!3334627!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14843 invoked from network); 23 Nov 2013 09:12:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:12:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gh-0002cH-L5 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Gh-00049p-HM for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:47 +0000 Date: Sat, 23 Nov 2013 09:12:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop function tmem_alloc/free_infra X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d05eed005e784190b4560f51f14a31dad2e31c54 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:52 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop function tmem_alloc/free_infra Useless function can be replaced by xmalloc/xfree directly. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 11 +++++------ xen/include/xen/tmem_xen.h | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 3d8e67f..589a515 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1041,7 +1041,7 @@ static struct tmem_pool * pool_alloc(void) struct tmem_pool *pool; int i; - if ( (pool = tmem_alloc_infra(sizeof(struct tmem_pool),__alignof__(struct tmem_pool))) == NULL ) + if ( (pool = xmalloc(struct tmem_pool)) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1070,7 +1070,7 @@ static NOINLINE void pool_free(struct tmem_pool *pool) INVERT_SENTINEL(pool,POOL); pool->client = NULL; list_del(&pool->pool_list); - tmem_free_infra(pool); + xfree(pool); } /* register new_client as a user of this shared pool and return new @@ -1189,7 +1189,7 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) static struct client *client_create(domid_t cli_id) { - struct client *client = tmem_alloc_infra(sizeof(struct client),__alignof__(struct client)); + struct client *client = xzalloc(struct client); int i; tmem_client_info("tmem: initializing tmem capability for %s=%d...", @@ -1199,7 +1199,6 @@ static struct client *client_create(domid_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - memset(client,0,sizeof(struct client)); if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { tmem_client_err("failed... can't allocate host-dependent part of client\n"); @@ -1229,7 +1228,7 @@ static struct client *client_create(domid_t cli_id) return client; fail: - tmem_free_infra(client); + xfree(client); return NULL; } @@ -1237,7 +1236,7 @@ static void client_free(struct client *client) { list_del(&client->client_list); tmem_client_destroy(client->tmem); - tmem_free_infra(client); + xfree(client); } /* flush all data from a client and, optionally, free it */ diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index bbe1eb6..d4eafaf 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -245,20 +245,6 @@ static inline unsigned long tmem_free_mb(void) return (tmem_page_list_pages + total_free_pages()) >> (20 - PAGE_SHIFT); } -/* - * Memory allocation for "infrastructure" data - */ - -static inline void *tmem_alloc_infra(size_t size, size_t align) -{ - return _xmalloc(size,align); -} - -static inline void tmem_free_infra(void *p) -{ - return xfree(p); -} - #define tmem_lock_all opt_tmem_lock #define tmem_called_from_tmem(_memflags) (_memflags & MEMF_tmem) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gw-0004hY-Hm; Sat, 23 Nov 2013 09:13:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gv-0004hH-1M for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:01 +0000 Received: from [85.158.139.211:27553] by server-4.bemta-5.messagelabs.com id 74/04-26791-C9170925; Sat, 23 Nov 2013 09:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385197978!1891098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11970 invoked from network); 23 Nov 2013 09:12:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:12:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gr-0002cS-Rf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Gr-0004AF-Pf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:57 +0000 Date: Sat, 23 Nov 2013 09:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef tmem_client_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9f9f62f5451f9610f2957438ed72fd0a88ebae4 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:53 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop typedef tmem_client_t Informations in typedef 'tmem_client_t' can be integreated into 'struct client' directly, no need to use a separate struct. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 31 ++++++++++++++++++++++++------- xen/common/tmem_xen.c | 34 ++-------------------------------- xen/include/xen/tmem_xen.h | 40 +++++++--------------------------------- 3 files changed, 33 insertions(+), 72 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 589a515..db18b65 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -104,7 +104,8 @@ struct tmem_page_content_descriptor; struct client { struct list_head client_list; struct tmem_pool *pools[MAX_POOLS_PER_DOMAIN]; - tmem_client_t *tmem; + struct domain *domain; + struct xmem_pool *persistent_pool; struct list_head ephemeral_page_list; long eph_count, eph_count_max; domid_t cli_id; @@ -1190,7 +1191,9 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) static struct client *client_create(domid_t cli_id) { struct client *client = xzalloc(struct client); - int i; + int i, shift; + char name[5]; + struct domain *d; tmem_client_info("tmem: initializing tmem capability for %s=%d...", tmem_cli_id_str, cli_id); @@ -1199,16 +1202,30 @@ static struct client *client_create(domid_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) + + for (i = 0, shift = 12; i < 4; shift -=4, i++) + name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; + name[4] = '\0'; + client->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, + tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( client->persistent_pool == NULL ) { - tmem_client_err("failed... can't allocate host-dependent part of client\n"); + tmem_client_err("failed... can't alloc persistent pool\n"); goto fail; } - if ( !tmem_set_client_from_id(client, client->tmem, cli_id) ) - { + + d = rcu_lock_domain_by_id(cli_id); + if ( d == NULL ) { tmem_client_err("failed... can't set client\n"); + xmem_pool_destroy(client->persistent_pool); goto fail; } + if ( !d->is_dying ) { + d->tmem = client; + client->domain = d; + } + rcu_unlock_domain(d); + client->cli_id = cli_id; client->compress = tmem_compression_enabled(); client->shared_auth_required = tmem_shared_auth(); @@ -1235,7 +1252,7 @@ static struct client *client_create(domid_t cli_id) static void client_free(struct client *client) { list_del(&client->client_list); - tmem_client_destroy(client->tmem); + xmem_pool_destroy(client->persistent_pool); xfree(client); } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index e92eab6..1309932 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -341,7 +341,7 @@ static int __init tmem_mempool_init(void) /* persistent pools are per-domain */ -static void *tmem_persistent_pool_page_get(unsigned long size) +void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; struct domain *d = current->domain; @@ -353,7 +353,7 @@ static void *tmem_persistent_pool_page_get(unsigned long size) return page_to_virt(pi); } -static void tmem_persistent_pool_page_put(void *page_va) +void tmem_persistent_pool_page_put(void *page_va) { struct page_info *pi; @@ -363,36 +363,6 @@ static void tmem_persistent_pool_page_put(void *page_va) _tmem_free_page_thispool(pi); } -/****************** XEN-SPECIFIC CLIENT HANDLING ********************/ - -EXPORT tmem_client_t *tmem_client_init(domid_t cli_id) -{ - tmem_client_t *tmem; - char name[5]; - int i, shift; - - if ( (tmem = xmalloc(tmem_client_t)) == NULL ) - return NULL; - for (i = 0, shift = 12; i < 4; shift -=4, i++) - name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; - name[4] = '\0'; - tmem->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, - tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmem->persistent_pool == NULL ) - { - xfree(tmem); - return NULL; - } - return tmem; -} - -EXPORT void tmem_client_destroy(tmem_client_t *tmem) -{ - ASSERT(tmem->domain->is_dying); - xmem_pool_destroy(tmem->persistent_pool); - tmem->domain = NULL; -} - /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ static int dstmem_order, workmem_order; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index d4eafaf..3c99bee 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -21,13 +21,6 @@ #ifdef CONFIG_COMPAT #include #endif - -struct tmem_host_dependent_client { - struct domain *domain; - struct xmem_pool *persistent_pool; -}; -typedef struct tmem_host_dependent_client tmem_client_t; - typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ #define IS_PAGE_ALIGNED(addr) \ @@ -123,7 +116,7 @@ static inline bool_t domain_fully_allocated(struct domain *d) return ( d->tot_pages >= d->max_pages ); } #define tmem_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->tmem->domain) + domain_fully_allocated(_pool->client->domain) static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) @@ -138,7 +131,7 @@ static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, return xmem_pool_alloc(size, cmem_mempool); } #define tmem_alloc_subpage_thispool(_pool, _s, _a) \ - _tmem_alloc_subpage_thispool(pool->client->tmem->persistent_pool, \ + _tmem_alloc_subpage_thispool(pool->client->persistent_pool, \ _s, _a) static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, @@ -149,7 +142,7 @@ static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, xmem_pool_free(ptr,cmem_mempool); } #define tmem_free_subpage_thispool(_pool, _p, _s) \ - _tmem_free_subpage_thispool(_pool->client->tmem->persistent_pool, _p, _s) + _tmem_free_subpage_thispool(_pool->client->persistent_pool, _p, _s) static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) { @@ -179,7 +172,7 @@ out: return pi; } #define tmem_alloc_page_thispool(_pool) \ - _tmem_alloc_page_thispool(_pool->client->tmem->domain) + _tmem_alloc_page_thispool(_pool->client->domain) static inline void _tmem_free_page_thispool(struct page_info *pi) { @@ -251,10 +244,6 @@ static inline unsigned long tmem_free_mb(void) /* "Client" (==domain) abstraction */ struct client; - -extern tmem_client_t *tmem_client_init(domid_t); -extern void tmem_client_destroy(tmem_client_t *); - static inline struct client *tmem_client_from_cli_id(domid_t cli_id) { struct client *c; @@ -271,7 +260,7 @@ static inline struct client *tmem_client_from_current(void) return (struct client *)(current->domain->tmem); } -#define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) +#define tmem_client_is_dying(_client) (!!_client->domain->is_dying) static inline domid_t tmem_get_cli_id_from_current(void) { @@ -283,23 +272,6 @@ static inline struct domain *tmem_get_cli_ptr_from_current(void) return current->domain; } -static inline bool_t tmem_set_client_from_id( - struct client *client, tmem_client_t *tmem, domid_t cli_id) -{ - struct domain *d = rcu_lock_domain_by_id(cli_id); - bool_t rc = 0; - if ( d == NULL ) - return 0; - if ( !d->is_dying ) - { - d->tmem = client; - tmem->domain = d; - rc = 1; - } - rcu_unlock_domain(d); - return rc; -} - static inline bool_t tmem_current_permitted(void) { return !xsm_tmem_op(XSM_HOOK); @@ -476,6 +448,8 @@ int tmem_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); extern int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); +extern void *tmem_persistent_pool_page_get(unsigned long size); +extern void tmem_persistent_pool_page_put(void *page_va); #define tmem_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) #define tmem_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:02 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gw-0004hY-Hm; Sat, 23 Nov 2013 09:13:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gv-0004hH-1M for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:01 +0000 Received: from [85.158.139.211:27553] by server-4.bemta-5.messagelabs.com id 74/04-26791-C9170925; Sat, 23 Nov 2013 09:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385197978!1891098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11970 invoked from network); 23 Nov 2013 09:12:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2013 09:12:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Gr-0002cS-Rf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Gr-0004AF-Pf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:12:57 +0000 Date: Sat, 23 Nov 2013 09:12:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop typedef tmem_client_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9f9f62f5451f9610f2957438ed72fd0a88ebae4 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:53 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop typedef tmem_client_t Informations in typedef 'tmem_client_t' can be integreated into 'struct client' directly, no need to use a separate struct. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 31 ++++++++++++++++++++++++------- xen/common/tmem_xen.c | 34 ++-------------------------------- xen/include/xen/tmem_xen.h | 40 +++++++--------------------------------- 3 files changed, 33 insertions(+), 72 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 589a515..db18b65 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -104,7 +104,8 @@ struct tmem_page_content_descriptor; struct client { struct list_head client_list; struct tmem_pool *pools[MAX_POOLS_PER_DOMAIN]; - tmem_client_t *tmem; + struct domain *domain; + struct xmem_pool *persistent_pool; struct list_head ephemeral_page_list; long eph_count, eph_count_max; domid_t cli_id; @@ -1190,7 +1191,9 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) static struct client *client_create(domid_t cli_id) { struct client *client = xzalloc(struct client); - int i; + int i, shift; + char name[5]; + struct domain *d; tmem_client_info("tmem: initializing tmem capability for %s=%d...", tmem_cli_id_str, cli_id); @@ -1199,16 +1202,30 @@ static struct client *client_create(domid_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) + + for (i = 0, shift = 12; i < 4; shift -=4, i++) + name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; + name[4] = '\0'; + client->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, + tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); + if ( client->persistent_pool == NULL ) { - tmem_client_err("failed... can't allocate host-dependent part of client\n"); + tmem_client_err("failed... can't alloc persistent pool\n"); goto fail; } - if ( !tmem_set_client_from_id(client, client->tmem, cli_id) ) - { + + d = rcu_lock_domain_by_id(cli_id); + if ( d == NULL ) { tmem_client_err("failed... can't set client\n"); + xmem_pool_destroy(client->persistent_pool); goto fail; } + if ( !d->is_dying ) { + d->tmem = client; + client->domain = d; + } + rcu_unlock_domain(d); + client->cli_id = cli_id; client->compress = tmem_compression_enabled(); client->shared_auth_required = tmem_shared_auth(); @@ -1235,7 +1252,7 @@ static struct client *client_create(domid_t cli_id) static void client_free(struct client *client) { list_del(&client->client_list); - tmem_client_destroy(client->tmem); + xmem_pool_destroy(client->persistent_pool); xfree(client); } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index e92eab6..1309932 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -341,7 +341,7 @@ static int __init tmem_mempool_init(void) /* persistent pools are per-domain */ -static void *tmem_persistent_pool_page_get(unsigned long size) +void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; struct domain *d = current->domain; @@ -353,7 +353,7 @@ static void *tmem_persistent_pool_page_get(unsigned long size) return page_to_virt(pi); } -static void tmem_persistent_pool_page_put(void *page_va) +void tmem_persistent_pool_page_put(void *page_va) { struct page_info *pi; @@ -363,36 +363,6 @@ static void tmem_persistent_pool_page_put(void *page_va) _tmem_free_page_thispool(pi); } -/****************** XEN-SPECIFIC CLIENT HANDLING ********************/ - -EXPORT tmem_client_t *tmem_client_init(domid_t cli_id) -{ - tmem_client_t *tmem; - char name[5]; - int i, shift; - - if ( (tmem = xmalloc(tmem_client_t)) == NULL ) - return NULL; - for (i = 0, shift = 12; i < 4; shift -=4, i++) - name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0'; - name[4] = '\0'; - tmem->persistent_pool = xmem_pool_create(name, tmem_persistent_pool_page_get, - tmem_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); - if ( tmem->persistent_pool == NULL ) - { - xfree(tmem); - return NULL; - } - return tmem; -} - -EXPORT void tmem_client_destroy(tmem_client_t *tmem) -{ - ASSERT(tmem->domain->is_dying); - xmem_pool_destroy(tmem->persistent_pool); - tmem->domain = NULL; -} - /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ static int dstmem_order, workmem_order; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index d4eafaf..3c99bee 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -21,13 +21,6 @@ #ifdef CONFIG_COMPAT #include #endif - -struct tmem_host_dependent_client { - struct domain *domain; - struct xmem_pool *persistent_pool; -}; -typedef struct tmem_host_dependent_client tmem_client_t; - typedef uint32_t pagesize_t; /* like size_t, must handle largest PAGE_SIZE */ #define IS_PAGE_ALIGNED(addr) \ @@ -123,7 +116,7 @@ static inline bool_t domain_fully_allocated(struct domain *d) return ( d->tot_pages >= d->max_pages ); } #define tmem_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->tmem->domain) + domain_fully_allocated(_pool->client->domain) static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) @@ -138,7 +131,7 @@ static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, return xmem_pool_alloc(size, cmem_mempool); } #define tmem_alloc_subpage_thispool(_pool, _s, _a) \ - _tmem_alloc_subpage_thispool(pool->client->tmem->persistent_pool, \ + _tmem_alloc_subpage_thispool(pool->client->persistent_pool, \ _s, _a) static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, @@ -149,7 +142,7 @@ static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, xmem_pool_free(ptr,cmem_mempool); } #define tmem_free_subpage_thispool(_pool, _p, _s) \ - _tmem_free_subpage_thispool(_pool->client->tmem->persistent_pool, _p, _s) + _tmem_free_subpage_thispool(_pool->client->persistent_pool, _p, _s) static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) { @@ -179,7 +172,7 @@ out: return pi; } #define tmem_alloc_page_thispool(_pool) \ - _tmem_alloc_page_thispool(_pool->client->tmem->domain) + _tmem_alloc_page_thispool(_pool->client->domain) static inline void _tmem_free_page_thispool(struct page_info *pi) { @@ -251,10 +244,6 @@ static inline unsigned long tmem_free_mb(void) /* "Client" (==domain) abstraction */ struct client; - -extern tmem_client_t *tmem_client_init(domid_t); -extern void tmem_client_destroy(tmem_client_t *); - static inline struct client *tmem_client_from_cli_id(domid_t cli_id) { struct client *c; @@ -271,7 +260,7 @@ static inline struct client *tmem_client_from_current(void) return (struct client *)(current->domain->tmem); } -#define tmem_client_is_dying(_client) (!!_client->tmem->domain->is_dying) +#define tmem_client_is_dying(_client) (!!_client->domain->is_dying) static inline domid_t tmem_get_cli_id_from_current(void) { @@ -283,23 +272,6 @@ static inline struct domain *tmem_get_cli_ptr_from_current(void) return current->domain; } -static inline bool_t tmem_set_client_from_id( - struct client *client, tmem_client_t *tmem, domid_t cli_id) -{ - struct domain *d = rcu_lock_domain_by_id(cli_id); - bool_t rc = 0; - if ( d == NULL ) - return 0; - if ( !d->is_dying ) - { - d->tmem = client; - tmem->domain = d; - rc = 1; - } - rcu_unlock_domain(d); - return rc; -} - static inline bool_t tmem_current_permitted(void) { return !xsm_tmem_op(XSM_HOOK); @@ -476,6 +448,8 @@ int tmem_copy_to_client(xen_pfn_t, struct page_info *, pagesize_t tmem_offset, pagesize_t pfn_offset, pagesize_t len, tmem_cli_va_param_t); extern int tmem_copy_tze_to_client(xen_pfn_t cmfn, void *tmem_va, pagesize_t len); +extern void *tmem_persistent_pool_page_get(unsigned long size); +extern void tmem_persistent_pool_page_put(void *page_va); #define tmem_client_err(fmt, args...) printk(XENLOG_G_ERR fmt, ##args) #define tmem_client_warn(fmt, args...) printk(XENLOG_G_WARNING fmt, ##args) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9H6-0004jM-Ki; Sat, 23 Nov 2013 09:13:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9H5-0004j8-85 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:11 +0000 Received: from [85.158.139.211:49082] by server-5.bemta-5.messagelabs.com id E7/C7-14928-6A170925; Sat, 23 Nov 2013 09:13:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385197988!3751361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31535 invoked from network); 23 Nov 2013 09:13:09 -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 Nov 2013 09:13:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9H2-0002d1-8B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9H2-0004BY-1g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:08 +0000 Date: Sat, 23 Nov 2013 09:13:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless wrap 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 0459e197baf02b671dc72e6e72d4267290e72d7a Author: Bob Liu AuthorDate: Fri Nov 8 09:03:54 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop useless wrap functions _tmem_alloc/free_subpage_thispool() and _tmem_alloc/free_page_thispool() are useless, replace them with tmem_alloc/free_subpage_thispool() and tmem_alloc/free_page_thispool() directly. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 8 ++++---- xen/common/tmem_xen.c | 4 ++-- xen/include/xen/tmem_xen.h | 17 ++++------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index db18b65..d3318d4 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -311,7 +311,7 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool * void *v; if ( (pool != NULL) && is_persistent(pool) ) - v = tmem_alloc_subpage_thispool(pool,size,align); + v = tmem_alloc_subpage_thispool(pool->client->persistent_pool,size,align); else v = tmem_alloc_subpage(pool, size, align); if ( v == NULL ) @@ -324,7 +324,7 @@ static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) if ( pool == NULL || !is_persistent(pool) ) tmem_free_subpage(p,size); else - tmem_free_subpage_thispool(pool,p,size); + tmem_free_subpage_thispool(pool->client->persistent_pool,p,size); } static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) @@ -332,7 +332,7 @@ static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) - pfp = tmem_alloc_page_thispool(pool); + pfp = tmem_alloc_page_thispool(pool->client->domain); else pfp = tmem_alloc_page(pool,0); if ( pfp == NULL ) @@ -348,7 +348,7 @@ static NOINLINE void tmem_page_free(struct tmem_pool *pool, struct page_info *pf if ( pool == NULL || !is_persistent(pool) ) tmem_free_page(pfp); else - tmem_free_page_thispool(pool,pfp); + tmem_free_page_thispool(pfp); atomic_dec_and_assert(global_page_count); } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 1309932..0f5955d 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -347,7 +347,7 @@ void *tmem_persistent_pool_page_get(unsigned long size) struct domain *d = current->domain; ASSERT(size == PAGE_SIZE); - if ( (pi = _tmem_alloc_page_thispool(d)) == NULL ) + if ( (pi = tmem_alloc_page_thispool(d)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); @@ -360,7 +360,7 @@ void tmem_persistent_pool_page_put(void *page_va) ASSERT(IS_PAGE_ALIGNED(page_va)); pi = mfn_to_page(virt_to_mfn(page_va)); ASSERT(IS_VALID_PAGE(pi)); - _tmem_free_page_thispool(pi); + tmem_free_page_thispool(pi); } /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 3c99bee..0b64309 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -118,7 +118,7 @@ static inline bool_t domain_fully_allocated(struct domain *d) #define tmem_client_memory_fully_allocated(_pool) \ domain_fully_allocated(_pool->client->domain) -static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { #if 0 @@ -130,21 +130,16 @@ static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, return NULL; return xmem_pool_alloc(size, cmem_mempool); } -#define tmem_alloc_subpage_thispool(_pool, _s, _a) \ - _tmem_alloc_subpage_thispool(pool->client->persistent_pool, \ - _s, _a) -static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, void *ptr, size_t size) { ASSERT( size < tmem_mempool_maxalloc ); ASSERT( cmem_mempool != NULL ); xmem_pool_free(ptr,cmem_mempool); } -#define tmem_free_subpage_thispool(_pool, _p, _s) \ - _tmem_free_subpage_thispool(_pool->client->persistent_pool, _p, _s) -static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) +static inline struct page_info *tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -171,10 +166,8 @@ out: ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -#define tmem_alloc_page_thispool(_pool) \ - _tmem_alloc_page_thispool(_pool->client->domain) -static inline void _tmem_free_page_thispool(struct page_info *pi) +static inline void tmem_free_page_thispool(struct page_info *pi) { struct domain *d = page_get_owner(pi); @@ -188,8 +181,6 @@ static inline void _tmem_free_page_thispool(struct page_info *pi) free_domheap_pages(pi,0); } } -#define tmem_free_page_thispool(_pool,_pg) \ - _tmem_free_page_thispool(_pg) /* * Memory allocation for ephemeral (non-persistent) data -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9H6-0004jM-Ki; Sat, 23 Nov 2013 09:13:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9H5-0004j8-85 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:11 +0000 Received: from [85.158.139.211:49082] by server-5.bemta-5.messagelabs.com id E7/C7-14928-6A170925; Sat, 23 Nov 2013 09:13:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385197988!3751361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31535 invoked from network); 23 Nov 2013 09:13:09 -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 Nov 2013 09:13:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9H2-0002d1-8B for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9H2-0004BY-1g for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:08 +0000 Date: Sat, 23 Nov 2013 09:13:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless wrap 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 0459e197baf02b671dc72e6e72d4267290e72d7a Author: Bob Liu AuthorDate: Fri Nov 8 09:03:54 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:25 2013 -0500 tmem: cleanup: drop useless wrap functions _tmem_alloc/free_subpage_thispool() and _tmem_alloc/free_page_thispool() are useless, replace them with tmem_alloc/free_subpage_thispool() and tmem_alloc/free_page_thispool() directly. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 8 ++++---- xen/common/tmem_xen.c | 4 ++-- xen/include/xen/tmem_xen.h | 17 ++++------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index db18b65..d3318d4 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -311,7 +311,7 @@ static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool * void *v; if ( (pool != NULL) && is_persistent(pool) ) - v = tmem_alloc_subpage_thispool(pool,size,align); + v = tmem_alloc_subpage_thispool(pool->client->persistent_pool,size,align); else v = tmem_alloc_subpage(pool, size, align); if ( v == NULL ) @@ -324,7 +324,7 @@ static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) if ( pool == NULL || !is_persistent(pool) ) tmem_free_subpage(p,size); else - tmem_free_subpage_thispool(pool,p,size); + tmem_free_subpage_thispool(pool->client->persistent_pool,p,size); } static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) @@ -332,7 +332,7 @@ static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) struct page_info *pfp = NULL; if ( pool != NULL && is_persistent(pool) ) - pfp = tmem_alloc_page_thispool(pool); + pfp = tmem_alloc_page_thispool(pool->client->domain); else pfp = tmem_alloc_page(pool,0); if ( pfp == NULL ) @@ -348,7 +348,7 @@ static NOINLINE void tmem_page_free(struct tmem_pool *pool, struct page_info *pf if ( pool == NULL || !is_persistent(pool) ) tmem_free_page(pfp); else - tmem_free_page_thispool(pool,pfp); + tmem_free_page_thispool(pfp); atomic_dec_and_assert(global_page_count); } diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 1309932..0f5955d 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -347,7 +347,7 @@ void *tmem_persistent_pool_page_get(unsigned long size) struct domain *d = current->domain; ASSERT(size == PAGE_SIZE); - if ( (pi = _tmem_alloc_page_thispool(d)) == NULL ) + if ( (pi = tmem_alloc_page_thispool(d)) == NULL ) return NULL; ASSERT(IS_VALID_PAGE(pi)); return page_to_virt(pi); @@ -360,7 +360,7 @@ void tmem_persistent_pool_page_put(void *page_va) ASSERT(IS_PAGE_ALIGNED(page_va)); pi = mfn_to_page(virt_to_mfn(page_va)); ASSERT(IS_VALID_PAGE(pi)); - _tmem_free_page_thispool(pi); + tmem_free_page_thispool(pi); } /****************** XEN-SPECIFIC HOST INITIALIZATION ********************/ diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 3c99bee..0b64309 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -118,7 +118,7 @@ static inline bool_t domain_fully_allocated(struct domain *d) #define tmem_client_memory_fully_allocated(_pool) \ domain_fully_allocated(_pool->client->domain) -static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { #if 0 @@ -130,21 +130,16 @@ static inline void *_tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, return NULL; return xmem_pool_alloc(size, cmem_mempool); } -#define tmem_alloc_subpage_thispool(_pool, _s, _a) \ - _tmem_alloc_subpage_thispool(pool->client->persistent_pool, \ - _s, _a) -static inline void _tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, +static inline void tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, void *ptr, size_t size) { ASSERT( size < tmem_mempool_maxalloc ); ASSERT( cmem_mempool != NULL ); xmem_pool_free(ptr,cmem_mempool); } -#define tmem_free_subpage_thispool(_pool, _p, _s) \ - _tmem_free_subpage_thispool(_pool->client->persistent_pool, _p, _s) -static inline struct page_info *_tmem_alloc_page_thispool(struct domain *d) +static inline struct page_info *tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -171,10 +166,8 @@ out: ASSERT((pi == NULL) || IS_VALID_PAGE(pi)); return pi; } -#define tmem_alloc_page_thispool(_pool) \ - _tmem_alloc_page_thispool(_pool->client->domain) -static inline void _tmem_free_page_thispool(struct page_info *pi) +static inline void tmem_free_page_thispool(struct page_info *pi) { struct domain *d = page_get_owner(pi); @@ -188,8 +181,6 @@ static inline void _tmem_free_page_thispool(struct page_info *pi) free_domheap_pages(pi,0); } } -#define tmem_free_page_thispool(_pool,_pg) \ - _tmem_free_page_thispool(_pg) /* * Memory allocation for ephemeral (non-persistent) data -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9HG-0004lB-NX; Sat, 23 Nov 2013 09:13:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HE-0004kr-Ut for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:21 +0000 Received: from [85.158.137.68:47595] by server-10.bemta-3.messagelabs.com id DD/57-23989-0B170925; Sat, 23 Nov 2013 09:13:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385197998!3276556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23743 invoked from network); 23 Nov 2013 09:13:19 -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; 23 Nov 2013 09:13:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HC-0002d7-FP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HC-0004C6-DT for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:18 +0000 Date: Sat, 23 Nov 2013 09:13:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop unused function 'domain_fully_allocated' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 501d6114e672ad56c4308a58adddc719021939db Author: Bob Liu AuthorDate: Fri Nov 8 09:03:55 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop unused function 'domain_fully_allocated' Nobody uses this function. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/include/xen/tmem_xen.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 0b64309..9941bf2 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -110,14 +110,6 @@ static inline void tmem_page_list_put(struct page_info *pi) /* * Memory allocation for persistent data */ - -static inline bool_t domain_fully_allocated(struct domain *d) -{ - return ( d->tot_pages >= d->max_pages ); -} -#define tmem_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->domain) - static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:22 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9HG-0004lB-NX; Sat, 23 Nov 2013 09:13:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HE-0004kr-Ut for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:21 +0000 Received: from [85.158.137.68:47595] by server-10.bemta-3.messagelabs.com id DD/57-23989-0B170925; Sat, 23 Nov 2013 09:13:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1385197998!3276556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23743 invoked from network); 23 Nov 2013 09:13:19 -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; 23 Nov 2013 09:13:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HC-0002d7-FP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HC-0004C6-DT for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:18 +0000 Date: Sat, 23 Nov 2013 09:13:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop unused function 'domain_fully_allocated' X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 501d6114e672ad56c4308a58adddc719021939db Author: Bob Liu AuthorDate: Fri Nov 8 09:03:55 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop unused function 'domain_fully_allocated' Nobody uses this function. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/include/xen/tmem_xen.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 0b64309..9941bf2 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -110,14 +110,6 @@ static inline void tmem_page_list_put(struct page_info *pi) /* * Memory allocation for persistent data */ - -static inline bool_t domain_fully_allocated(struct domain *d) -{ - return ( d->tot_pages >= d->max_pages ); -} -#define tmem_client_memory_fully_allocated(_pool) \ - domain_fully_allocated(_pool->client->domain) - static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, size_t size, size_t align) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9HQ-0004mt-QO; Sat, 23 Nov 2013 09:13:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HP-0004me-Kj for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:31 +0000 Received: from [193.109.254.147:6367] by server-15.bemta-14.messagelabs.com id 8C/0C-06807-BB170925; Sat, 23 Nov 2013 09:13:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385198008!263407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20120 invoked from network); 23 Nov 2013 09:13:29 -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; 23 Nov 2013 09:13:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HM-0002dF-LH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HM-0004CW-Jf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:28 +0000 Date: Sat, 23 Nov 2013 09:13:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless '_subpage' wrap 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 9a022746f9667b700e986af458697a9fde093605 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:56 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop useless '_subpage' wrap functions There are too many alloc place in tmem which cause the source code is hard too read. Most of the alloc path are useless and only referenced only once, this patch drops 'tmem_alloc_subpage/_thispool' and '_tmem_alloc'. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 71 +++++++++++++++++++++++-------------------- xen/include/xen/tmem_xen.h | 36 ---------------------- 2 files changed, 38 insertions(+), 69 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index d3318d4..f009fd8 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -299,32 +299,37 @@ static atomic_t global_rtree_node_count = ATOMIC_INIT(0); /************ MEMORY ALLOCATION INTERFACE *****************************/ - -#define tmem_malloc(_type,_pool) \ - _tmem_malloc(sizeof(_type), __alignof__(_type), _pool) - -#define tmem_malloc_bytes(_size,_pool) \ - _tmem_malloc(_size, 1, _pool) - -static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool *pool) +static NOINLINE void *tmem_malloc(size_t size, struct tmem_pool *pool) { - void *v; + void *v = NULL; - if ( (pool != NULL) && is_persistent(pool) ) - v = tmem_alloc_subpage_thispool(pool->client->persistent_pool,size,align); + if ( (pool != NULL) && is_persistent(pool) ) { + if ( pool->client->persistent_pool ) + v = xmem_pool_alloc(size, pool->client->persistent_pool); + } else - v = tmem_alloc_subpage(pool, size, align); + { + ASSERT( size < tmem_mempool_maxalloc ); + ASSERT( tmem_mempool != NULL ); + v = xmem_pool_alloc(size, tmem_mempool); + } if ( v == NULL ) alloc_failed++; return v; } -static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) +static NOINLINE void tmem_free(void *p, struct tmem_pool *pool) { if ( pool == NULL || !is_persistent(pool) ) - tmem_free_subpage(p,size); + { + ASSERT( tmem_mempool != NULL ); + xmem_pool_free(p, tmem_mempool); + } else - tmem_free_subpage_thispool(pool->client->persistent_pool,p,size); + { + ASSERT( pool->client->persistent_pool != NULL ); + xmem_pool_free(p, pool->client->persistent_pool); + } } static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) @@ -417,12 +422,12 @@ static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct t /* reinit the struct for safety for now */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* now free up the pcd memory */ - tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); + tmem_free(pcd, NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { /* compressed data */ - tmem_free(pcd_cdata,pcd_csize,pool); + tmem_free(pcd_cdata, pool); pcd_tot_csize -= pcd_csize; } else if ( pcd_size != PAGE_SIZE ) @@ -430,7 +435,7 @@ static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct t /* trailing zero data */ pcd_tot_tze_size -= pcd_size; if ( pcd_size ) - tmem_free(pcd_tze,pcd_size,pool); + tmem_free(pcd_tze, pool); } else { /* real physical page */ if ( tmem_tze_enabled() ) @@ -523,14 +528,14 @@ static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, } /* exited while loop with no match, so alloc a pcd and put it in the tree */ - if ( (pcd = tmem_malloc(struct tmem_page_content_descriptor, NULL)) == NULL ) + if ( (pcd = tmem_malloc(sizeof(struct tmem_page_content_descriptor), NULL)) == NULL ) { ret = -ENOMEM; goto unlock; } else if ( cdata != NULL ) { - if ( (pcd->cdata = tmem_malloc_bytes(csize,pgp->us.obj->pool)) == NULL ) + if ( (pcd->cdata = tmem_malloc(csize,pgp->us.obj->pool)) == NULL ) { - tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); + tmem_free(pcd, NULL); ret = -ENOMEM; goto unlock; } @@ -549,7 +554,7 @@ static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pcd->size = 0; pcd->tze = NULL; } else if ( pfp_size < PAGE_SIZE && - ((pcd->tze = tmem_malloc_bytes(pfp_size,pgp->us.obj->pool)) != NULL) ) { + ((pcd->tze = tmem_malloc(pfp_size,pgp->us.obj->pool)) != NULL) ) { tmem_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); pcd->size = pfp_size; pcd_tot_tze_size += pfp_size; @@ -588,7 +593,7 @@ static NOINLINE struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root * ASSERT(obj != NULL); ASSERT(obj->pool != NULL); pool = obj->pool; - if ( (pgp = tmem_malloc(struct tmem_page_descriptor, pool)) == NULL ) + if ( (pgp = tmem_malloc(sizeof(struct tmem_page_descriptor), pool)) == NULL ) return NULL; pgp->us.obj = obj; INIT_LIST_HEAD(&pgp->global_eph_pages); @@ -628,7 +633,7 @@ static NOINLINE void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) pcd_disassociate(pgp,pool,0); /* pgp->size lost */ else if ( pgp_size ) - tmem_free(pgp->cdata,pgp_size,pool); + tmem_free(pgp->cdata, pool); else tmem_page_free(pgp->us.obj->pool,pgp->pfp); if ( pool != NULL && pgp_size ) @@ -671,7 +676,7 @@ static NOINLINE void pgp_free(struct tmem_page_descriptor *pgp, int from_delete) INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); + tmem_free(pgp, pool); } static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_page_descriptor *pgp) @@ -683,7 +688,7 @@ static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_p INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); + tmem_free(pgp, pool); } /* remove the page from appropriate lists but not from parent object */ @@ -793,7 +798,7 @@ static NOINLINE struct radix_tree_node *rtn_alloc(void *arg) ASSERT_SENTINEL(obj,OBJ); ASSERT(obj->pool != NULL); ASSERT_SENTINEL(obj->pool,POOL); - objnode = tmem_malloc(struct tmem_object_node,obj->pool); + objnode = tmem_malloc(sizeof(struct tmem_object_node),obj->pool); if (objnode == NULL) return NULL; objnode->obj = obj; @@ -825,7 +830,7 @@ static void rtn_free(struct radix_tree_node *rtn, void *arg) pool->objnode_count--; objnode->obj->objnode_count--; objnode->obj = NULL; - tmem_free(objnode,sizeof(struct tmem_object_node),pool); + tmem_free(objnode, pool); atomic_dec_and_assert(global_rtree_node_count); } @@ -934,7 +939,7 @@ static NOINLINE void obj_free(struct tmem_object_root *obj, int no_rebalance) if ( !no_rebalance ) rb_erase(&obj->rb_tree_node,&pool->obj_rb_root[oid_hash(&old_oid)]); tmem_spin_unlock(&obj->obj_spinlock); - tmem_free(obj,sizeof(struct tmem_object_root),pool); + tmem_free(obj, pool); } static NOINLINE int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) @@ -974,7 +979,7 @@ static NOINLINE struct tmem_object_root * obj_new(struct tmem_pool *pool, struct ASSERT(pool != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( (obj = tmem_malloc(struct tmem_object_root,pool)) == NULL ) + if ( (obj = tmem_malloc(sizeof(struct tmem_object_root), pool)) == NULL ) return NULL; pool->obj_count++; if (pool->obj_count > pool->obj_count_max) @@ -1081,7 +1086,7 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) struct share_list *sl; ASSERT(is_shared(pool)); - if ( (sl = tmem_malloc(struct share_list,NULL)) == NULL ) + if ( (sl = tmem_malloc(sizeof(struct share_list), NULL)) == NULL ) return -1; sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); @@ -1138,7 +1143,7 @@ static NOINLINE int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) if (sl->client->cli_id != cli_id) continue; list_del(&sl->share_list); - tmem_free(sl,sizeof(struct share_list),pool); + tmem_free(sl, pool); --pool->shared_count; if (pool->client->cli_id == cli_id) shared_pool_reassign(pool); @@ -1463,7 +1468,7 @@ static NOINLINE int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_p } else if ( tmem_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { if ( (ret = pcd_associate(pgp,dst,size)) == -ENOMEM ) goto out; - } else if ( (p = tmem_malloc_bytes(size,pgp->us.obj->pool)) == NULL ) { + } else if ( (p = tmem_malloc(size,pgp->us.obj->pool)) == NULL ) { ret = -ENOMEM; goto out; } else { diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 9941bf2..f9639a5 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -110,27 +110,6 @@ static inline void tmem_page_list_put(struct page_info *pi) /* * Memory allocation for persistent data */ -static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, - size_t size, size_t align) -{ -#if 0 - if ( d->tot_pages >= d->max_pages ) - return NULL; -#endif - ASSERT( size < tmem_mempool_maxalloc ); - if ( cmem_mempool == NULL ) - return NULL; - return xmem_pool_alloc(size, cmem_mempool); -} - -static inline void tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, - void *ptr, size_t size) -{ - ASSERT( size < tmem_mempool_maxalloc ); - ASSERT( cmem_mempool != NULL ); - xmem_pool_free(ptr,cmem_mempool); -} - static inline struct page_info *tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -177,21 +156,6 @@ static inline void tmem_free_page_thispool(struct page_info *pi) /* * Memory allocation for ephemeral (non-persistent) data */ - -static inline void *tmem_alloc_subpage(void *pool, size_t size, - size_t align) -{ - ASSERT( size < tmem_mempool_maxalloc ); - ASSERT( tmem_mempool != NULL ); - return xmem_pool_alloc(size, tmem_mempool); -} - -static inline void tmem_free_subpage(void *ptr, size_t size) -{ - ASSERT( size < tmem_mempool_maxalloc ); - xmem_pool_free(ptr,tmem_mempool); -} - static inline struct page_info *tmem_alloc_page(void *pool, int no_heap) { struct page_info *pi = tmem_page_list_get(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9HQ-0004mt-QO; Sat, 23 Nov 2013 09:13:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HP-0004me-Kj for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:31 +0000 Received: from [193.109.254.147:6367] by server-15.bemta-14.messagelabs.com id 8C/0C-06807-BB170925; Sat, 23 Nov 2013 09:13:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385198008!263407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20120 invoked from network); 23 Nov 2013 09:13:29 -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; 23 Nov 2013 09:13:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HM-0002dF-LH for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HM-0004CW-Jf for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:28 +0000 Date: Sat, 23 Nov 2013 09:13:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless '_subpage' wrap 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 9a022746f9667b700e986af458697a9fde093605 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:56 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop useless '_subpage' wrap functions There are too many alloc place in tmem which cause the source code is hard too read. Most of the alloc path are useless and only referenced only once, this patch drops 'tmem_alloc_subpage/_thispool' and '_tmem_alloc'. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 71 +++++++++++++++++++++++-------------------- xen/include/xen/tmem_xen.h | 36 ---------------------- 2 files changed, 38 insertions(+), 69 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index d3318d4..f009fd8 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -299,32 +299,37 @@ static atomic_t global_rtree_node_count = ATOMIC_INIT(0); /************ MEMORY ALLOCATION INTERFACE *****************************/ - -#define tmem_malloc(_type,_pool) \ - _tmem_malloc(sizeof(_type), __alignof__(_type), _pool) - -#define tmem_malloc_bytes(_size,_pool) \ - _tmem_malloc(_size, 1, _pool) - -static NOINLINE void *_tmem_malloc(size_t size, size_t align, struct tmem_pool *pool) +static NOINLINE void *tmem_malloc(size_t size, struct tmem_pool *pool) { - void *v; + void *v = NULL; - if ( (pool != NULL) && is_persistent(pool) ) - v = tmem_alloc_subpage_thispool(pool->client->persistent_pool,size,align); + if ( (pool != NULL) && is_persistent(pool) ) { + if ( pool->client->persistent_pool ) + v = xmem_pool_alloc(size, pool->client->persistent_pool); + } else - v = tmem_alloc_subpage(pool, size, align); + { + ASSERT( size < tmem_mempool_maxalloc ); + ASSERT( tmem_mempool != NULL ); + v = xmem_pool_alloc(size, tmem_mempool); + } if ( v == NULL ) alloc_failed++; return v; } -static NOINLINE void tmem_free(void *p, size_t size, struct tmem_pool *pool) +static NOINLINE void tmem_free(void *p, struct tmem_pool *pool) { if ( pool == NULL || !is_persistent(pool) ) - tmem_free_subpage(p,size); + { + ASSERT( tmem_mempool != NULL ); + xmem_pool_free(p, tmem_mempool); + } else - tmem_free_subpage_thispool(pool->client->persistent_pool,p,size); + { + ASSERT( pool->client->persistent_pool != NULL ); + xmem_pool_free(p, pool->client->persistent_pool); + } } static NOINLINE struct page_info *tmem_page_alloc(struct tmem_pool *pool) @@ -417,12 +422,12 @@ static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct t /* reinit the struct for safety for now */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* now free up the pcd memory */ - tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); + tmem_free(pcd, NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { /* compressed data */ - tmem_free(pcd_cdata,pcd_csize,pool); + tmem_free(pcd_cdata, pool); pcd_tot_csize -= pcd_csize; } else if ( pcd_size != PAGE_SIZE ) @@ -430,7 +435,7 @@ static NOINLINE void pcd_disassociate(struct tmem_page_descriptor *pgp, struct t /* trailing zero data */ pcd_tot_tze_size -= pcd_size; if ( pcd_size ) - tmem_free(pcd_tze,pcd_size,pool); + tmem_free(pcd_tze, pool); } else { /* real physical page */ if ( tmem_tze_enabled() ) @@ -523,14 +528,14 @@ static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, } /* exited while loop with no match, so alloc a pcd and put it in the tree */ - if ( (pcd = tmem_malloc(struct tmem_page_content_descriptor, NULL)) == NULL ) + if ( (pcd = tmem_malloc(sizeof(struct tmem_page_content_descriptor), NULL)) == NULL ) { ret = -ENOMEM; goto unlock; } else if ( cdata != NULL ) { - if ( (pcd->cdata = tmem_malloc_bytes(csize,pgp->us.obj->pool)) == NULL ) + if ( (pcd->cdata = tmem_malloc(csize,pgp->us.obj->pool)) == NULL ) { - tmem_free(pcd,sizeof(struct tmem_page_content_descriptor),NULL); + tmem_free(pcd, NULL); ret = -ENOMEM; goto unlock; } @@ -549,7 +554,7 @@ static NOINLINE int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pcd->size = 0; pcd->tze = NULL; } else if ( pfp_size < PAGE_SIZE && - ((pcd->tze = tmem_malloc_bytes(pfp_size,pgp->us.obj->pool)) != NULL) ) { + ((pcd->tze = tmem_malloc(pfp_size,pgp->us.obj->pool)) != NULL) ) { tmem_tze_copy_from_pfp(pcd->tze,pgp->pfp,pfp_size); pcd->size = pfp_size; pcd_tot_tze_size += pfp_size; @@ -588,7 +593,7 @@ static NOINLINE struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root * ASSERT(obj != NULL); ASSERT(obj->pool != NULL); pool = obj->pool; - if ( (pgp = tmem_malloc(struct tmem_page_descriptor, pool)) == NULL ) + if ( (pgp = tmem_malloc(sizeof(struct tmem_page_descriptor), pool)) == NULL ) return NULL; pgp->us.obj = obj; INIT_LIST_HEAD(&pgp->global_eph_pages); @@ -628,7 +633,7 @@ static NOINLINE void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) pcd_disassociate(pgp,pool,0); /* pgp->size lost */ else if ( pgp_size ) - tmem_free(pgp->cdata,pgp_size,pool); + tmem_free(pgp->cdata, pool); else tmem_page_free(pgp->us.obj->pool,pgp->pfp); if ( pool != NULL && pgp_size ) @@ -671,7 +676,7 @@ static NOINLINE void pgp_free(struct tmem_page_descriptor *pgp, int from_delete) INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); + tmem_free(pgp, pool); } static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_page_descriptor *pgp) @@ -683,7 +688,7 @@ static NOINLINE void pgp_free_from_inv_list(struct client *client, struct tmem_p INVERT_SENTINEL(pgp,PGD); pgp->us.obj = NULL; pgp->index = -1; - tmem_free(pgp,sizeof(struct tmem_page_descriptor),pool); + tmem_free(pgp, pool); } /* remove the page from appropriate lists but not from parent object */ @@ -793,7 +798,7 @@ static NOINLINE struct radix_tree_node *rtn_alloc(void *arg) ASSERT_SENTINEL(obj,OBJ); ASSERT(obj->pool != NULL); ASSERT_SENTINEL(obj->pool,POOL); - objnode = tmem_malloc(struct tmem_object_node,obj->pool); + objnode = tmem_malloc(sizeof(struct tmem_object_node),obj->pool); if (objnode == NULL) return NULL; objnode->obj = obj; @@ -825,7 +830,7 @@ static void rtn_free(struct radix_tree_node *rtn, void *arg) pool->objnode_count--; objnode->obj->objnode_count--; objnode->obj = NULL; - tmem_free(objnode,sizeof(struct tmem_object_node),pool); + tmem_free(objnode, pool); atomic_dec_and_assert(global_rtree_node_count); } @@ -934,7 +939,7 @@ static NOINLINE void obj_free(struct tmem_object_root *obj, int no_rebalance) if ( !no_rebalance ) rb_erase(&obj->rb_tree_node,&pool->obj_rb_root[oid_hash(&old_oid)]); tmem_spin_unlock(&obj->obj_spinlock); - tmem_free(obj,sizeof(struct tmem_object_root),pool); + tmem_free(obj, pool); } static NOINLINE int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) @@ -974,7 +979,7 @@ static NOINLINE struct tmem_object_root * obj_new(struct tmem_pool *pool, struct ASSERT(pool != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( (obj = tmem_malloc(struct tmem_object_root,pool)) == NULL ) + if ( (obj = tmem_malloc(sizeof(struct tmem_object_root), pool)) == NULL ) return NULL; pool->obj_count++; if (pool->obj_count > pool->obj_count_max) @@ -1081,7 +1086,7 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) struct share_list *sl; ASSERT(is_shared(pool)); - if ( (sl = tmem_malloc(struct share_list,NULL)) == NULL ) + if ( (sl = tmem_malloc(sizeof(struct share_list), NULL)) == NULL ) return -1; sl->client = new_client; list_add_tail(&sl->share_list, &pool->share_list); @@ -1138,7 +1143,7 @@ static NOINLINE int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) if (sl->client->cli_id != cli_id) continue; list_del(&sl->share_list); - tmem_free(sl,sizeof(struct share_list),pool); + tmem_free(sl, pool); --pool->shared_count; if (pool->client->cli_id == cli_id) shared_pool_reassign(pool); @@ -1463,7 +1468,7 @@ static NOINLINE int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_p } else if ( tmem_dedup_enabled() && !is_persistent(pgp->us.obj->pool) ) { if ( (ret = pcd_associate(pgp,dst,size)) == -ENOMEM ) goto out; - } else if ( (p = tmem_malloc_bytes(size,pgp->us.obj->pool)) == NULL ) { + } else if ( (p = tmem_malloc(size,pgp->us.obj->pool)) == NULL ) { ret = -ENOMEM; goto out; } else { diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 9941bf2..f9639a5 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -110,27 +110,6 @@ static inline void tmem_page_list_put(struct page_info *pi) /* * Memory allocation for persistent data */ -static inline void *tmem_alloc_subpage_thispool(struct xmem_pool *cmem_mempool, - size_t size, size_t align) -{ -#if 0 - if ( d->tot_pages >= d->max_pages ) - return NULL; -#endif - ASSERT( size < tmem_mempool_maxalloc ); - if ( cmem_mempool == NULL ) - return NULL; - return xmem_pool_alloc(size, cmem_mempool); -} - -static inline void tmem_free_subpage_thispool(struct xmem_pool *cmem_mempool, - void *ptr, size_t size) -{ - ASSERT( size < tmem_mempool_maxalloc ); - ASSERT( cmem_mempool != NULL ); - xmem_pool_free(ptr,cmem_mempool); -} - static inline struct page_info *tmem_alloc_page_thispool(struct domain *d) { struct page_info *pi; @@ -177,21 +156,6 @@ static inline void tmem_free_page_thispool(struct page_info *pi) /* * Memory allocation for ephemeral (non-persistent) data */ - -static inline void *tmem_alloc_subpage(void *pool, size_t size, - size_t align) -{ - ASSERT( size < tmem_mempool_maxalloc ); - ASSERT( tmem_mempool != NULL ); - return xmem_pool_alloc(size, tmem_mempool); -} - -static inline void tmem_free_subpage(void *ptr, size_t size) -{ - ASSERT( size < tmem_mempool_maxalloc ); - xmem_pool_free(ptr,tmem_mempool); -} - static inline struct page_info *tmem_alloc_page(void *pool, int no_heap) { struct page_info *pi = tmem_page_list_get(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9Ha-0004om-Ur; Sat, 23 Nov 2013 09:13:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HZ-0004oU-6t for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:41 +0000 Received: from [85.158.143.35:31771] by server-1.bemta-4.messagelabs.com id 82/CF-02132-4C170925; Sat, 23 Nov 2013 09:13:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385198019!572215!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13041 invoked from network); 23 Nov 2013 09:13:39 -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 Nov 2013 09:13:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HW-0002dL-SD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HW-0004Cw-PP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:38 +0000 Date: Sat, 23 Nov 2013 09:13:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless 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 d6e8fd32890b663bc449ab4b60e21dafb09bb821 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:57 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop useless functions Function tmem_release_avail_pages_to_host() and tmem_scrub_page() only used once, no need to separate them out. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 19 +++++++++++++++++-- xen/common/tmem_xen.c | 24 ------------------------ xen/include/xen/tmem_xen.h | 3 --- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f009fd8..3d15ead 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1418,7 +1418,19 @@ static unsigned long tmem_relinquish_npages(unsigned long n) break; } if ( avail_pages ) - tmem_release_avail_pages_to_host(); + { + spin_lock(&tmem_page_list_lock); + while ( !page_list_empty(&tmem_page_list) ) + { + struct page_info *pg = page_list_remove_head(&tmem_page_list); + scrub_one_page(pg); + tmem_page_list_pages--; + free_domheap_page(pg); + } + ASSERT(tmem_page_list_pages == 0); + INIT_PAGE_LIST_HEAD(&tmem_page_list); + spin_unlock(&tmem_page_list_lock); + } return avail_pages; } @@ -2911,9 +2923,12 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) } if ( evicts_per_relinq > max_evicts_per_relinq ) max_evicts_per_relinq = evicts_per_relinq; - tmem_scrub_page(pfp, memflags); if ( pfp != NULL ) + { + if ( !(memflags & MEMF_tmem) ) + scrub_one_page(pfp); relinq_pgs++; + } if ( tmem_called_from_tmem(memflags) ) { diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 0f5955d..d6e2e0d 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -289,30 +289,6 @@ EXPORT DEFINE_SPINLOCK(tmem_page_list_lock); EXPORT PAGE_LIST_HEAD(tmem_page_list); EXPORT unsigned long tmem_page_list_pages = 0; -/* free anything on tmem_page_list to Xen's scrub list */ -EXPORT void tmem_release_avail_pages_to_host(void) -{ - spin_lock(&tmem_page_list_lock); - while ( !page_list_empty(&tmem_page_list) ) - { - struct page_info *pg = page_list_remove_head(&tmem_page_list); - scrub_one_page(pg); - tmem_page_list_pages--; - free_domheap_page(pg); - } - ASSERT(tmem_page_list_pages == 0); - INIT_PAGE_LIST_HEAD(&tmem_page_list); - spin_unlock(&tmem_page_list_lock); -} - -EXPORT void tmem_scrub_page(struct page_info *pi, unsigned int memflags) -{ - if ( pi == NULL ) - return; - if ( !(memflags & MEMF_tmem) ) - scrub_one_page(pi); -} - static noinline void *tmem_mempool_page_get(unsigned long size) { struct page_info *pi; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index f9639a5..034fd5c 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -42,9 +42,6 @@ extern void tmem_copy_page(char *to, char*from); extern int tmem_init(void); #define tmem_hash hash_long -extern void tmem_release_avail_pages_to_host(void); -extern void tmem_scrub_page(struct page_info *pi, unsigned int memflags); - extern bool_t opt_tmem_compress; static inline bool_t tmem_compression_enabled(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 Nov 23 09:13:42 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9Ha-0004om-Ur; Sat, 23 Nov 2013 09:13:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HZ-0004oU-6t for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:41 +0000 Received: from [85.158.143.35:31771] by server-1.bemta-4.messagelabs.com id 82/CF-02132-4C170925; Sat, 23 Nov 2013 09:13:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385198019!572215!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13041 invoked from network); 23 Nov 2013 09:13:39 -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 Nov 2013 09:13:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9HW-0002dL-SD for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9HW-0004Cw-PP for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:38 +0000 Date: Sat, 23 Nov 2013 09:13:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: cleanup: drop useless 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 d6e8fd32890b663bc449ab4b60e21dafb09bb821 Author: Bob Liu AuthorDate: Fri Nov 8 09:03:57 2013 +0800 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 12 10:15:26 2013 -0500 tmem: cleanup: drop useless functions Function tmem_release_avail_pages_to_host() and tmem_scrub_page() only used once, no need to separate them out. Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 19 +++++++++++++++++-- xen/common/tmem_xen.c | 24 ------------------------ xen/include/xen/tmem_xen.h | 3 --- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f009fd8..3d15ead 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1418,7 +1418,19 @@ static unsigned long tmem_relinquish_npages(unsigned long n) break; } if ( avail_pages ) - tmem_release_avail_pages_to_host(); + { + spin_lock(&tmem_page_list_lock); + while ( !page_list_empty(&tmem_page_list) ) + { + struct page_info *pg = page_list_remove_head(&tmem_page_list); + scrub_one_page(pg); + tmem_page_list_pages--; + free_domheap_page(pg); + } + ASSERT(tmem_page_list_pages == 0); + INIT_PAGE_LIST_HEAD(&tmem_page_list); + spin_unlock(&tmem_page_list_lock); + } return avail_pages; } @@ -2911,9 +2923,12 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) } if ( evicts_per_relinq > max_evicts_per_relinq ) max_evicts_per_relinq = evicts_per_relinq; - tmem_scrub_page(pfp, memflags); if ( pfp != NULL ) + { + if ( !(memflags & MEMF_tmem) ) + scrub_one_page(pfp); relinq_pgs++; + } if ( tmem_called_from_tmem(memflags) ) { diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 0f5955d..d6e2e0d 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -289,30 +289,6 @@ EXPORT DEFINE_SPINLOCK(tmem_page_list_lock); EXPORT PAGE_LIST_HEAD(tmem_page_list); EXPORT unsigned long tmem_page_list_pages = 0; -/* free anything on tmem_page_list to Xen's scrub list */ -EXPORT void tmem_release_avail_pages_to_host(void) -{ - spin_lock(&tmem_page_list_lock); - while ( !page_list_empty(&tmem_page_list) ) - { - struct page_info *pg = page_list_remove_head(&tmem_page_list); - scrub_one_page(pg); - tmem_page_list_pages--; - free_domheap_page(pg); - } - ASSERT(tmem_page_list_pages == 0); - INIT_PAGE_LIST_HEAD(&tmem_page_list); - spin_unlock(&tmem_page_list_lock); -} - -EXPORT void tmem_scrub_page(struct page_info *pi, unsigned int memflags) -{ - if ( pi == NULL ) - return; - if ( !(memflags & MEMF_tmem) ) - scrub_one_page(pi); -} - static noinline void *tmem_mempool_page_get(unsigned long size) { struct page_info *pi; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index f9639a5..034fd5c 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -42,9 +42,6 @@ extern void tmem_copy_page(char *to, char*from); extern int tmem_init(void); #define tmem_hash hash_long -extern void tmem_release_avail_pages_to_host(void); -extern void tmem_scrub_page(struct page_info *pi, unsigned int memflags); - extern bool_t opt_tmem_compress; static inline bool_t tmem_compression_enabled(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 Nov 23 09:13:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9Hm-0004qb-1O; Sat, 23 Nov 2013 09:13:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hj-0004qL-VS for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:52 +0000 Received: from [85.158.139.211:29308] by server-1.bemta-5.messagelabs.com id 21/95-21065-FC170925; Sat, 23 Nov 2013 09:13:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385198029!748666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15103 invoked from network); 23 Nov 2013 09:13:50 -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; 23 Nov 2013 09:13:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hh-0002dR-1l for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Hh-0004DI-0j for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:49 +0000 Date: Sat, 23 Nov 2013 09:13:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93218d8a25eb6f492d4a3a43b6bebe0b151b9214 Merge: 2a16fcd5ba0244fef764886211452acc69c0ed00 d6e8fd32890b663bc449ab4b60e21dafb09bb821 Author: Jan Beulich AuthorDate: Fri Nov 22 15:27:19 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 15:27:19 2013 +0100 Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging xen/common/tmem.c | 853 ++++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 171 +++------- xen/include/public/tmem.h | 3 +- xen/include/xen/tmem_xen.h | 251 ++++---------- 4 files changed, 543 insertions(+), 735 deletions(-) diff --cc xen/include/xen/tmem_xen.h index 9fb7446,034fd5c..b26c6fa --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@@ -439,10 -328,10 +328,10 @@@ typedef XEN_GUEST_HANDLE(char) cli_va_t typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t; typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; - static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) + static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT - if ( is_hvm_vcpu(current) ? + if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : is_pv_32on64_vcpu(current) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:13:54 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:13: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 1Vk9Hm-0004qb-1O; Sat, 23 Nov 2013 09:13:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hj-0004qL-VS for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:52 +0000 Received: from [85.158.139.211:29308] by server-1.bemta-5.messagelabs.com id 21/95-21065-FC170925; Sat, 23 Nov 2013 09:13:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1385198029!748666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15103 invoked from network); 23 Nov 2013 09:13:50 -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; 23 Nov 2013 09:13:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hh-0002dR-1l for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Hh-0004DI-0j for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:49 +0000 Date: Sat, 23 Nov 2013 09:13:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93218d8a25eb6f492d4a3a43b6bebe0b151b9214 Merge: 2a16fcd5ba0244fef764886211452acc69c0ed00 d6e8fd32890b663bc449ab4b60e21dafb09bb821 Author: Jan Beulich AuthorDate: Fri Nov 22 15:27:19 2013 +0100 Commit: Jan Beulich CommitDate: Fri Nov 22 15:27:19 2013 +0100 Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging xen/common/tmem.c | 853 ++++++++++++++++++++++---------------------- xen/common/tmem_xen.c | 171 +++------- xen/include/public/tmem.h | 3 +- xen/include/xen/tmem_xen.h | 251 ++++---------- 4 files changed, 543 insertions(+), 735 deletions(-) diff --cc xen/include/xen/tmem_xen.h index 9fb7446,034fd5c..b26c6fa --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@@ -439,10 -328,10 +328,10 @@@ typedef XEN_GUEST_HANDLE(char) cli_va_t typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t; typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t; - static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) + static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) { #ifdef CONFIG_COMPAT - if ( is_hvm_vcpu(current) ? + if ( has_hvm_container_vcpu(current) ? hvm_guest_x86_mode(current) != 8 : is_pv_32on64_vcpu(current) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:14:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9Hz-0004sD-4B; Sat, 23 Nov 2013 09:14:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hu-0004rx-He for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:05 +0000 Received: from [85.158.139.211:54791] by server-12.bemta-5.messagelabs.com id 4E/B1-30017-9D170925; Sat, 23 Nov 2013 09:14:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385198039!1891212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13585 invoked from network); 23 Nov 2013 09:14:00 -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; 23 Nov 2013 09:14:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hr-0002da-67 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Hr-0004Dm-52 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:59 +0000 Date: Sat, 23 Nov 2013 09:13:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove /xen-core-devices node from dom0 dtb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0c5781700a62d6024d9e765dec1d3657858c865 Author: Ian Campbell AuthorDate: Fri Nov 22 15:07:01 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:30:23 2013 +0000 xen: arm: remove /xen-core-devices node from dom0 dtb The intention of adding this node to contain the GIC, timer and memory nodes (in 1c08d6004ea7) was to allow us to control the #address-cells and However in the case of the memory node the #*-cells are always taken from the root node (see ePAPR 3.1, "the following nodes shall be present at the root... memory node"). This caused breakage on the arndale platform. In addition it is not valid to just create sub-nodes like this. Unless they declare themselves as a bus then they will not necessarily be enumerated (although Linux currently does so in practice). Therefore: - Move the memory node back to the top level. - Insert the timer and primary gic nodes in the same location as the host DTB, replacing the originals. Note that the nodes here may be marked as in use by Xen and therefore the check must be before we discard nodes used by Xen. - Drop any secondary gics. Signed-off-by: Ian Campbell Acked-by: Julien Grall Tested-by: Julien Grall --- xen/arch/arm/domain_build.c | 127 +++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 72 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aa7e3d2..595e905 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,24 +48,6 @@ custom_param("dom0_mem", parse_dom0_mem); */ #define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) -/* - * Number of cells used for addresses and sizes under the /xen/ - * node. - * - * We don't have a struct dt_device_node we can reference as a parent - * to get these values, so use these constants instead. - */ -#define XEN_FDT_NODE_ADDRESS_CELLS 2 -#define XEN_FDT_NODE_SIZE_CELLS 2 -#define XEN_FDT_NODE_REG_SIZE \ - dt_cells_to_size(XEN_FDT_NODE_ADDRESS_CELLS + XEN_FDT_NODE_SIZE_CELLS) - -static void set_xen_range(__be32 **cellp, u64 address, u64 size) -{ - dt_set_cell(cellp, XEN_FDT_NODE_ADDRESS_CELLS, address); - dt_set_cell(cellp, XEN_FDT_NODE_SIZE_CELLS, size); -} - struct vcpu *__init alloc_dom0_vcpu0(void) { if ( opt_dom0_max_vcpus == 0 ) @@ -294,14 +276,16 @@ static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, static int make_memory_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent, const struct kernel_info *kinfo) { int res, i; - int nr_cells = XEN_FDT_NODE_REG_SIZE*kinfo->mem.nr_banks; + int reg_size = dt_n_addr_cells(parent) + dt_n_size_cells(parent); + int nr_cells = reg_size*kinfo->mem.nr_banks; __be32 reg[nr_cells]; __be32 *cells; - DPRINT("Create memory node\n"); + DPRINT("Create memory node (reg size %d, nr cells %d)\n", reg_size, nr_cells); /* ePAPR 3.4 */ res = fdt_begin_node(fdt, "memory"); @@ -321,10 +305,10 @@ static int make_memory_node(const struct domain *d, DPRINT(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", i, start, start + size); - set_xen_range(&cells, start, size); + dt_set_range(&cells, parent, start, size); } - res = fdt_property(fdt, "reg", reg, nr_cells); + res = fdt_property(fdt, "reg", reg, sizeof(reg)); if ( res ) return res; @@ -531,7 +515,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } -static int make_gic_node(const struct domain *d, void *fdt) +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; @@ -539,6 +524,16 @@ static int make_gic_node(const struct domain *d, void *fdt) __be32 *new_cells, *tmp; int res = 0; + /* + * Xen currently supports only a single GIC. Discard any secondary + * GIC entries. + */ + if ( parent != dt_interrupt_controller ) + { + DPRINT(" Skipping (secondary GIC)\n"); + return 0; + } + DPRINT("Create gic node\n"); compatible = dt_get_property(gic, "compatible", &len); @@ -565,7 +560,8 @@ static int make_gic_node(const struct domain *d, void *fdt) if ( res ) return res; - len = XEN_FDT_NODE_REG_SIZE * 2; + len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) return -FDT_ERR_XEN(ENOMEM); @@ -573,11 +569,11 @@ static int make_gic_node(const struct domain *d, void *fdt) tmp = new_cells; DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); - set_xen_range(&tmp, d->arch.vgic.dbase, PAGE_SIZE); + dt_set_range(&tmp, parent, d->arch.vgic.dbase, PAGE_SIZE); DPRINT(" Set Cpu Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); - set_xen_range(&tmp, d->arch.vgic.cbase, PAGE_SIZE * 2); + dt_set_range(&tmp, parent, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -602,7 +598,8 @@ static int make_gic_node(const struct domain *d, void *fdt) return res; } -static int make_timer_node(const struct domain *d, void *fdt) +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 = { @@ -662,46 +659,6 @@ static int make_timer_node(const struct domain *d, void *fdt) return res; } -static int make_xen_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent, - const struct kernel_info *kinfo) -{ - int res; - - res = fdt_begin_node(fdt, "xen-core-devices"); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#address-cells", - XEN_FDT_NODE_ADDRESS_CELLS); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#size-cells", - XEN_FDT_NODE_SIZE_CELLS); - if ( res ) - return res; - - res = fdt_property(fdt, "ranges", NULL, 0); - if ( res ) - return res; - - res = make_memory_node(d, fdt, kinfo); - if ( res ) - return res; - - res = make_gic_node(d, fdt); - if ( res ) - return res; - - res = make_timer_node(d, 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) { @@ -792,7 +749,15 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), + { /* sentinel */ }, + }; + static const struct dt_device_match gic_matches[] __initconst = + { DT_MATCH_GIC, + { /* sentinel */ }, + }; + static const struct dt_device_match timer_matches[] __initconst = + { DT_MATCH_TIMER, { /* sentinel */ }, }; @@ -806,11 +771,28 @@ 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 ) || - platform_device_is_blacklisted(np) || - dt_device_used_by(np) == DOMID_XEN ) + if ( dt_match_node(skip_matches, np) ) + { + DPRINT(" Skip it (matched)\n"); + return 0; + } + if ( platform_device_is_blacklisted(np) ) { - DPRINT(" Skip it!\n"); + DPRINT(" Skip it (blacklisted)\n"); + return 0; + } + + /* Replace these nodes with our own. Note that the original may be + * used_by DOMID_XEN so this check comes first. */ + if ( dt_match_node(gic_matches, np) ) + return make_gic_node(d, kinfo->fdt, np); + if ( dt_match_node(timer_matches, np) ) + return make_timer_node(d, kinfo->fdt, np); + + /* Skip nodes used by Xen */ + if ( dt_device_used_by(np) == DOMID_XEN ) + { + DPRINT(" Skip it (used by Xen)\n"); return 0; } @@ -868,9 +850,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_xen_node(d, kinfo->fdt, np, kinfo); + res = make_memory_node(d, kinfo->fdt, np, kinfo); 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 Nov 23 09:14:07 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9Hz-0004sD-4B; Sat, 23 Nov 2013 09:14:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hu-0004rx-He for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:05 +0000 Received: from [85.158.139.211:54791] by server-12.bemta-5.messagelabs.com id 4E/B1-30017-9D170925; Sat, 23 Nov 2013 09:14:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1385198039!1891212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13585 invoked from network); 23 Nov 2013 09:14:00 -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; 23 Nov 2013 09:14:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9Hr-0002da-67 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9Hr-0004Dm-52 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:13:59 +0000 Date: Sat, 23 Nov 2013 09:13:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove /xen-core-devices node from dom0 dtb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0c5781700a62d6024d9e765dec1d3657858c865 Author: Ian Campbell AuthorDate: Fri Nov 22 15:07:01 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:30:23 2013 +0000 xen: arm: remove /xen-core-devices node from dom0 dtb The intention of adding this node to contain the GIC, timer and memory nodes (in 1c08d6004ea7) was to allow us to control the #address-cells and However in the case of the memory node the #*-cells are always taken from the root node (see ePAPR 3.1, "the following nodes shall be present at the root... memory node"). This caused breakage on the arndale platform. In addition it is not valid to just create sub-nodes like this. Unless they declare themselves as a bus then they will not necessarily be enumerated (although Linux currently does so in practice). Therefore: - Move the memory node back to the top level. - Insert the timer and primary gic nodes in the same location as the host DTB, replacing the originals. Note that the nodes here may be marked as in use by Xen and therefore the check must be before we discard nodes used by Xen. - Drop any secondary gics. Signed-off-by: Ian Campbell Acked-by: Julien Grall Tested-by: Julien Grall --- xen/arch/arm/domain_build.c | 127 +++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 72 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aa7e3d2..595e905 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,24 +48,6 @@ custom_param("dom0_mem", parse_dom0_mem); */ #define DOM0_FDT_EXTRA_SIZE (128 + sizeof(struct fdt_reserve_entry)) -/* - * Number of cells used for addresses and sizes under the /xen/ - * node. - * - * We don't have a struct dt_device_node we can reference as a parent - * to get these values, so use these constants instead. - */ -#define XEN_FDT_NODE_ADDRESS_CELLS 2 -#define XEN_FDT_NODE_SIZE_CELLS 2 -#define XEN_FDT_NODE_REG_SIZE \ - dt_cells_to_size(XEN_FDT_NODE_ADDRESS_CELLS + XEN_FDT_NODE_SIZE_CELLS) - -static void set_xen_range(__be32 **cellp, u64 address, u64 size) -{ - dt_set_cell(cellp, XEN_FDT_NODE_ADDRESS_CELLS, address); - dt_set_cell(cellp, XEN_FDT_NODE_SIZE_CELLS, size); -} - struct vcpu *__init alloc_dom0_vcpu0(void) { if ( opt_dom0_max_vcpus == 0 ) @@ -294,14 +276,16 @@ static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, static int make_memory_node(const struct domain *d, void *fdt, + const struct dt_device_node *parent, const struct kernel_info *kinfo) { int res, i; - int nr_cells = XEN_FDT_NODE_REG_SIZE*kinfo->mem.nr_banks; + int reg_size = dt_n_addr_cells(parent) + dt_n_size_cells(parent); + int nr_cells = reg_size*kinfo->mem.nr_banks; __be32 reg[nr_cells]; __be32 *cells; - DPRINT("Create memory node\n"); + DPRINT("Create memory node (reg size %d, nr cells %d)\n", reg_size, nr_cells); /* ePAPR 3.4 */ res = fdt_begin_node(fdt, "memory"); @@ -321,10 +305,10 @@ static int make_memory_node(const struct domain *d, DPRINT(" Bank %d: %#"PRIx64"->%#"PRIx64"\n", i, start, start + size); - set_xen_range(&cells, start, size); + dt_set_range(&cells, parent, start, size); } - res = fdt_property(fdt, "reg", reg, nr_cells); + res = fdt_property(fdt, "reg", reg, sizeof(reg)); if ( res ) return res; @@ -531,7 +515,8 @@ static int make_cpus_node(const struct domain *d, void *fdt, return res; } -static int make_gic_node(const struct domain *d, void *fdt) +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; @@ -539,6 +524,16 @@ static int make_gic_node(const struct domain *d, void *fdt) __be32 *new_cells, *tmp; int res = 0; + /* + * Xen currently supports only a single GIC. Discard any secondary + * GIC entries. + */ + if ( parent != dt_interrupt_controller ) + { + DPRINT(" Skipping (secondary GIC)\n"); + return 0; + } + DPRINT("Create gic node\n"); compatible = dt_get_property(gic, "compatible", &len); @@ -565,7 +560,8 @@ static int make_gic_node(const struct domain *d, void *fdt) if ( res ) return res; - len = XEN_FDT_NODE_REG_SIZE * 2; + len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) return -FDT_ERR_XEN(ENOMEM); @@ -573,11 +569,11 @@ static int make_gic_node(const struct domain *d, void *fdt) tmp = new_cells; DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); - set_xen_range(&tmp, d->arch.vgic.dbase, PAGE_SIZE); + dt_set_range(&tmp, parent, d->arch.vgic.dbase, PAGE_SIZE); DPRINT(" Set Cpu Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); - set_xen_range(&tmp, d->arch.vgic.cbase, PAGE_SIZE * 2); + dt_set_range(&tmp, parent, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -602,7 +598,8 @@ static int make_gic_node(const struct domain *d, void *fdt) return res; } -static int make_timer_node(const struct domain *d, void *fdt) +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 = { @@ -662,46 +659,6 @@ static int make_timer_node(const struct domain *d, void *fdt) return res; } -static int make_xen_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent, - const struct kernel_info *kinfo) -{ - int res; - - res = fdt_begin_node(fdt, "xen-core-devices"); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#address-cells", - XEN_FDT_NODE_ADDRESS_CELLS); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#size-cells", - XEN_FDT_NODE_SIZE_CELLS); - if ( res ) - return res; - - res = fdt_property(fdt, "ranges", NULL, 0); - if ( res ) - return res; - - res = make_memory_node(d, fdt, kinfo); - if ( res ) - return res; - - res = make_gic_node(d, fdt); - if ( res ) - return res; - - res = make_timer_node(d, 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) { @@ -792,7 +749,15 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), + { /* sentinel */ }, + }; + static const struct dt_device_match gic_matches[] __initconst = + { DT_MATCH_GIC, + { /* sentinel */ }, + }; + static const struct dt_device_match timer_matches[] __initconst = + { DT_MATCH_TIMER, { /* sentinel */ }, }; @@ -806,11 +771,28 @@ 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 ) || - platform_device_is_blacklisted(np) || - dt_device_used_by(np) == DOMID_XEN ) + if ( dt_match_node(skip_matches, np) ) + { + DPRINT(" Skip it (matched)\n"); + return 0; + } + if ( platform_device_is_blacklisted(np) ) { - DPRINT(" Skip it!\n"); + DPRINT(" Skip it (blacklisted)\n"); + return 0; + } + + /* Replace these nodes with our own. Note that the original may be + * used_by DOMID_XEN so this check comes first. */ + if ( dt_match_node(gic_matches, np) ) + return make_gic_node(d, kinfo->fdt, np); + if ( dt_match_node(timer_matches, np) ) + return make_timer_node(d, kinfo->fdt, np); + + /* Skip nodes used by Xen */ + if ( dt_device_used_by(np) == DOMID_XEN ) + { + DPRINT(" Skip it (used by Xen)\n"); return 0; } @@ -868,9 +850,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = make_xen_node(d, kinfo->fdt, np, kinfo); + res = make_memory_node(d, kinfo->fdt, np, kinfo); 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 Nov 23 09:14:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9I6-0004te-7F; Sat, 23 Nov 2013 09:14:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9I4-0004tR-JM for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:12 +0000 Received: from [85.158.139.211:35725] by server-11.bemta-5.messagelabs.com id D9/03-23268-3E170925; Sat, 23 Nov 2013 09:14:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385198049!3800102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21346 invoked from network); 23 Nov 2013 09:14: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; 23 Nov 2013 09:14:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9I1-0002e6-Ba for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9I1-0004Ey-9r for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:09 +0000 Date: Sat, 23 Nov 2013 09:14:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct name of the dt node passed around when building dom0 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 9280f514c75e0ce5f470d2df8f1cd53ce5eabb16 Author: Ian Campbell AuthorDate: Fri Nov 22 15:25:18 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:31:28 2013 +0000 xen: arm: correct name of the dt node passed around when building dom0 DT In the case of the GIC, timer and write_properties the argument is the node, not the parent. Rename the argument to "node" in this case. I think this stems from the use of the name "np" in other places (confusing "node parent" for "node pointer"). Therefore replace all uses of "np" with "node". In addition in write_properties now that np=>node the name pp makes no sense. Rename it to "prop". No semantic change. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 80 +++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 595e905..e9bb01f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -153,10 +153,10 @@ static void allocate_memory(struct domain *d, struct kernel_info *kinfo) } static int write_properties(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *np) + const struct dt_device_node *node) { const char *bootargs = NULL; - const struct dt_property *pp; + const struct dt_property *prop; int res = 0; int had_dom0_bootargs = 0; @@ -164,11 +164,11 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, early_info.modules.module[MOD_KERNEL].cmdline[0] ) bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; - dt_for_each_property_node (np, pp) + dt_for_each_property_node (node, prop) { - const void *prop_data = pp->value; + const void *prop_data = prop->value; void *new_data = NULL; - u32 prop_len = pp->length; + u32 prop_len = prop->length; /* * In chosen node: @@ -178,28 +178,28 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. */ - if ( dt_node_path_is_equal(np, "/chosen") ) + if ( dt_node_path_is_equal(node, "/chosen") ) { - if ( dt_property_name_is_equal(pp, "xen,xen-bootargs") || - dt_property_name_is_equal(pp, "linux,initrd-start") || - dt_property_name_is_equal(pp, "linux,initrd-end") ) + if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || + dt_property_name_is_equal(prop, "linux,initrd-start") || + dt_property_name_is_equal(prop, "linux,initrd-end") ) continue; - if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + if ( dt_property_name_is_equal(prop, "xen,dom0-bootargs") ) { had_dom0_bootargs = 1; - bootargs = pp->value; + bootargs = prop->value; continue; } - if ( dt_property_name_is_equal(pp, "bootargs") ) + if ( dt_property_name_is_equal(prop, "bootargs") ) { if ( !bootargs && !had_dom0_bootargs ) - bootargs = pp->value; + bootargs = prop->value; continue; } } - res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); + res = fdt_property(kinfo->fdt, prop->name, prop_data, prop_len); xfree(new_data); @@ -207,7 +207,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( dt_node_path_is_equal(np, "/chosen") && bootargs ) + if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) { res = fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs) + 1); @@ -516,7 +516,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, } static int make_gic_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *node) { const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; @@ -528,7 +528,7 @@ static int make_gic_node(const struct domain *d, void *fdt, * Xen currently supports only a single GIC. Discard any secondary * GIC entries. */ - if ( parent != dt_interrupt_controller ) + if ( node != dt_interrupt_controller ) { DPRINT(" Skipping (secondary GIC)\n"); return 0; @@ -560,7 +560,7 @@ static int make_gic_node(const struct domain *d, void *fdt, if ( res ) return res; - len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) @@ -569,11 +569,11 @@ static int make_gic_node(const struct domain *d, void *fdt, 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); + dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); DPRINT(" Set Cpu Base 0x%"PRIpaddr"-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); + dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -599,7 +599,7 @@ static int make_gic_node(const struct domain *d, void *fdt, } static int make_timer_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *node) { static const struct dt_device_match timer_ids[] __initconst = { @@ -740,7 +740,7 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) } static int handle_node(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *np) + const struct dt_device_node *node) { static const struct dt_device_match skip_matches[] __initconst = { @@ -766,17 +766,17 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, const char *name; const char *path; - path = dt_node_full_name(np); + path = dt_node_full_name(node); 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, node) ) { DPRINT(" Skip it (matched)\n"); return 0; } - if ( platform_device_is_blacklisted(np) ) + if ( platform_device_is_blacklisted(node) ) { DPRINT(" Skip it (blacklisted)\n"); return 0; @@ -784,13 +784,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Replace these nodes with our own. Note that the original may be * used_by DOMID_XEN so this check comes first. */ - if ( dt_match_node(gic_matches, np) ) - return make_gic_node(d, kinfo->fdt, np); - if ( dt_match_node(timer_matches, np) ) - return make_timer_node(d, kinfo->fdt, np); + if ( dt_match_node(gic_matches, node) ) + return make_gic_node(d, kinfo->fdt, node); + if ( dt_match_node(timer_matches, node) ) + return make_timer_node(d, kinfo->fdt, node); /* Skip nodes used by Xen */ - if ( dt_device_used_by(np) == DOMID_XEN ) + if ( dt_device_used_by(node) == DOMID_XEN ) { DPRINT(" Skip it (used by Xen)\n"); return 0; @@ -804,10 +804,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, * property. Therefore these device doesn't need to be mapped. This * solution can be use later for pass through. */ - if ( !dt_device_type_is_equal(np, "memory") && - dt_device_is_available(np) ) + if ( !dt_device_type_is_equal(node, "memory") && + dt_device_is_available(node) ) { - res = map_device(d, np); + res = map_device(d, node); if ( res ) return res; @@ -825,32 +825,32 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = write_properties(d, kinfo, np); + res = write_properties(d, kinfo, node); if ( res ) return res; - for ( child = np->child; child != NULL; child = child->sibling ) + for ( child = node->child; child != NULL; child = child->sibling ) { res = handle_node(d, kinfo, child); if ( res ) return res; } - if ( np == dt_host ) + if ( node == dt_host ) { - res = make_hypervisor_node(d, kinfo->fdt, np); + res = make_hypervisor_node(d, kinfo->fdt, node); if ( res ) return res; - res = make_psci_node(kinfo->fdt, np); + res = make_psci_node(kinfo->fdt, node); if ( res ) return res; - res = make_cpus_node(d, kinfo->fdt, np); + res = make_cpus_node(d, kinfo->fdt, node); if ( res ) return res; - res = make_memory_node(d, kinfo->fdt, np, kinfo); + res = make_memory_node(d, kinfo->fdt, node, kinfo); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:14:14 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9I6-0004te-7F; Sat, 23 Nov 2013 09:14:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9I4-0004tR-JM for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:12 +0000 Received: from [85.158.139.211:35725] by server-11.bemta-5.messagelabs.com id D9/03-23268-3E170925; Sat, 23 Nov 2013 09:14:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1385198049!3800102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21346 invoked from network); 23 Nov 2013 09:14: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; 23 Nov 2013 09:14:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9I1-0002e6-Ba for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9I1-0004Ey-9r for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:09 +0000 Date: Sat, 23 Nov 2013 09:14:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct name of the dt node passed around when building dom0 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 9280f514c75e0ce5f470d2df8f1cd53ce5eabb16 Author: Ian Campbell AuthorDate: Fri Nov 22 15:25:18 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:31:28 2013 +0000 xen: arm: correct name of the dt node passed around when building dom0 DT In the case of the GIC, timer and write_properties the argument is the node, not the parent. Rename the argument to "node" in this case. I think this stems from the use of the name "np" in other places (confusing "node parent" for "node pointer"). Therefore replace all uses of "np" with "node". In addition in write_properties now that np=>node the name pp makes no sense. Rename it to "prop". No semantic change. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 80 +++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 595e905..e9bb01f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -153,10 +153,10 @@ static void allocate_memory(struct domain *d, struct kernel_info *kinfo) } static int write_properties(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *np) + const struct dt_device_node *node) { const char *bootargs = NULL; - const struct dt_property *pp; + const struct dt_property *prop; int res = 0; int had_dom0_bootargs = 0; @@ -164,11 +164,11 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, early_info.modules.module[MOD_KERNEL].cmdline[0] ) bootargs = &early_info.modules.module[MOD_KERNEL].cmdline[0]; - dt_for_each_property_node (np, pp) + dt_for_each_property_node (node, prop) { - const void *prop_data = pp->value; + const void *prop_data = prop->value; void *new_data = NULL; - u32 prop_len = pp->length; + u32 prop_len = prop->length; /* * In chosen node: @@ -178,28 +178,28 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. */ - if ( dt_node_path_is_equal(np, "/chosen") ) + if ( dt_node_path_is_equal(node, "/chosen") ) { - if ( dt_property_name_is_equal(pp, "xen,xen-bootargs") || - dt_property_name_is_equal(pp, "linux,initrd-start") || - dt_property_name_is_equal(pp, "linux,initrd-end") ) + if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || + dt_property_name_is_equal(prop, "linux,initrd-start") || + dt_property_name_is_equal(prop, "linux,initrd-end") ) continue; - if ( dt_property_name_is_equal(pp, "xen,dom0-bootargs") ) + if ( dt_property_name_is_equal(prop, "xen,dom0-bootargs") ) { had_dom0_bootargs = 1; - bootargs = pp->value; + bootargs = prop->value; continue; } - if ( dt_property_name_is_equal(pp, "bootargs") ) + if ( dt_property_name_is_equal(prop, "bootargs") ) { if ( !bootargs && !had_dom0_bootargs ) - bootargs = pp->value; + bootargs = prop->value; continue; } } - res = fdt_property(kinfo->fdt, pp->name, prop_data, prop_len); + res = fdt_property(kinfo->fdt, prop->name, prop_data, prop_len); xfree(new_data); @@ -207,7 +207,7 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( dt_node_path_is_equal(np, "/chosen") && bootargs ) + if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) { res = fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs) + 1); @@ -516,7 +516,7 @@ static int make_cpus_node(const struct domain *d, void *fdt, } static int make_gic_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *node) { const struct dt_device_node *gic = dt_interrupt_controller; const void *compatible = NULL; @@ -528,7 +528,7 @@ static int make_gic_node(const struct domain *d, void *fdt, * Xen currently supports only a single GIC. Discard any secondary * GIC entries. */ - if ( parent != dt_interrupt_controller ) + if ( node != dt_interrupt_controller ) { DPRINT(" Skipping (secondary GIC)\n"); return 0; @@ -560,7 +560,7 @@ static int make_gic_node(const struct domain *d, void *fdt, if ( res ) return res; - len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent)); + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ new_cells = xzalloc_bytes(len); if ( new_cells == NULL ) @@ -569,11 +569,11 @@ static int make_gic_node(const struct domain *d, void *fdt, 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); + dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); DPRINT(" Set Cpu Base 0x%"PRIpaddr"-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); + dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); res = fdt_property(fdt, "reg", new_cells, len); xfree(new_cells); @@ -599,7 +599,7 @@ static int make_gic_node(const struct domain *d, void *fdt, } static int make_timer_node(const struct domain *d, void *fdt, - const struct dt_device_node *parent) + const struct dt_device_node *node) { static const struct dt_device_match timer_ids[] __initconst = { @@ -740,7 +740,7 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) } static int handle_node(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *np) + const struct dt_device_node *node) { static const struct dt_device_match skip_matches[] __initconst = { @@ -766,17 +766,17 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, const char *name; const char *path; - path = dt_node_full_name(np); + path = dt_node_full_name(node); 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, node) ) { DPRINT(" Skip it (matched)\n"); return 0; } - if ( platform_device_is_blacklisted(np) ) + if ( platform_device_is_blacklisted(node) ) { DPRINT(" Skip it (blacklisted)\n"); return 0; @@ -784,13 +784,13 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Replace these nodes with our own. Note that the original may be * used_by DOMID_XEN so this check comes first. */ - if ( dt_match_node(gic_matches, np) ) - return make_gic_node(d, kinfo->fdt, np); - if ( dt_match_node(timer_matches, np) ) - return make_timer_node(d, kinfo->fdt, np); + if ( dt_match_node(gic_matches, node) ) + return make_gic_node(d, kinfo->fdt, node); + if ( dt_match_node(timer_matches, node) ) + return make_timer_node(d, kinfo->fdt, node); /* Skip nodes used by Xen */ - if ( dt_device_used_by(np) == DOMID_XEN ) + if ( dt_device_used_by(node) == DOMID_XEN ) { DPRINT(" Skip it (used by Xen)\n"); return 0; @@ -804,10 +804,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, * property. Therefore these device doesn't need to be mapped. This * solution can be use later for pass through. */ - if ( !dt_device_type_is_equal(np, "memory") && - dt_device_is_available(np) ) + if ( !dt_device_type_is_equal(node, "memory") && + dt_device_is_available(node) ) { - res = map_device(d, np); + res = map_device(d, node); if ( res ) return res; @@ -825,32 +825,32 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, if ( res ) return res; - res = write_properties(d, kinfo, np); + res = write_properties(d, kinfo, node); if ( res ) return res; - for ( child = np->child; child != NULL; child = child->sibling ) + for ( child = node->child; child != NULL; child = child->sibling ) { res = handle_node(d, kinfo, child); if ( res ) return res; } - if ( np == dt_host ) + if ( node == dt_host ) { - res = make_hypervisor_node(d, kinfo->fdt, np); + res = make_hypervisor_node(d, kinfo->fdt, node); if ( res ) return res; - res = make_psci_node(kinfo->fdt, np); + res = make_psci_node(kinfo->fdt, node); if ( res ) return res; - res = make_cpus_node(d, kinfo->fdt, np); + res = make_cpus_node(d, kinfo->fdt, node); if ( res ) return res; - res = make_memory_node(d, kinfo->fdt, np, kinfo); + res = make_memory_node(d, kinfo->fdt, node, kinfo); if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 23 09:14:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9IG-0004vj-CM; Sat, 23 Nov 2013 09:14:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9IE-0004vL-2d for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:22 +0000 Received: from [193.109.254.147:38570] by server-14.bemta-14.messagelabs.com id D5/36-25733-DE170925; Sat, 23 Nov 2013 09:14:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385198059!266133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16688 invoked from network); 23 Nov 2013 09:14:20 -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; 23 Nov 2013 09:14:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9IB-0002eF-Gg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9IB-0004FL-F2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:19 +0000 Date: Sat, 23 Nov 2013 09:14:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: early logging of command line X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bc72c626512d7d79a7f0295fbfa7cd597ce620a Author: Ian Campbell AuthorDate: Fri Nov 22 16:24:27 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:35:11 2013 +0000 xen: arm: early logging of command line Helpful for diagnosis of bad console= parameters. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/setup.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index cdcc2e7..b032030 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -596,6 +596,7 @@ void __init start_xen(unsigned long boot_phys_offset, { size_t fdt_size; int cpus, i; + const char *cmdline; setup_cache(); @@ -609,7 +610,9 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); - cmdline_parse(device_tree_bootargs(device_tree_flattened)); + cmdline = device_tree_bootargs(device_tree_flattened); + early_printk("Command line: %s\n", cmdline); + cmdline_parse(cmdline); setup_pagetables(boot_phys_offset, get_xen_paddr()); setup_mm(fdt_paddr, fdt_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 Nov 23 09:14:24 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Nov 2013 09:14: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 1Vk9IG-0004vj-CM; Sat, 23 Nov 2013 09:14:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9IE-0004vL-2d for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:22 +0000 Received: from [193.109.254.147:38570] by server-14.bemta-14.messagelabs.com id D5/36-25733-DE170925; Sat, 23 Nov 2013 09:14:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385198059!266133!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16688 invoked from network); 23 Nov 2013 09:14:20 -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; 23 Nov 2013 09:14:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vk9IB-0002eF-Gg for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vk9IB-0004FL-F2 for xen-changelog@lists.xensource.com; Sat, 23 Nov 2013 09:14:19 +0000 Date: Sat, 23 Nov 2013 09:14:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: early logging of command line X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9bc72c626512d7d79a7f0295fbfa7cd597ce620a Author: Ian Campbell AuthorDate: Fri Nov 22 16:24:27 2013 +0000 Commit: Ian Campbell CommitDate: Fri Nov 22 16:35:11 2013 +0000 xen: arm: early logging of command line Helpful for diagnosis of bad console= parameters. Signed-off-by: Ian Campbell Acked-by: Julien Grall Acked-by: Stefano Stabellini --- xen/arch/arm/setup.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index cdcc2e7..b032030 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -596,6 +596,7 @@ void __init start_xen(unsigned long boot_phys_offset, { size_t fdt_size; int cpus, i; + const char *cmdline; setup_cache(); @@ -609,7 +610,9 @@ void __init start_xen(unsigned long boot_phys_offset, + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(device_tree_flattened, fdt_paddr); - cmdline_parse(device_tree_bootargs(device_tree_flattened)); + cmdline = device_tree_bootargs(device_tree_flattened); + early_printk("Command line: %s\n", cmdline); + cmdline_parse(cmdline); setup_pagetables(boot_phys_offset, get_xen_paddr()); setup_mm(fdt_paddr, fdt_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 Mon Nov 25 13:55:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd1-0003fd-T7; Mon, 25 Nov 2013 13:55:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd0-0003fS-IL for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:06 +0000 Received: from [85.158.143.35:55884] by server-2.bemta-4.messagelabs.com id A9/87-11386-9B653925; Mon, 25 Nov 2013 13:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385387703!942284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6728 invoked from network); 25 Nov 2013 13:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 13:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwcx-0002LR-FH for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vkwcw-0005m7-8W for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:03 +0000 Date: Mon, 25 Nov 2013 13:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d4fa397ba0fbae0c62282de619e1f088a320b33 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:49 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) (cherry picked from commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b) (cherry picked from commit 7c51fb2971cd455eb728e716f16a488c01f8e759) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 13:55:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd1-0003fd-T7; Mon, 25 Nov 2013 13:55:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd0-0003fS-IL for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:06 +0000 Received: from [85.158.143.35:55884] by server-2.bemta-4.messagelabs.com id A9/87-11386-9B653925; Mon, 25 Nov 2013 13:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385387703!942284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6728 invoked from network); 25 Nov 2013 13:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 13:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwcx-0002LR-FH for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vkwcw-0005m7-8W for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:03 +0000 Date: Mon, 25 Nov 2013 13:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.1-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d4fa397ba0fbae0c62282de619e1f088a320b33 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:49 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) (cherry picked from commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b) (cherry picked from commit 7c51fb2971cd455eb728e716f16a488c01f8e759) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 13:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13: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 1VkwdB-0003gT-W8; Mon, 25 Nov 2013 13:55:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VkwdB-0003gL-C3 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:17 +0000 Received: from [193.109.254.147:60552] by server-9.bemta-14.messagelabs.com id 86/DF-13957-4C653925; Mon, 25 Nov 2013 13:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385387714!618394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18222 invoked from network); 25 Nov 2013 13:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 13:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd8-0002LX-D3 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vkwd8-0005mq-A8 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:14 +0000 Date: Mon, 25 Nov 2013 13:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c51fb2971cd455eb728e716f16a488c01f8e759 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:09 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) (cherry picked from commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 13:55:18 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13: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 1VkwdB-0003gT-W8; Mon, 25 Nov 2013 13:55:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VkwdB-0003gL-C3 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:17 +0000 Received: from [193.109.254.147:60552] by server-9.bemta-14.messagelabs.com id 86/DF-13957-4C653925; Mon, 25 Nov 2013 13:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1385387714!618394!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18222 invoked from network); 25 Nov 2013 13:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 13:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vkwd8-0002LX-D3 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vkwd8-0005mq-A8 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:14 +0000 Date: Mon, 25 Nov 2013 13:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c51fb2971cd455eb728e716f16a488c01f8e759 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:09 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) (cherry picked from commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 13:55:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13:55: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 1VkwdO-0003ht-3T; Mon, 25 Nov 2013 13: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 1VkwdM-0003hc-FR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:28 +0000 Received: from [85.158.143.35:62160] by server-3.bemta-4.messagelabs.com id A5/F5-32360-FC653925; Mon, 25 Nov 2013 13:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385387725!947738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9817 invoked from network); 25 Nov 2013 13:55:26 -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; 25 Nov 2013 13:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VkwdJ-0002Ld-L6 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VkwdJ-0005nW-7a for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:25 +0000 Date: Mon, 25 Nov 2013 13:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:52:06 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 13:55:30 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 13:55: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 1VkwdO-0003ht-3T; Mon, 25 Nov 2013 13: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 1VkwdM-0003hc-FR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:28 +0000 Received: from [85.158.143.35:62160] by server-3.bemta-4.messagelabs.com id A5/F5-32360-FC653925; Mon, 25 Nov 2013 13:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385387725!947738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9817 invoked from network); 25 Nov 2013 13:55:26 -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; 25 Nov 2013 13:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VkwdJ-0002Ld-L6 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VkwdJ-0005nW-7a for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 13:55:25 +0000 Date: Mon, 25 Nov 2013 13:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 11 13:42:56 2013 -0500 Commit: Ian Jackson CommitDate: Mon Nov 25 13:52:06 2013 +0000 hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. The ACPI AML code has little snippets where it uses two memory locations to stash debug information when doing PCI hotplug, such as: Device (S20) { Name (_ADR, 0x00040000) Name (_SUN, 0x04) Method (_EJ0, 1, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x88, \_GPE.DPT2) Store (One, \_GPE.PH20) } Method (_STA, 0, NotSerialized) { Store (0x20, \_GPE.DPT1) Store (0x89, \_GPE.DPT2) } } and DPT1 (and DPT2) is defined as: OperationRegion ( DG1, SystemIO, 0xb044, 0x04 ) Field ( DG1, ByteAcc, NoLock, Preserve ) { DPT1, 8, DPT2, 8 } But unfortunately when we do the writes they are done as byte writes, not as 4-byte writes (long). Hence any debug values are never show in QEMU. This fixes it so that we can see them in the log file. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson (cherry picked from commit 832f9bde25542961ea4f768be6e00e4801484e3a) --- hw/piix4acpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c index bf916d9..ddbe8e0 100644 --- a/hw/piix4acpi.c +++ b/hw/piix4acpi.c @@ -284,7 +284,7 @@ static inline void clear_bit(uint8_t *map, int bit) map[bit / 8] &= ~(1 << (bit % 8)); } -static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) +static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val) { PIIX4ACPI_LOG(PIIX4ACPI_LOG_DEBUG, "ACPI: DBG: 0x%08x\n", val); PIIX4ACPI_LOG(PIIX4ACPI_LOG_INFO, "ACPI:debug: write addr=0x%x, val=0x%x.\n", addr, val); @@ -776,7 +776,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, #ifdef CONFIG_PASSTHROUGH php_devfn_init(); #endif - register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, d); + register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, d); register_savevm("piix4acpi", 0, 2, piix4acpi_save, piix4acpi_load, d); -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20: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 1Vl2Us-0000tN-Q0; Mon, 25 Nov 2013 20: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 1Vl2Ur-0000t4-JR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:05 +0000 Received: from [193.109.254.147:52104] by server-2.bemta-14.messagelabs.com id 44/F1-00361-8DEA3925; Mon, 25 Nov 2013 20:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385410263!698118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19882 invoked from network); 25 Nov 2013 20: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; 25 Nov 2013 20:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2Up-0006ze-7A for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2Uo-0008GQ-W7 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:03 +0000 Date: Mon, 25 Nov 2013 20:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn/fifo: only set READY for new heads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70ccddb14a99ada447602ca01250a1183363bc49 Author: David Vrabel AuthorDate: Mon Nov 25 11:15:05 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:15:05 2013 +0100 evtchn/fifo: only set READY for new heads Setting a queue's READY bit for every event added to the queue introduces a race. If an event is added to the tail of a queue, the guest may consume the newly added event and leave an empty queue before the READY is set. The guest may then see a stale HEAD value and if the event at the stale head became linked onto a different queue, the guest would consume events from the wrong queue (corrupting it). As noted in section 4.1.2 of the design document, only set READY if a new HEAD is set. This ensures that if the guest sees a READY bit set the corresponding HEAD is valid. Signed-off-by: David Vrabel --- xen/common/event_fifo.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 9106c55..6048784 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -161,8 +161,9 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) spin_unlock_irqrestore(&q->lock, flags); - if ( !test_and_set_bit(q->priority, - &v->evtchn_fifo->control_block->ready) ) + if ( !linked + && !test_and_set_bit(q->priority, + &v->evtchn_fifo->control_block->ready) ) vcpu_mark_events_pending(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:12 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20: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 1Vl2Us-0000tN-Q0; Mon, 25 Nov 2013 20: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 1Vl2Ur-0000t4-JR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:05 +0000 Received: from [193.109.254.147:52104] by server-2.bemta-14.messagelabs.com id 44/F1-00361-8DEA3925; Mon, 25 Nov 2013 20:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385410263!698118!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19882 invoked from network); 25 Nov 2013 20: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; 25 Nov 2013 20:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2Up-0006ze-7A for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2Uo-0008GQ-W7 for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:03 +0000 Date: Mon, 25 Nov 2013 20:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn/fifo: only set READY for new heads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70ccddb14a99ada447602ca01250a1183363bc49 Author: David Vrabel AuthorDate: Mon Nov 25 11:15:05 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:15:05 2013 +0100 evtchn/fifo: only set READY for new heads Setting a queue's READY bit for every event added to the queue introduces a race. If an event is added to the tail of a queue, the guest may consume the newly added event and leave an empty queue before the READY is set. The guest may then see a stale HEAD value and if the event at the stale head became linked onto a different queue, the guest would consume events from the wrong queue (corrupting it). As noted in section 4.1.2 of the design document, only set READY if a new HEAD is set. This ensures that if the guest sees a READY bit set the corresponding HEAD is valid. Signed-off-by: David Vrabel --- xen/common/event_fifo.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 9106c55..6048784 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -161,8 +161,9 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) spin_unlock_irqrestore(&q->lock, flags); - if ( !test_and_set_bit(q->priority, - &v->evtchn_fifo->control_block->ready) ) + if ( !linked + && !test_and_set_bit(q->priority, + &v->evtchn_fifo->control_block->ready) ) vcpu_mark_events_pending(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V3-0000uZ-So; Mon, 25 Nov 2013 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V2-0000tv-Cc for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:16 +0000 Received: from [193.109.254.147:55898] by server-10.bemta-14.messagelabs.com id 11/9F-20752-3EEA3925; Mon, 25 Nov 2013 20:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385410273!700324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10976 invoked from network); 25 Nov 2013 20:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2Uz-0006zh-KR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2Uz-0008Go-BF for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:13 +0000 Date: Mon, 25 Nov 2013 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: clearly specify used parameters in vcpu_guest_context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0028733521706928619==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0028733521706928619== Content-Type: text/plain commit 0774c003adc4e23a68487eeb46ccd05d445559e8 Author: Roger Pau Monné AuthorDate: Mon Nov 25 11:17:03 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:17:03 2013 +0100 x86/pvh: clearly specify used parameters in vcpu_guest_context The aim of this patch is to define a stable way in which PVH is going to do AP bringup. Since we are running inside of a HVM container, PVH should only need to set flags, cr3 and user_regs in order to bring up a vCPU, the rest can be set once the vCPU is started using the bare metal methods. Signed-off-by: Roger Pau Monné Reviewed-off-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/domain.c | 13 +++++-------- xen/arch/x86/hvm/vmx/vmx.c | 6 +----- xen/include/asm-x86/hvm/hvm.h | 6 +++--- xen/include/public/arch-x86/xen.h | 6 ++---- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a3868f9..c0ac5d6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -704,9 +704,12 @@ int arch_set_info_guest( /* PVH 32bitfixme */ ASSERT(!compat); - if ( c(ctrlreg[1]) || c(ldt_base) || c(ldt_ents) || + if ( c(ctrlreg[0]) || c(ctrlreg[1]) || c(ctrlreg[2]) || + c(ctrlreg[4]) || c(ctrlreg[5]) || c(ctrlreg[6]) || + c(ctrlreg[7]) || c(ldt_base) || c(ldt_ents) || c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || + c(kernel_ss) || c(kernel_sp) || c.nat->gs_base_kernel || c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) return -EINVAL; } @@ -745,13 +748,7 @@ int arch_set_info_guest( if ( has_hvm_container_vcpu(v) ) { - /* - * NB: TF_kernel_mode is set unconditionally for HVM guests, - * so we always use the gs_base_kernel here. If we change this - * function to imitate the PV functionality, we'll need to - * make it pay attention to the kernel bit. - */ - hvm_set_info_guest(v, compat ? 0 : c.nat->gs_base_kernel); + hvm_set_info_guest(v); if ( is_hvm_vcpu(v) || v->is_initialised ) goto out; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f0132a4..8d923e7 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1467,7 +1467,7 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) +static void vmx_set_info_guest(struct vcpu *v) { unsigned long intr_shadow; @@ -1492,10 +1492,6 @@ static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) __vmwrite(GUEST_INTERRUPTIBILITY_INFO, intr_shadow); } - /* PVH 32bitfixme */ - if ( is_pvh_vcpu(v) ) - __vmwrite(GUEST_GS_BASE, gs_base_kernel); - vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index a8ba06d..ccca5df 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -160,7 +160,7 @@ struct hvm_function_table { int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); void (*handle_cd)(struct vcpu *v, unsigned long value); - void (*set_info_guest)(struct vcpu *v, uint64_t gs_base_kernel); + void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); /* Nested HVM */ @@ -434,10 +434,10 @@ void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -static inline void hvm_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) +static inline void hvm_set_info_guest(struct vcpu *v) { if ( hvm_funcs.set_info_guest ) - return hvm_funcs.set_info_guest(v, gs_base_kernel); + return hvm_funcs.set_info_guest(v); } int hvm_debug_op(struct vcpu *v, int32_t op); diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 5d220ce..f35804b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -161,10 +161,8 @@ typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ * - For HVM guests, the structures read include: fpu_ctxt (if * VGCT_I387_VALID is set), flags, user_regs, debugreg[*] * - * - PVH guests are the same as HVM guests, but additionally set cr3, - * and for 64-bit guests, gs_base_kernel. Additionally, the following - * entries must be 0: ctrlreg[1], ldt_base, ldt_ents, user_regs.{cs, - * ss, es, ds, fs, gs), gdt_ents, fs_base, and gs_base_user. + * - PVH guests are the same as HVM guests, but additionally use ctrlreg[3] to + * set cr3. All other fields not used should be set to 0. */ struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0028733521706928619== 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 --===============0028733521706928619==-- From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V3-0000uZ-So; Mon, 25 Nov 2013 20:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V2-0000tv-Cc for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:16 +0000 Received: from [193.109.254.147:55898] by server-10.bemta-14.messagelabs.com id 11/9F-20752-3EEA3925; Mon, 25 Nov 2013 20:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1385410273!700324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10976 invoked from network); 25 Nov 2013 20:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Nov 2013 20:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2Uz-0006zh-KR for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2Uz-0008Go-BF for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:13 +0000 Date: Mon, 25 Nov 2013 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: clearly specify used parameters in vcpu_guest_context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0028733521706928619==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0028733521706928619== Content-Type: text/plain commit 0774c003adc4e23a68487eeb46ccd05d445559e8 Author: Roger Pau Monné AuthorDate: Mon Nov 25 11:17:03 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:17:03 2013 +0100 x86/pvh: clearly specify used parameters in vcpu_guest_context The aim of this patch is to define a stable way in which PVH is going to do AP bringup. Since we are running inside of a HVM container, PVH should only need to set flags, cr3 and user_regs in order to bring up a vCPU, the rest can be set once the vCPU is started using the bare metal methods. Signed-off-by: Roger Pau Monné Reviewed-off-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/domain.c | 13 +++++-------- xen/arch/x86/hvm/vmx/vmx.c | 6 +----- xen/include/asm-x86/hvm/hvm.h | 6 +++--- xen/include/public/arch-x86/xen.h | 6 ++---- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a3868f9..c0ac5d6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -704,9 +704,12 @@ int arch_set_info_guest( /* PVH 32bitfixme */ ASSERT(!compat); - if ( c(ctrlreg[1]) || c(ldt_base) || c(ldt_ents) || + if ( c(ctrlreg[0]) || c(ctrlreg[1]) || c(ctrlreg[2]) || + c(ctrlreg[4]) || c(ctrlreg[5]) || c(ctrlreg[6]) || + c(ctrlreg[7]) || c(ldt_base) || c(ldt_ents) || c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || + c(kernel_ss) || c(kernel_sp) || c.nat->gs_base_kernel || c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) return -EINVAL; } @@ -745,13 +748,7 @@ int arch_set_info_guest( if ( has_hvm_container_vcpu(v) ) { - /* - * NB: TF_kernel_mode is set unconditionally for HVM guests, - * so we always use the gs_base_kernel here. If we change this - * function to imitate the PV functionality, we'll need to - * make it pay attention to the kernel bit. - */ - hvm_set_info_guest(v, compat ? 0 : c.nat->gs_base_kernel); + hvm_set_info_guest(v); if ( is_hvm_vcpu(v) || v->is_initialised ) goto out; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f0132a4..8d923e7 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1467,7 +1467,7 @@ static int vmx_event_pending(struct vcpu *v) return intr_info & INTR_INFO_VALID_MASK; } -static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) +static void vmx_set_info_guest(struct vcpu *v) { unsigned long intr_shadow; @@ -1492,10 +1492,6 @@ static void vmx_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) __vmwrite(GUEST_INTERRUPTIBILITY_INFO, intr_shadow); } - /* PVH 32bitfixme */ - if ( is_pvh_vcpu(v) ) - __vmwrite(GUEST_GS_BASE, gs_base_kernel); - vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index a8ba06d..ccca5df 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -160,7 +160,7 @@ struct hvm_function_table { int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*invlpg_intercept)(unsigned long vaddr); void (*handle_cd)(struct vcpu *v, unsigned long value); - void (*set_info_guest)(struct vcpu *v, uint64_t gs_base_kernel); + void (*set_info_guest)(struct vcpu *v); void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); /* Nested HVM */ @@ -434,10 +434,10 @@ void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -static inline void hvm_set_info_guest(struct vcpu *v, uint64_t gs_base_kernel) +static inline void hvm_set_info_guest(struct vcpu *v) { if ( hvm_funcs.set_info_guest ) - return hvm_funcs.set_info_guest(v, gs_base_kernel); + return hvm_funcs.set_info_guest(v); } int hvm_debug_op(struct vcpu *v, int32_t op); diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 5d220ce..f35804b 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -161,10 +161,8 @@ typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ * - For HVM guests, the structures read include: fpu_ctxt (if * VGCT_I387_VALID is set), flags, user_regs, debugreg[*] * - * - PVH guests are the same as HVM guests, but additionally set cr3, - * and for 64-bit guests, gs_base_kernel. Additionally, the following - * entries must be 0: ctrlreg[1], ldt_base, ldt_ents, user_regs.{cs, - * ss, es, ds, fs, gs), gdt_ents, fs_base, and gs_base_user. + * - PVH guests are the same as HVM guests, but additionally use ctrlreg[3] to + * set cr3. All other fields not used should be set to 0. */ struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0028733521706928619== 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 --===============0028733521706928619==-- From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VE-000110-09; Mon, 25 Nov 2013 20:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VC-00010f-Gt for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:26 +0000 Received: from [193.109.254.147:56358] by server-2.bemta-14.messagelabs.com id 09/22-00361-DEEA3925; Mon, 25 Nov 2013 20:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385410284!699840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9585 invoked from network); 25 Nov 2013 20:11:24 -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; 25 Nov 2013 20:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V9-0006zt-RA for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2V9-0008HA-Ns for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:23 +0000 Date: Mon, 25 Nov 2013 20:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: fix nonlazy state 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 7d8b5dd98463524686bdee8b973b53c00c232122 Author: Liu Jinsong AuthorDate: Mon Nov 25 11:19:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:19:04 2013 +0100 x86/xsave: fix nonlazy state handling Nonlazy xstates should be xsaved each time when vcpu_save_fpu. Operation to nonlazy xstates will not trigger #NM exception, so whenever vcpu scheduled in it got restored and whenever scheduled out it should get saved. Currently this bug affects AMD LWP feature, and later Intel MPX feature. With the bugfix both LWP and MPX will work fine. Signed-off-by: Liu Jinsong Furthermore, during restore we also need to set nonlazy_xstate_used according to the incoming accumulated XCR0. Also adjust the changes to i387.c such that there won't be a pointless clts()/stts() pair. Signed-off-by: Jan Beulich --- xen/arch/x86/domctl.c | 2 ++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/i387.c | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f7e4586..8644218 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1146,6 +1146,8 @@ long arch_do_domctl( { v->arch.xcr0 = _xcr0; v->arch.xcr0_accum = _xcr0_accum; + if ( _xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t)); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b76f041..0094c62 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1119,6 +1119,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; + if ( ctxt->xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, &ctxt->save_area, desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 7649274..bd72138 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -133,11 +133,22 @@ static inline void fpu_frstor(struct vcpu *v) /*******************************/ /* FPU Save Functions */ /*******************************/ + +static inline uint64_t vcpu_xsave_mask(const struct vcpu *v) +{ + if ( v->fpu_dirtied ) + return v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY; + + return v->arch.nonlazy_xstate_used ? XSTATE_NONLAZY : 0; +} + /* Save x87 extended state */ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; + uint64_t mask = vcpu_xsave_mask(v); + ASSERT(mask); ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, @@ -145,7 +156,7 @@ static inline void fpu_xsave(struct vcpu *v) */ ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); - xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); + xsave(v, mask); ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -257,7 +268,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) */ void vcpu_save_fpu(struct vcpu *v) { - if ( !v->fpu_dirtied ) + if ( !v->fpu_dirtied && !v->arch.nonlazy_xstate_used ) return; ASSERT(!is_idle_vcpu(v)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VE-000110-09; Mon, 25 Nov 2013 20:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VC-00010f-Gt for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:26 +0000 Received: from [193.109.254.147:56358] by server-2.bemta-14.messagelabs.com id 09/22-00361-DEEA3925; Mon, 25 Nov 2013 20:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1385410284!699840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9585 invoked from network); 25 Nov 2013 20:11:24 -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; 25 Nov 2013 20:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2V9-0006zt-RA for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2V9-0008HA-Ns for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:23 +0000 Date: Mon, 25 Nov 2013 20:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsave: fix nonlazy state 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 7d8b5dd98463524686bdee8b973b53c00c232122 Author: Liu Jinsong AuthorDate: Mon Nov 25 11:19:04 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:19:04 2013 +0100 x86/xsave: fix nonlazy state handling Nonlazy xstates should be xsaved each time when vcpu_save_fpu. Operation to nonlazy xstates will not trigger #NM exception, so whenever vcpu scheduled in it got restored and whenever scheduled out it should get saved. Currently this bug affects AMD LWP feature, and later Intel MPX feature. With the bugfix both LWP and MPX will work fine. Signed-off-by: Liu Jinsong Furthermore, during restore we also need to set nonlazy_xstate_used according to the incoming accumulated XCR0. Also adjust the changes to i387.c such that there won't be a pointless clts()/stts() pair. Signed-off-by: Jan Beulich --- xen/arch/x86/domctl.c | 2 ++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/i387.c | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f7e4586..8644218 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1146,6 +1146,8 @@ long arch_do_domctl( { v->arch.xcr0 = _xcr0; v->arch.xcr0_accum = _xcr0_accum; + if ( _xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t)); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b76f041..0094c62 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1119,6 +1119,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; + if ( ctxt->xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, &ctxt->save_area, desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 7649274..bd72138 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -133,11 +133,22 @@ static inline void fpu_frstor(struct vcpu *v) /*******************************/ /* FPU Save Functions */ /*******************************/ + +static inline uint64_t vcpu_xsave_mask(const struct vcpu *v) +{ + if ( v->fpu_dirtied ) + return v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY; + + return v->arch.nonlazy_xstate_used ? XSTATE_NONLAZY : 0; +} + /* Save x87 extended state */ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; + uint64_t mask = vcpu_xsave_mask(v); + ASSERT(mask); ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, @@ -145,7 +156,7 @@ static inline void fpu_xsave(struct vcpu *v) */ ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); - xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); + xsave(v, mask); ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -257,7 +268,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) */ void vcpu_save_fpu(struct vcpu *v) { - if ( !v->fpu_dirtied ) + if ( !v->fpu_dirtied && !v->arch.nonlazy_xstate_used ) return; ASSERT(!is_idle_vcpu(v)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VO-00019F-5S; Mon, 25 Nov 2013 20:11:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VM-00017K-HN for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:36 +0000 Received: from [85.158.139.211:54438] by server-2.bemta-5.messagelabs.com id EE/3B-29392-7FEA3925; Mon, 25 Nov 2013 20:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385410294!205463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8753 invoked from network); 25 Nov 2013 20:11:35 -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; 25 Nov 2013 20:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VK-000701-0d for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2VJ-0008IJ-UN for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:33 +0000 Date: Mon, 25 Nov 2013 20:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: change epte_get_entry_emt() for pvh mem 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 e439e0b289e3590f84836e4f9bbdfa560c7af6ef Author: Mukesh Rathor AuthorDate: Mon Nov 25 11:20:06 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:20:06 2013 +0100 x86/pvh: change epte_get_entry_emt() for pvh mem types For pvh guests, epte_get_entry_emt() is incorrectly returning WB for all mem types because of the following check: if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) Skip the check for pvh guests. Also note, MTRR ranges are not maintained for pvh, and a solution is being contrived using PAT. Signed-off-by: Mukesh Rathor Reviewed-off-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4ff1e55..9937f5a 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -693,7 +693,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) return MTRR_TYPE_WRBACK; - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) + if ( !is_pvh_vcpu(v) && + !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) return MTRR_TYPE_WRBACK; if ( !mfn_valid(mfn_x(mfn)) ) @@ -717,7 +718,10 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = is_hvm_vcpu(v) ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; + hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 25 20:11:38 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Nov 2013 20:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VO-00019F-5S; Mon, 25 Nov 2013 20:11:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VM-00017K-HN for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:36 +0000 Received: from [85.158.139.211:54438] by server-2.bemta-5.messagelabs.com id EE/3B-29392-7FEA3925; Mon, 25 Nov 2013 20:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1385410294!205463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8753 invoked from network); 25 Nov 2013 20:11:35 -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; 25 Nov 2013 20:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vl2VK-000701-0d for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vl2VJ-0008IJ-UN for xen-changelog@lists.xensource.com; Mon, 25 Nov 2013 20:11:33 +0000 Date: Mon, 25 Nov 2013 20:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: change epte_get_entry_emt() for pvh mem 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 e439e0b289e3590f84836e4f9bbdfa560c7af6ef Author: Mukesh Rathor AuthorDate: Mon Nov 25 11:20:06 2013 +0100 Commit: Jan Beulich CommitDate: Mon Nov 25 11:20:06 2013 +0100 x86/pvh: change epte_get_entry_emt() for pvh mem types For pvh guests, epte_get_entry_emt() is incorrectly returning WB for all mem types because of the following check: if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) Skip the check for pvh guests. Also note, MTRR ranges are not maintained for pvh, and a solution is being contrived using PAT. Signed-off-by: Mukesh Rathor Reviewed-off-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4ff1e55..9937f5a 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -693,7 +693,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) return MTRR_TYPE_WRBACK; - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) + if ( !is_pvh_vcpu(v) && + !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) return MTRR_TYPE_WRBACK; if ( !mfn_valid(mfn_x(mfn)) ) @@ -717,7 +718,10 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = is_hvm_vcpu(v) ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; + hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 08:11:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08:11: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 1VlDjf-0007Hh-GA; Tue, 26 Nov 2013 08:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDje-0007Hc-24 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:06 +0000 Received: from [85.158.139.211:59704] by server-8.bemta-5.messagelabs.com id 45/67-29838-99754925; Tue, 26 Nov 2013 08:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385453463!285996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25005 invoked from network); 26 Nov 2013 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjb-0005gh-C3 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDja-0003MF-Vc for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:03 +0000 Date: Tue, 26 Nov 2013 08:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 616dfff3e37bbda0bcfa37991e19d522d7726744 Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:49:23 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa) (cherry picked from commit be68feb0e12a4538a33f5526ec1a09165aa18a45) --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(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 Tue Nov 26 08:11:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08:11: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 1VlDjf-0007Hh-GA; Tue, 26 Nov 2013 08:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDje-0007Hc-24 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:06 +0000 Received: from [85.158.139.211:59704] by server-8.bemta-5.messagelabs.com id 45/67-29838-99754925; Tue, 26 Nov 2013 08:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1385453463!285996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25005 invoked from network); 26 Nov 2013 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjb-0005gh-C3 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDja-0003MF-Vc for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:03 +0000 Date: Tue, 26 Nov 2013 08:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 616dfff3e37bbda0bcfa37991e19d522d7726744 Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:49:23 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa) (cherry picked from commit be68feb0e12a4538a33f5526ec1a09165aa18a45) --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(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 Tue Nov 26 08:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08: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 1VlDk1-0007J3-JI; Tue, 26 Nov 2013 08:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk0-0007Iu-1b for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:28 +0000 Received: from [85.158.137.68:52567] by server-11.bemta-3.messagelabs.com id 15/51-19379-FA754925; Tue, 26 Nov 2013 08:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1385453485!3786258!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16214 invoked from network); 26 Nov 2013 08:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 08:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjx-0005gq-0f for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDjw-0003NV-Nn for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:24 +0000 Date: Tue, 26 Nov 2013 08:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7de5167ad9847ffec548fc4e68a3b8934a3a61d1 Author: Ian Jackson AuthorDate: Mon Nov 25 13:53:27 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:27 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 815eed7..9264d78 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.3 -# Tue May 14 18:48:49 2013 +0100 -# piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. +QEMU_TAG ?= 7c51fb2971cd455eb728e716f16a488c01f8e759 +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 08:11:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08: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 1VlDk1-0007J3-JI; Tue, 26 Nov 2013 08:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk0-0007Iu-1b for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:28 +0000 Received: from [85.158.137.68:52567] by server-11.bemta-3.messagelabs.com id 15/51-19379-FA754925; Tue, 26 Nov 2013 08:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1385453485!3786258!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16214 invoked from network); 26 Nov 2013 08:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 08:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjx-0005gq-0f for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDjw-0003NV-Nn for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:24 +0000 Date: Tue, 26 Nov 2013 08:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7de5167ad9847ffec548fc4e68a3b8934a3a61d1 Author: Ian Jackson AuthorDate: Mon Nov 25 13:53:27 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:53:27 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 815eed7..9264d78 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.3 -# Tue May 14 18:48:49 2013 +0100 -# piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. +QEMU_TAG ?= 7c51fb2971cd455eb728e716f16a488c01f8e759 +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 08:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk4-0007Jp-M5; Tue, 26 Nov 2013 08:11:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk3-0007JW-5F for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:31 +0000 Received: from [85.158.143.35:31036] by server-2.bemta-4.messagelabs.com id 9E/5D-11386-2B754925; Tue, 26 Nov 2013 08:11:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385453488!1128082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 337 invoked from network); 26 Nov 2013 08:11:29 -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; 26 Nov 2013 08:11:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjm-0005gn-Kv for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDjm-0003Md-Hq for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:14 +0000 Date: Tue, 26 Nov 2013 08:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c8a417228ce5a9175047adafd2ae10100ca14f3 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:49:32 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell (cherry picked from commit f6d2a87f051456bddb7a47922c8cf60f37073063) (cherry picked from commit 841a5a5aca13255e7006e19eb880eaf6df143ac2) --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 08:11:32 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 08:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk4-0007Jp-M5; Tue, 26 Nov 2013 08:11:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDk3-0007JW-5F for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:31 +0000 Received: from [85.158.143.35:31036] by server-2.bemta-4.messagelabs.com id 9E/5D-11386-2B754925; Tue, 26 Nov 2013 08:11:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1385453488!1128082!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 337 invoked from network); 26 Nov 2013 08:11:29 -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; 26 Nov 2013 08:11:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlDjm-0005gn-Kv for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlDjm-0003Md-Hq for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 08:11:14 +0000 Date: Tue, 26 Nov 2013 08:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c8a417228ce5a9175047adafd2ae10100ca14f3 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:49:32 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell (cherry picked from commit f6d2a87f051456bddb7a47922c8cf60f37073063) (cherry picked from commit 841a5a5aca13255e7006e19eb880eaf6df143ac2) --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 17:11:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 17:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAE-0002vF-Ic; Tue, 26 Nov 2013 17:11:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAD-0002v0-EF for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:05 +0000 Received: from [85.158.137.68:42305] by server-17.bemta-3.messagelabs.com id 61/89-15965-826D4925; Tue, 26 Nov 2013 17:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1385485862!3950088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15809 invoked from network); 26 Nov 2013 17:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 17:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAA-0003aG-MA for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlMAA-00030e-G5 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:02 +0000 Date: Tue, 26 Nov 2013 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c20715a812b3e638923a9feb5f75495705c121ef Author: Ian Jackson AuthorDate: Mon Nov 25 13:54:03 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:54:03 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index baeaaac..42012c7 100644 --- a/Config.mk +++ b/Config.mk @@ -180,9 +180,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6.1 -# Tue May 14 18:48:49 2013 +0100 -# piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. +QEMU_TAG ?= 2d4fa397ba0fbae0c62282de619e1f088a320b33 +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Optional components XENSTAT_XENTOP ?= y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 26 17:11:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Nov 2013 17:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAE-0002vF-Ic; Tue, 26 Nov 2013 17:11:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAD-0002v0-EF for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:05 +0000 Received: from [85.158.137.68:42305] by server-17.bemta-3.messagelabs.com id 61/89-15965-826D4925; Tue, 26 Nov 2013 17:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1385485862!3950088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15809 invoked from network); 26 Nov 2013 17:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2013 17:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlMAA-0003aG-MA for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlMAA-00030e-G5 for xen-changelog@lists.xensource.com; Tue, 26 Nov 2013 17:11:02 +0000 Date: Tue, 26 Nov 2013 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c20715a812b3e638923a9feb5f75495705c121ef Author: Ian Jackson AuthorDate: Mon Nov 25 13:54:03 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:54:03 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index baeaaac..42012c7 100644 --- a/Config.mk +++ b/Config.mk @@ -180,9 +180,9 @@ endif # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.1.6.1 -# Tue May 14 18:48:49 2013 +0100 -# piix4acpi, xen, hotplug: Fix race with ACPI AML code and hotplug. +QEMU_TAG ?= 2d4fa397ba0fbae0c62282de619e1f088a320b33 +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Optional components XENSTAT_XENTOP ?= y -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44: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 1VlfPS-00024e-VC; Wed, 27 Nov 2013 13:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPR-00024O-Id for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:05 +0000 Received: from [85.158.137.68:21083] by server-7.bemta-3.messagelabs.com id B7/A4-27599-427F5925; Wed, 27 Nov 2013 13:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385559843!124531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12051 invoked from network); 27 Nov 2013 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Nov 2013 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPO-00087k-W1 for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPO-0005io-TC for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:02 +0000 Date: Wed, 27 Nov 2013 13:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be68feb0e12a4538a33f5526ec1a09165aa18a45 Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:17 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa) --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:09 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44: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 1VlfPS-00024e-VC; Wed, 27 Nov 2013 13:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPR-00024O-Id for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:05 +0000 Received: from [85.158.137.68:21083] by server-7.bemta-3.messagelabs.com id B7/A4-27599-427F5925; Wed, 27 Nov 2013 13:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1385559843!124531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12051 invoked from network); 27 Nov 2013 13:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 27 Nov 2013 13:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPO-00087k-W1 for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPO-0005io-TC for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:02 +0000 Date: Wed, 27 Nov 2013 13:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: save/restore errno in SIGCHLD handler X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be68feb0e12a4538a33f5526ec1a09165aa18a45 Author: Ian Jackson AuthorDate: Mon Nov 11 17:17:55 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:17 2013 +0000 libxl: save/restore errno in SIGCHLD handler Without this, code interrupted by SIGCHLD may experience strange values of errno. (As far as I know this is not the cause of any reported bugs.) This fix should be backported in due course. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 704d10289bcaee46a3ef6cdc7966186e3b8033fa) --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 044ddad..b6f0b2d 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -157,8 +157,10 @@ int libxl__carefd_fd(const libxl__carefd *cf) static void sigchld_handler(int signo) { + int esave = errno; int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); assert(!e); /* errors are probably EBADF, very bad */ + errno = esave; } static void sigchld_removehandler_core(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPd-00026D-1i; Wed, 27 Nov 2013 13:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPb-00025v-NG for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:15 +0000 Received: from [85.158.139.211:42481] by server-8.bemta-5.messagelabs.com id 57/9D-29838-E27F5925; Wed, 27 Nov 2013 13:44:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1385559853!625741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19819 invoked from network); 27 Nov 2013 13:44:14 -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 Nov 2013 13:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPZ-00087q-4r for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPZ-0005jD-2l for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:13 +0000 Date: Wed, 27 Nov 2013 13:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 841a5a5aca13255e7006e19eb880eaf6df143ac2 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:27 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell (cherry picked from commit f6d2a87f051456bddb7a47922c8cf60f37073063) --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPd-00026D-1i; Wed, 27 Nov 2013 13:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPb-00025v-NG for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:15 +0000 Received: from [85.158.139.211:42481] by server-8.bemta-5.messagelabs.com id 57/9D-29838-E27F5925; Wed, 27 Nov 2013 13:44:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1385559853!625741!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19819 invoked from network); 27 Nov 2013 13:44:14 -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 Nov 2013 13:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPZ-00087q-4r for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPZ-0005jD-2l for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:13 +0000 Date: Wed, 27 Nov 2013 13:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Do not generate short block in libxl__datacopier_prefixdata X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 841a5a5aca13255e7006e19eb880eaf6df143ac2 Author: Ian Jackson AuthorDate: Tue Sep 3 13:41:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:27 2013 +0000 libxl: Do not generate short block in libxl__datacopier_prefixdata libxl__datacopier_prefixdata would prepend a deliberately short block (not just a half-full one, but one with a short buffer) to the dc->bufs queue. However, this is wrong because datacopier_readable will find it and try to continue to fill it up. Instead, allocate a full-sized buffer. Signed-off-by: Ian Jackson Tested-by: Chunyan Liu Acked-by: Ian Campbell (cherry picked from commit f6d2a87f051456bddb7a47922c8cf60f37073063) --- tools/libxl/libxl_aoutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 983a60a..b4eb6e5 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, libxl__datacopier_state *dc, assert(len < dc->maxsz - dc->used); - buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len); + buf = libxl__zalloc(NOGC, sizeof(*buf)); buf->used = len; memcpy(buf->buf, data, len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPo-000282-4m; Wed, 27 Nov 2013 13:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPl-00027h-R0 for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:26 +0000 Received: from [193.109.254.147:22875] by server-4.bemta-14.messagelabs.com id 32/B8-03916-937F5925; Wed, 27 Nov 2013 13:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1385559863!1151786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11229 invoked from network); 27 Nov 2013 13:44:24 -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; 27 Nov 2013 13:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPj-00087w-Ay for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPj-0005jZ-8k for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:23 +0000 Date: Wed, 27 Nov 2013 13:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Avoid realloc(, 0) when libxl__xs_directory returns empty list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3663150563728792622==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3663150563728792622== Content-Type: text/plain commit 38e7e0d6a84765898f267ce2ecd1d2a18fdae18d Author: Ian Jackson AuthorDate: Thu Apr 18 16:27:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:34 2013 +0000 libxl: Avoid realloc(,0) when libxl__xs_directory returns empty list If the named path is a leaf node, libxl__xs_directory can succeed, returning non-null, but set *nb to 0. In three places in libxl this may result in a zero size argument being passed to malloc() or realloc(), which is not adviseable. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Acked-by: Ian Campbell (cherry picked from commit 48249a140379b6a66cd32438c344a57fa21e00ed) --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 826236f..23d7657 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1842,7 +1842,7 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); - if(dir) { + if (dir && ndirs) { vtpms = malloc(sizeof(*vtpms) * ndirs); libxl_device_vtpm* vtpm; libxl_device_vtpm* end = vtpms + ndirs; @@ -2341,7 +2341,7 @@ static int libxl__append_disk_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_disk *tmp; tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); if (tmp == NULL) @@ -3030,7 +3030,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_nic *tmp; tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n)); if (tmp == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============3663150563728792622== 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 --===============3663150563728792622==-- From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPo-000282-4m; Wed, 27 Nov 2013 13:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPl-00027h-R0 for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:26 +0000 Received: from [193.109.254.147:22875] by server-4.bemta-14.messagelabs.com id 32/B8-03916-937F5925; Wed, 27 Nov 2013 13:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1385559863!1151786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11229 invoked from network); 27 Nov 2013 13:44:24 -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; 27 Nov 2013 13:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPj-00087w-Ay for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPj-0005jZ-8k for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:23 +0000 Date: Wed, 27 Nov 2013 13:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Avoid realloc(, 0) when libxl__xs_directory returns empty list X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3663150563728792622==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3663150563728792622== Content-Type: text/plain commit 38e7e0d6a84765898f267ce2ecd1d2a18fdae18d Author: Ian Jackson AuthorDate: Thu Apr 18 16:27:46 2013 +0100 Commit: Ian Jackson CommitDate: Mon Nov 25 13:48:34 2013 +0000 libxl: Avoid realloc(,0) when libxl__xs_directory returns empty list If the named path is a leaf node, libxl__xs_directory can succeed, returning non-null, but set *nb to 0. In three places in libxl this may result in a zero size argument being passed to malloc() or realloc(), which is not adviseable. Signed-off-by: Ian Jackson Acked-by: Roger Pau Monné Acked-by: Ian Campbell (cherry picked from commit 48249a140379b6a66cd32438c344a57fa21e00ed) --- tools/libxl/libxl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 826236f..23d7657 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1842,7 +1842,7 @@ libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *n fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); - if(dir) { + if (dir && ndirs) { vtpms = malloc(sizeof(*vtpms) * ndirs); libxl_device_vtpm* vtpm; libxl_device_vtpm* end = vtpms + ndirs; @@ -2341,7 +2341,7 @@ static int libxl__append_disk_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_disk *tmp; tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); if (tmp == NULL) @@ -3030,7 +3030,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { + if (dir && n) { libxl_device_nic *tmp; tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n)); if (tmp == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============3663150563728792622== 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 --===============3663150563728792622==-- From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPx-00029r-7o; Wed, 27 Nov 2013 13:44:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPw-00029V-3l for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:36 +0000 Received: from [193.109.254.147:51393] by server-4.bemta-14.messagelabs.com id FC/E8-03916-347F5925; Wed, 27 Nov 2013 13:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385559873!1177737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1940 invoked from network); 27 Nov 2013 13:44:34 -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 Nov 2013 13:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPt-000884-Fn for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPt-0005jz-DT for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:33 +0000 Date: Wed, 27 Nov 2013 13:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb02c822c624ab12823b64523d8aca8663f93baa Author: Ian Jackson AuthorDate: Mon Nov 25 13:52:51 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:52:51 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index e4f3424..b7a05cf 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.1 -# Thu Jul 25 08:11:55 2013 +0000 -# passthrough: Correctly expose PCH ISA bridge for IGD passthrough +QEMU_TAG ?= 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 27 13:44:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Nov 2013 13:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPx-00029r-7o; Wed, 27 Nov 2013 13:44:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPw-00029V-3l for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:36 +0000 Received: from [193.109.254.147:51393] by server-4.bemta-14.messagelabs.com id FC/E8-03916-347F5925; Wed, 27 Nov 2013 13:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1385559873!1177737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1940 invoked from network); 27 Nov 2013 13:44:34 -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 Nov 2013 13:44:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlfPt-000884-Fn for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlfPt-0005jz-DT for xen-changelog@lists.xensource.com; Wed, 27 Nov 2013 13:44:33 +0000 Date: Wed, 27 Nov 2013 13:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb02c822c624ab12823b64523d8aca8663f93baa Author: Ian Jackson AuthorDate: Mon Nov 25 13:52:51 2013 +0000 Commit: Ian Jackson CommitDate: Mon Nov 25 13:52:51 2013 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index e4f3424..b7a05cf 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.1 -# Thu Jul 25 08:11:55 2013 +0000 -# passthrough: Correctly expose PCH ISA bridge for IGD passthrough +QEMU_TAG ?= 147f83f9b7d87a698c200c4f3eb2d36a0e4fe54b +# Mon Nov 11 13:42:56 2013 -0500 +# hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work. # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 28 03:22:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22: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 1VlsB6-0003h7-4I; Thu, 28 Nov 2013 03: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 1VlsB4-0003h0-4d for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:06 +0000 Received: from [85.158.143.35:51551] by server-1.bemta-4.messagelabs.com id 47/A1-02132-DD6B6925; Thu, 28 Nov 2013 03:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385608923!1671847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19330 invoked from network); 28 Nov 2013 03:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 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 1VlsB1-0007ra-F4 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsB1-0003Zb-BA for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:03 +0000 Date: Thu, 28 Nov 2013 03:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9229cff72fd9490c103ebf644e432bb6c4fb69c5 Author: Jan Beulich AuthorDate: Wed Nov 27 09:44:02 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:44:02 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e75918a..9d67c2e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -329,6 +329,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by the + * time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); ret = i = 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 Thu Nov 28 03:22:10 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22: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 1VlsB6-0003h7-4I; Thu, 28 Nov 2013 03: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 1VlsB4-0003h0-4d for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:06 +0000 Received: from [85.158.143.35:51551] by server-1.bemta-4.messagelabs.com id 47/A1-02132-DD6B6925; Thu, 28 Nov 2013 03:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385608923!1671847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19330 invoked from network); 28 Nov 2013 03:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 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 1VlsB1-0007ra-F4 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsB1-0003Zb-BA for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:03 +0000 Date: Thu, 28 Nov 2013 03:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9229cff72fd9490c103ebf644e432bb6c4fb69c5 Author: Jan Beulich AuthorDate: Wed Nov 27 09:44:02 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:44:02 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e75918a..9d67c2e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -329,6 +329,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by the + * time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); ret = i = 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 Thu Nov 28 03:22:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBH-0003iF-72; Thu, 28 Nov 2013 03:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBF-0003i2-AO for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:17 +0000 Received: from [193.109.254.147:33929] by server-5.bemta-14.messagelabs.com id B3/DB-03510-8E6B6925; Thu, 28 Nov 2013 03:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608934!1312857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25951 invoked from network); 28 Nov 2013 03:22: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; 28 Nov 2013 03:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBB-0007rj-QZ for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBB-0003a6-LX for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:13 +0000 Date: Thu, 28 Nov 2013 03:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: only allow ring 0 guest code to make 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 82b79aceed17a3ca45e2b87b4c95965ba19f803e Author: Jan Beulich AuthorDate: Wed Nov 27 09:45:16 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:45:16 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 f066353..6dd4067 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3343,7 +3343,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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 Nov 28 03:22:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBH-0003iF-72; Thu, 28 Nov 2013 03:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBF-0003i2-AO for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:17 +0000 Received: from [193.109.254.147:33929] by server-5.bemta-14.messagelabs.com id B3/DB-03510-8E6B6925; Thu, 28 Nov 2013 03:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608934!1312857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25951 invoked from network); 28 Nov 2013 03:22: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; 28 Nov 2013 03:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBB-0007rj-QZ for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBB-0003a6-LX for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:13 +0000 Date: Thu, 28 Nov 2013 03:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: only allow ring 0 guest code to make 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 82b79aceed17a3ca45e2b87b4c95965ba19f803e Author: Jan Beulich AuthorDate: Wed Nov 27 09:45:16 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:45:16 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 f066353..6dd4067 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3343,7 +3343,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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 Nov 28 03:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03: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 1VlsBQ-0003jP-A6; Thu, 28 Nov 2013 03: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 1VlsBO-0003jA-Vv for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:27 +0000 Received: from [85.158.143.35:17911] by server-1.bemta-4.messagelabs.com id 60/D1-02132-2F6B6925; Thu, 28 Nov 2013 03:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1385608944!1622465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6151 invoked from network); 28 Nov 2013 03:22: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; 28 Nov 2013 03:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBM-0007rp-1y for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBL-0003au-UU for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:24 +0000 Date: Thu, 28 Nov 2013 03:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] credit: Update other parameters when setting tslice_ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1614ad289fc5237c6360c5cae3b67b15f50c6d Author: Nate Studer AuthorDate: Wed Nov 27 09:57:59 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:57:59 2013 +0100 credit: Update other parameters when setting tslice_ms Add a utility function to update the rest of the timeslice accounting fields when updating the timeslice of the credit scheduler, so that capped CPUs behave correctly. Before this patch changing the timeslice to a value higher than the default would result in a domain not utilizing its full capacity and changing the timeslice to a value lower than the default would result in a domain exceeding its capacity. Signed-off-by: Nate Studer Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap master commit: 1320b8100c2ed390fc640557a050f5c700d8338d master date: 2013-11-15 17:38:10 +0100 --- xen/common/sched_credit.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 98f5296..6328873 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1073,6 +1073,17 @@ csched_dom_cntl( return 0; } +static inline void +__csched_set_tslice(struct csched_private *prv, unsigned timeslice) +{ + prv->tslice_ms = timeslice; + prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; + if ( prv->tslice_ms < prv->ticks_per_tslice ) + prv->ticks_per_tslice = 1; + prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; + prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; +} + static int csched_sys_cntl(const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) @@ -1091,7 +1102,7 @@ csched_sys_cntl(const struct scheduler *ops, || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN)) || MICROSECS(params->ratelimit_us) > MILLISECS(params->tslice_ms) ) goto out; - prv->tslice_ms = params->tslice_ms; + __csched_set_tslice(prv, params->tslice_ms); prv->ratelimit_us = params->ratelimit_us; /* FALLTHRU */ case XEN_SYSCTL_SCHEDOP_getinfo: @@ -1903,12 +1914,7 @@ csched_init(struct scheduler *ops) sched_credit_tslice_ms = CSCHED_DEFAULT_TSLICE_MS; } - prv->tslice_ms = sched_credit_tslice_ms; - prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; - if ( prv->tslice_ms < prv->ticks_per_tslice ) - prv->ticks_per_tslice = 1; - prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; - prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; + __csched_set_tslice(prv, sched_credit_tslice_ms); if ( MICROSECS(sched_ratelimit_us) > MILLISECS(sched_credit_tslice_ms) ) { -- 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 Nov 28 03:22:28 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03: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 1VlsBQ-0003jP-A6; Thu, 28 Nov 2013 03: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 1VlsBO-0003jA-Vv for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:27 +0000 Received: from [85.158.143.35:17911] by server-1.bemta-4.messagelabs.com id 60/D1-02132-2F6B6925; Thu, 28 Nov 2013 03:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1385608944!1622465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6151 invoked from network); 28 Nov 2013 03:22: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; 28 Nov 2013 03:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBM-0007rp-1y for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBL-0003au-UU for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:24 +0000 Date: Thu, 28 Nov 2013 03:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] credit: Update other parameters when setting tslice_ms X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c1614ad289fc5237c6360c5cae3b67b15f50c6d Author: Nate Studer AuthorDate: Wed Nov 27 09:57:59 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:57:59 2013 +0100 credit: Update other parameters when setting tslice_ms Add a utility function to update the rest of the timeslice accounting fields when updating the timeslice of the credit scheduler, so that capped CPUs behave correctly. Before this patch changing the timeslice to a value higher than the default would result in a domain not utilizing its full capacity and changing the timeslice to a value lower than the default would result in a domain exceeding its capacity. Signed-off-by: Nate Studer Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap master commit: 1320b8100c2ed390fc640557a050f5c700d8338d master date: 2013-11-15 17:38:10 +0100 --- xen/common/sched_credit.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 98f5296..6328873 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1073,6 +1073,17 @@ csched_dom_cntl( return 0; } +static inline void +__csched_set_tslice(struct csched_private *prv, unsigned timeslice) +{ + prv->tslice_ms = timeslice; + prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; + if ( prv->tslice_ms < prv->ticks_per_tslice ) + prv->ticks_per_tslice = 1; + prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; + prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; +} + static int csched_sys_cntl(const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) @@ -1091,7 +1102,7 @@ csched_sys_cntl(const struct scheduler *ops, || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN)) || MICROSECS(params->ratelimit_us) > MILLISECS(params->tslice_ms) ) goto out; - prv->tslice_ms = params->tslice_ms; + __csched_set_tslice(prv, params->tslice_ms); prv->ratelimit_us = params->ratelimit_us; /* FALLTHRU */ case XEN_SYSCTL_SCHEDOP_getinfo: @@ -1903,12 +1914,7 @@ csched_init(struct scheduler *ops) sched_credit_tslice_ms = CSCHED_DEFAULT_TSLICE_MS; } - prv->tslice_ms = sched_credit_tslice_ms; - prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; - if ( prv->tslice_ms < prv->ticks_per_tslice ) - prv->ticks_per_tslice = 1; - prv->tick_period_us = prv->tslice_ms * 1000 / prv->ticks_per_tslice; - prv->credits_per_tslice = CSCHED_CREDITS_PER_MSEC * prv->tslice_ms; + __csched_set_tslice(prv, sched_credit_tslice_ms); if ( MICROSECS(sched_ratelimit_us) > MILLISECS(sched_credit_tslice_ms) ) { -- 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 Nov 28 03:22:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22: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 1VlsBZ-0003kb-Cx; Thu, 28 Nov 2013 03:22:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBY-0003kT-VC for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:37 +0000 Received: from [85.158.139.211:49745] by server-3.bemta-5.messagelabs.com id 4D/FF-05884-CF6B6925; Thu, 28 Nov 2013 03:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385608954!780573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12057 invoked from network); 28 Nov 2013 03:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBW-0007rx-7S for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBW-0003bm-5N for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:34 +0000 Date: Thu, 28 Nov 2013 03:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix leaking of v->cpu_affinity_saved on domain destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1a609d6721c42b165f6c654c82ebc3dadc38cd9 Author: Dario Faggioli AuthorDate: Wed Nov 27 09:59:19 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:59:19 2013 +0100 fix leaking of v->cpu_affinity_saved on domain destruction Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Jackson Reviewed-by: Jan Beulich master commit: 6757efe1bf50ac7ff68fa4dd7d9333529f70ae9a master date: 2013-11-15 17:43:28 +0100 --- xen/common/domain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 99c1290..2612949 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -726,6 +726,7 @@ static void complete_domain_destroy(struct rcu_head *head) { free_cpumask_var(v->cpu_affinity); free_cpumask_var(v->cpu_affinity_tmp); + free_cpumask_var(v->cpu_affinity_saved); free_cpumask_var(v->vcpu_dirty_cpumask); free_vcpu_struct(v); } -- 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 Nov 28 03:22:37 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22: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 1VlsBZ-0003kb-Cx; Thu, 28 Nov 2013 03:22:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBY-0003kT-VC for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:37 +0000 Received: from [85.158.139.211:49745] by server-3.bemta-5.messagelabs.com id 4D/FF-05884-CF6B6925; Thu, 28 Nov 2013 03:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1385608954!780573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12057 invoked from network); 28 Nov 2013 03:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBW-0007rx-7S for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBW-0003bm-5N for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:34 +0000 Date: Thu, 28 Nov 2013 03:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix leaking of v->cpu_affinity_saved on domain destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1a609d6721c42b165f6c654c82ebc3dadc38cd9 Author: Dario Faggioli AuthorDate: Wed Nov 27 09:59:19 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:59:19 2013 +0100 fix leaking of v->cpu_affinity_saved on domain destruction Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap Acked-by: Ian Jackson Reviewed-by: Jan Beulich master commit: 6757efe1bf50ac7ff68fa4dd7d9333529f70ae9a master date: 2013-11-15 17:43:28 +0100 --- xen/common/domain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 99c1290..2612949 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -726,6 +726,7 @@ static void complete_domain_destroy(struct rcu_head *head) { free_cpumask_var(v->cpu_affinity); free_cpumask_var(v->cpu_affinity_tmp); + free_cpumask_var(v->cpu_affinity_saved); free_cpumask_var(v->vcpu_dirty_cpumask); free_vcpu_struct(v); } -- 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 Nov 28 03:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03: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 1VlsBk-0003mn-Ie; Thu, 28 Nov 2013 03:22:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBj-0003mV-8i for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:47 +0000 Received: from [193.109.254.147:31483] by server-16.bemta-14.messagelabs.com id 98/A7-20600-607B6925; Thu, 28 Nov 2013 03:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608964!1312909!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27487 invoked from network); 28 Nov 2013 03:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBg-0007s3-EQ for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBg-0003cW-CV for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:44 +0000 Date: Thu, 28 Nov 2013 03:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested VMX: don't ignore mapping 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 2fa689a16fc91598fc81468c47557abf597bf256 Author: Jan Beulich AuthorDate: Wed Nov 27 10:00:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:00:08 2013 +0100 nested VMX: don't ignore mapping errors Rather than ignoring failures to map the virtual VMCS as well as MSR or I/O port bitmaps, convert those into failures of the respective instructions (avoiding to dereference NULL pointers). Ultimately such failures should be handled transparently (by using transient mappings when they actually need to be accessed, just like nested SVM does). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Eddie Dong master commit: e02b14e531a95399fc9d8647ec3cc6f310a7d455 master date: 2013-11-18 09:39:01 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 041c9f6..5c92ac6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -746,7 +746,7 @@ static void __clear_current_vvmcs(struct vcpu *v) __vmpclear(virt_to_maddr(nvcpu->nv_n2vmcx)); } -static void __map_msr_bitmap(struct vcpu *v) +static bool_t __must_check _map_msr_bitmap(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -755,9 +755,11 @@ static void __map_msr_bitmap(struct vcpu *v) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->msrbitmap != NULL; } -static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) +static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -768,12 +770,14 @@ static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->iobitmap[index] != NULL; } -static inline void map_io_bitmap_all(struct vcpu *v) +static inline bool_t __must_check map_io_bitmap_all(struct vcpu *v) { - __map_io_bitmap (v, IO_BITMAP_A); - __map_io_bitmap (v, IO_BITMAP_B); + return _map_io_bitmap(v, IO_BITMAP_A) && + _map_io_bitmap(v, IO_BITMAP_B); } static void nvmx_purge_vvmcs(struct vcpu *v) @@ -1609,9 +1613,15 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - nvcpu->nv_vvmcxaddr = gpa; - map_io_bitmap_all (v); - __map_msr_bitmap(v); + if ( nvcpu->nv_vvmcx ) + nvcpu->nv_vvmcxaddr = gpa; + if ( !nvcpu->nv_vvmcx || + !map_io_bitmap_all(v) || + !_map_msr_bitmap(v) ) + { + vmreturn(regs, VMFAIL_VALID); + goto out; + } } if ( cpu_has_vmx_vmcs_shadowing ) @@ -1723,6 +1733,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; + bool_t okay = 1; if ( decode_vmx_inst(regs, &decode, &operand, 0) != X86EMUL_OKAY ) @@ -1731,16 +1742,21 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) vmcs_encoding = reg_read(regs, decode.reg2); __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); - if ( vmcs_encoding == IO_BITMAP_A || vmcs_encoding == IO_BITMAP_A_HIGH ) - __map_io_bitmap (v, IO_BITMAP_A); - else if ( vmcs_encoding == IO_BITMAP_B || - vmcs_encoding == IO_BITMAP_B_HIGH ) - __map_io_bitmap (v, IO_BITMAP_B); + switch ( vmcs_encoding ) + { + case IO_BITMAP_A: case IO_BITMAP_A_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_A); + break; + case IO_BITMAP_B: case IO_BITMAP_B_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_B); + break; + case MSR_BITMAP: case MSR_BITMAP_HIGH: + okay = _map_msr_bitmap(v); + break; + } - if ( vmcs_encoding == MSR_BITMAP || vmcs_encoding == MSR_BITMAP_HIGH ) - __map_msr_bitmap(v); + vmreturn(regs, okay ? VMSUCCEED : VMFAIL_VALID); - vmreturn(regs, VMSUCCEED); return X86EMUL_OKAY; } -- 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 Nov 28 03:22:48 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03: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 1VlsBk-0003mn-Ie; Thu, 28 Nov 2013 03:22:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBj-0003mV-8i for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:47 +0000 Received: from [193.109.254.147:31483] by server-16.bemta-14.messagelabs.com id 98/A7-20600-607B6925; Thu, 28 Nov 2013 03:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608964!1312909!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27487 invoked from network); 28 Nov 2013 03:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBg-0007s3-EQ for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBg-0003cW-CV for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:44 +0000 Date: Thu, 28 Nov 2013 03:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested VMX: don't ignore mapping 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 2fa689a16fc91598fc81468c47557abf597bf256 Author: Jan Beulich AuthorDate: Wed Nov 27 10:00:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:00:08 2013 +0100 nested VMX: don't ignore mapping errors Rather than ignoring failures to map the virtual VMCS as well as MSR or I/O port bitmaps, convert those into failures of the respective instructions (avoiding to dereference NULL pointers). Ultimately such failures should be handled transparently (by using transient mappings when they actually need to be accessed, just like nested SVM does). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Eddie Dong master commit: e02b14e531a95399fc9d8647ec3cc6f310a7d455 master date: 2013-11-18 09:39:01 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 041c9f6..5c92ac6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -746,7 +746,7 @@ static void __clear_current_vvmcs(struct vcpu *v) __vmpclear(virt_to_maddr(nvcpu->nv_n2vmcx)); } -static void __map_msr_bitmap(struct vcpu *v) +static bool_t __must_check _map_msr_bitmap(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -755,9 +755,11 @@ static void __map_msr_bitmap(struct vcpu *v) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->msrbitmap != NULL; } -static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) +static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); unsigned long gpa; @@ -768,12 +770,14 @@ static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); + + return nvmx->iobitmap[index] != NULL; } -static inline void map_io_bitmap_all(struct vcpu *v) +static inline bool_t __must_check map_io_bitmap_all(struct vcpu *v) { - __map_io_bitmap (v, IO_BITMAP_A); - __map_io_bitmap (v, IO_BITMAP_B); + return _map_io_bitmap(v, IO_BITMAP_A) && + _map_io_bitmap(v, IO_BITMAP_B); } static void nvmx_purge_vvmcs(struct vcpu *v) @@ -1609,9 +1613,15 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - nvcpu->nv_vvmcxaddr = gpa; - map_io_bitmap_all (v); - __map_msr_bitmap(v); + if ( nvcpu->nv_vvmcx ) + nvcpu->nv_vvmcxaddr = gpa; + if ( !nvcpu->nv_vvmcx || + !map_io_bitmap_all(v) || + !_map_msr_bitmap(v) ) + { + vmreturn(regs, VMFAIL_VALID); + goto out; + } } if ( cpu_has_vmx_vmcs_shadowing ) @@ -1723,6 +1733,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; + bool_t okay = 1; if ( decode_vmx_inst(regs, &decode, &operand, 0) != X86EMUL_OKAY ) @@ -1731,16 +1742,21 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) vmcs_encoding = reg_read(regs, decode.reg2); __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); - if ( vmcs_encoding == IO_BITMAP_A || vmcs_encoding == IO_BITMAP_A_HIGH ) - __map_io_bitmap (v, IO_BITMAP_A); - else if ( vmcs_encoding == IO_BITMAP_B || - vmcs_encoding == IO_BITMAP_B_HIGH ) - __map_io_bitmap (v, IO_BITMAP_B); + switch ( vmcs_encoding ) + { + case IO_BITMAP_A: case IO_BITMAP_A_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_A); + break; + case IO_BITMAP_B: case IO_BITMAP_B_HIGH: + okay = _map_io_bitmap(v, IO_BITMAP_B); + break; + case MSR_BITMAP: case MSR_BITMAP_HIGH: + okay = _map_msr_bitmap(v); + break; + } - if ( vmcs_encoding == MSR_BITMAP || vmcs_encoding == MSR_BITMAP_HIGH ) - __map_msr_bitmap(v); + vmreturn(regs, okay ? VMSUCCEED : VMFAIL_VALID); - vmreturn(regs, VMSUCCEED); return X86EMUL_OKAY; } -- 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 Nov 28 03:22:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBu-0003oi-LS; Thu, 28 Nov 2013 03:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBt-0003oM-6I for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:57 +0000 Received: from [193.109.254.147:34977] by server-8.bemta-14.messagelabs.com id 99/9A-30921-017B6925; Thu, 28 Nov 2013 03:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608974!1312926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28468 invoked from network); 28 Nov 2013 03:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBq-0007sC-Jx for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBq-0003dW-Hz for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:54 +0000 Date: Thu, 28 Nov 2013 03:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: consider modules when cutting off 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 f510b0deebebf74b3abff82b562f682ab9f8434e Author: Jan Beulich AuthorDate: Wed Nov 27 10:00:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:00:51 2013 +0100 x86: consider modules when cutting off memory The code in question runs after module ranges got already removed from the E820 table, so when determining the new maximum page/PDX we need to explicitly take them into account. Furthermore we need to round up the ending addresses here, in order to fully cover eventual partial trailing pages. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: a5db2c7aab7a638d84f22ac8fe5089d81175438b master date: 2013-11-18 13:57:20 +0100 --- xen/arch/x86/setup.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index cd524e3..47aeed3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1012,9 +1012,17 @@ void __init __start_xen(unsigned long mbi_p) ASSERT(j); } map_e = boot_e820.map[j].addr + boot_e820.map[j].size; - if ( (map_e >> PAGE_SHIFT) < max_page ) + for ( j = 0; j < mbi->mods_count; ++j ) { - max_page = map_e >> PAGE_SHIFT; + uint64_t end = pfn_to_paddr(mod[j].mod_start) + + mod[j].mod_end; + + if ( map_e < end ) + map_e = end; + } + if ( PFN_UP(map_e) < max_page ) + { + max_page = PFN_UP(map_e); max_pdx = pfn_to_pdx(max_page - 1) + 1; } printk(XENLOG_WARNING "Ignoring inaccessible memory range" -- 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 Nov 28 03:22:58 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBu-0003oi-LS; Thu, 28 Nov 2013 03:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBt-0003oM-6I for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:57 +0000 Received: from [193.109.254.147:34977] by server-8.bemta-14.messagelabs.com id 99/9A-30921-017B6925; Thu, 28 Nov 2013 03:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1385608974!1312926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28468 invoked from network); 28 Nov 2013 03:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsBq-0007sC-Jx for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsBq-0003dW-Hz for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:22:54 +0000 Date: Thu, 28 Nov 2013 03:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: consider modules when cutting off 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 f510b0deebebf74b3abff82b562f682ab9f8434e Author: Jan Beulich AuthorDate: Wed Nov 27 10:00:51 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:00:51 2013 +0100 x86: consider modules when cutting off memory The code in question runs after module ranges got already removed from the E820 table, so when determining the new maximum page/PDX we need to explicitly take them into account. Furthermore we need to round up the ending addresses here, in order to fully cover eventual partial trailing pages. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: a5db2c7aab7a638d84f22ac8fe5089d81175438b master date: 2013-11-18 13:57:20 +0100 --- xen/arch/x86/setup.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index cd524e3..47aeed3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1012,9 +1012,17 @@ void __init __start_xen(unsigned long mbi_p) ASSERT(j); } map_e = boot_e820.map[j].addr + boot_e820.map[j].size; - if ( (map_e >> PAGE_SHIFT) < max_page ) + for ( j = 0; j < mbi->mods_count; ++j ) { - max_page = map_e >> PAGE_SHIFT; + uint64_t end = pfn_to_paddr(mod[j].mod_start) + + mod[j].mod_end; + + if ( map_e < end ) + map_e = end; + } + if ( PFN_UP(map_e) < max_page ) + { + max_page = PFN_UP(map_e); max_pdx = pfn_to_pdx(max_page - 1) + 1; } printk(XENLOG_WARNING "Ignoring inaccessible memory range" -- 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 Nov 28 03:23:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23: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 1VlsC4-0003qZ-Of; Thu, 28 Nov 2013 03:23:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsC3-0003qH-9y for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:07 +0000 Received: from [193.109.254.147:32762] by server-15.bemta-14.messagelabs.com id C6/6B-22186-A17B6925; Thu, 28 Nov 2013 03:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385608984!1315971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16635 invoked from network); 28 Nov 2013 03:23:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsC0-0007sp-Pb for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsC0-0003e6-Nc for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:04 +0000 Date: Thu, 28 Nov 2013 03:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: reset TSC to 0 after domain resume from S3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb951fd3ba847b2c6acf6f3728a654981950388c Author: Tomasz Wroblewski AuthorDate: Wed Nov 27 10:01:33 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:01:33 2013 +0100 x86/hvm: reset TSC to 0 after domain resume from S3 Host S3 implicitly resets the host TSC to 0, but the tsc offset for hvm domains is not recalculated when they resume, causing it to go into negative values. In Linux guest using tsc clocksource, this results in a hang after wrap back to positive values since the tsc clocksource implementation expects it reset. Signed-off-by: Tomasz Wroblewski master commit: e95dc6ba69daef6468b3ae5912710727244d6e2f master date: 2013-11-22 14:47:24 +0100 --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6dd4067..e54045f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3607,7 +3607,13 @@ static void hvm_s3_suspend(struct domain *d) static void hvm_s3_resume(struct domain *d) { if ( test_and_clear_bool(d->arch.hvm_domain.is_s3_suspended) ) + { + struct vcpu *v; + + for_each_vcpu( d, v ) + hvm_set_guest_tsc(v, 0); domain_unpause(d); + } } static int hvmop_set_isa_irq_level( -- 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 Nov 28 03:23:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23: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 1VlsC4-0003qZ-Of; Thu, 28 Nov 2013 03:23:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsC3-0003qH-9y for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:07 +0000 Received: from [193.109.254.147:32762] by server-15.bemta-14.messagelabs.com id C6/6B-22186-A17B6925; Thu, 28 Nov 2013 03:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1385608984!1315971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16635 invoked from network); 28 Nov 2013 03:23:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsC0-0007sp-Pb for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsC0-0003e6-Nc for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:04 +0000 Date: Thu, 28 Nov 2013 03:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/hvm: reset TSC to 0 after domain resume from S3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb951fd3ba847b2c6acf6f3728a654981950388c Author: Tomasz Wroblewski AuthorDate: Wed Nov 27 10:01:33 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:01:33 2013 +0100 x86/hvm: reset TSC to 0 after domain resume from S3 Host S3 implicitly resets the host TSC to 0, but the tsc offset for hvm domains is not recalculated when they resume, causing it to go into negative values. In Linux guest using tsc clocksource, this results in a hang after wrap back to positive values since the tsc clocksource implementation expects it reset. Signed-off-by: Tomasz Wroblewski master commit: e95dc6ba69daef6468b3ae5912710727244d6e2f master date: 2013-11-22 14:47:24 +0100 --- xen/arch/x86/hvm/hvm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6dd4067..e54045f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3607,7 +3607,13 @@ static void hvm_s3_suspend(struct domain *d) static void hvm_s3_resume(struct domain *d) { if ( test_and_clear_bool(d->arch.hvm_domain.is_s3_suspended) ) + { + struct vcpu *v; + + for_each_vcpu( d, v ) + hvm_set_guest_tsc(v, 0); domain_unpause(d); + } } static int hvmop_set_isa_irq_level( -- 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 Nov 28 03:23:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCE-0003sK-Rc; Thu, 28 Nov 2013 03:23:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCD-0003s5-I6 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:17 +0000 Received: from [193.109.254.147:36204] by server-2.bemta-14.messagelabs.com id 8E/30-00361-427B6925; Thu, 28 Nov 2013 03:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385608995!1300006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10036 invoked from network); 28 Nov 2013 03:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCA-0007sv-Ut for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsCA-0003eX-Sq for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:14 +0000 Date: Thu, 28 Nov 2013 03:23:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/crash: disable the watchdog NMIs on the crashing cpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 094900d20337861a1293f9add391c248889b746a Author: David Vrabel AuthorDate: Wed Nov 27 10:02:17 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:02:17 2013 +0100 x86/crash: disable the watchdog NMIs on the crashing cpu nmi_shootdown_cpus() is called during a crash to park all the other CPUs. This changes the NMI trap handlers which means there's no point in having the watchdog still running. This also disables the watchdog before executing any crash kexec image and prevents the image from receiving unexpected NMIs. Signed-off-by: David Vrabel PVOps Linux as a kexec image shoots itself in the foot otherwise. On a Core2 system, Linux declares a firmware bug and tries to invert some bits in the performance counter register. It ends up setting the number of retired instructions to generate another NMI to fewer instructions than the NMI interrupt path itself, and ceases to make any useful progress. The call to disable_lapic_nmi_watchdog() must be this late into the kexec path to be sure that this cpu is the one which will execute the kexec image. Otherwise there are race conditions where the NMIs might be disabled on the wrong cpu, resulting in the kexec image still receiving NMIs. Signed-off-by: Andrew Cooper master commit: 2a16fcd5ba0244fef764886211452acc69c0ed00 master date: 2013-11-22 14:48:12 +0100 --- xen/arch/x86/crash.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/include/asm-x86/apic.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 0a807d1..b692e91 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -117,6 +117,7 @@ static void nmi_shootdown_cpus(void) unsigned long msecs; int i, cpu = smp_processor_id(); + disable_lapic_nmi_watchdog(); local_irq_disable(); crashing_cpu = cpu; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c93812f..861a014 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -165,7 +165,7 @@ static void nmi_timer_fn(void *unused) set_timer(&this_cpu(nmi_timer), NOW() + MILLISECS(1000)); } -static void disable_lapic_nmi_watchdog(void) +void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index dd528fb..43b39ce 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -200,6 +200,7 @@ extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); extern void setup_secondary_APIC_clock (void); extern void setup_apic_nmi_watchdog (void); +extern void disable_lapic_nmi_watchdog(void); extern int reserve_lapic_nmi(void); extern void release_lapic_nmi(void); extern void self_nmi(void); -- 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 Nov 28 03:23:19 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCE-0003sK-Rc; Thu, 28 Nov 2013 03:23:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCD-0003s5-I6 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:17 +0000 Received: from [193.109.254.147:36204] by server-2.bemta-14.messagelabs.com id 8E/30-00361-427B6925; Thu, 28 Nov 2013 03:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1385608995!1300006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10036 invoked from network); 28 Nov 2013 03:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCA-0007sv-Ut for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsCA-0003eX-Sq for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:14 +0000 Date: Thu, 28 Nov 2013 03:23:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/crash: disable the watchdog NMIs on the crashing cpu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 094900d20337861a1293f9add391c248889b746a Author: David Vrabel AuthorDate: Wed Nov 27 10:02:17 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:02:17 2013 +0100 x86/crash: disable the watchdog NMIs on the crashing cpu nmi_shootdown_cpus() is called during a crash to park all the other CPUs. This changes the NMI trap handlers which means there's no point in having the watchdog still running. This also disables the watchdog before executing any crash kexec image and prevents the image from receiving unexpected NMIs. Signed-off-by: David Vrabel PVOps Linux as a kexec image shoots itself in the foot otherwise. On a Core2 system, Linux declares a firmware bug and tries to invert some bits in the performance counter register. It ends up setting the number of retired instructions to generate another NMI to fewer instructions than the NMI interrupt path itself, and ceases to make any useful progress. The call to disable_lapic_nmi_watchdog() must be this late into the kexec path to be sure that this cpu is the one which will execute the kexec image. Otherwise there are race conditions where the NMIs might be disabled on the wrong cpu, resulting in the kexec image still receiving NMIs. Signed-off-by: Andrew Cooper master commit: 2a16fcd5ba0244fef764886211452acc69c0ed00 master date: 2013-11-22 14:48:12 +0100 --- xen/arch/x86/crash.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/include/asm-x86/apic.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 0a807d1..b692e91 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -117,6 +117,7 @@ static void nmi_shootdown_cpus(void) unsigned long msecs; int i, cpu = smp_processor_id(); + disable_lapic_nmi_watchdog(); local_irq_disable(); crashing_cpu = cpu; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c93812f..861a014 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -165,7 +165,7 @@ static void nmi_timer_fn(void *unused) set_timer(&this_cpu(nmi_timer), NOW() + MILLISECS(1000)); } -static void disable_lapic_nmi_watchdog(void) +void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index dd528fb..43b39ce 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -200,6 +200,7 @@ extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); extern void setup_secondary_APIC_clock (void); extern void setup_apic_nmi_watchdog (void); +extern void disable_lapic_nmi_watchdog(void); extern int reserve_lapic_nmi(void); extern void release_lapic_nmi(void); extern void self_nmi(void); -- 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 Nov 28 03:23:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCO-0003u7-US; Thu, 28 Nov 2013 03:23:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCN-0003ts-R3 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:28 +0000 Received: from [85.158.143.35:61717] by server-2.bemta-4.messagelabs.com id 9A/CB-11386-F27B6925; Thu, 28 Nov 2013 03:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385609005!1674368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15078 invoked from network); 28 Nov 2013 03:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCL-0007t1-5D for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsCL-0003ex-3A for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:25 +0000 Date: Thu, 28 Nov 2013 03:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: fix nonlazy state 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 86e80b6701270f3ac035f81004a77168d3241ffd Author: Liu Jinsong AuthorDate: Wed Nov 27 10:03:38 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:03:38 2013 +0100 x86/xsave: fix nonlazy state handling Nonlazy xstates should be xsaved each time when vcpu_save_fpu. Operation to nonlazy xstates will not trigger #NM exception, so whenever vcpu scheduled in it got restored and whenever scheduled out it should get saved. Currently this bug affects AMD LWP feature, and later Intel MPX feature. With the bugfix both LWP and MPX will work fine. Signed-off-by: Liu Jinsong Furthermore, during restore we also need to set nonlazy_xstate_used according to the incoming accumulated XCR0. Also adjust the changes to i387.c such that there won't be a pointless clts()/stts() pair. Signed-off-by: Jan Beulich master commit: 7d8b5dd98463524686bdee8b973b53c00c232122 master date: 2013-11-25 11:19:04 +0100 --- xen/arch/x86/domctl.c | 2 ++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/i387.c | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9d67c2e..9a92a69 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1166,6 +1166,8 @@ long arch_do_domctl( { v->arch.xcr0 = _xcr0; v->arch.xcr0_accum = _xcr0_accum; + if ( _xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t)); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e54045f..a24c6e0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1073,6 +1073,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; + if ( ctxt->xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, &ctxt->save_area, desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 020a781..82b9c72 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -120,11 +120,22 @@ static inline void fpu_frstor(struct vcpu *v) /*******************************/ /* FPU Save Functions */ /*******************************/ + +static inline uint64_t vcpu_xsave_mask(const struct vcpu *v) +{ + if ( v->fpu_dirtied ) + return v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY; + + return v->arch.nonlazy_xstate_used ? XSTATE_NONLAZY : 0; +} + /* Save x87 extended state */ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; + uint64_t mask = vcpu_xsave_mask(v); + ASSERT(mask); ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, @@ -132,7 +143,7 @@ static inline void fpu_xsave(struct vcpu *v) */ ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); - xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); + xsave(v, mask); ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -263,7 +274,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) */ void vcpu_save_fpu(struct vcpu *v) { - if ( !v->fpu_dirtied ) + if ( !v->fpu_dirtied && !v->arch.nonlazy_xstate_used ) return; ASSERT(!is_idle_vcpu(v)); -- 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 Nov 28 03:23:29 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCO-0003u7-US; Thu, 28 Nov 2013 03:23:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCN-0003ts-R3 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:28 +0000 Received: from [85.158.143.35:61717] by server-2.bemta-4.messagelabs.com id 9A/CB-11386-F27B6925; Thu, 28 Nov 2013 03:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1385609005!1674368!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15078 invoked from network); 28 Nov 2013 03:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 03:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsCL-0007t1-5D for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsCL-0003ex-3A for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:23:25 +0000 Date: Thu, 28 Nov 2013 03:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/xsave: fix nonlazy state 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 86e80b6701270f3ac035f81004a77168d3241ffd Author: Liu Jinsong AuthorDate: Wed Nov 27 10:03:38 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 10:03:38 2013 +0100 x86/xsave: fix nonlazy state handling Nonlazy xstates should be xsaved each time when vcpu_save_fpu. Operation to nonlazy xstates will not trigger #NM exception, so whenever vcpu scheduled in it got restored and whenever scheduled out it should get saved. Currently this bug affects AMD LWP feature, and later Intel MPX feature. With the bugfix both LWP and MPX will work fine. Signed-off-by: Liu Jinsong Furthermore, during restore we also need to set nonlazy_xstate_used according to the incoming accumulated XCR0. Also adjust the changes to i387.c such that there won't be a pointless clts()/stts() pair. Signed-off-by: Jan Beulich master commit: 7d8b5dd98463524686bdee8b973b53c00c232122 master date: 2013-11-25 11:19:04 +0100 --- xen/arch/x86/domctl.c | 2 ++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/i387.c | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9d67c2e..9a92a69 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1166,6 +1166,8 @@ long arch_do_domctl( { v->arch.xcr0 = _xcr0; v->arch.xcr0_accum = _xcr0_accum; + if ( _xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, _xsave_area, evc->size - 2 * sizeof(uint64_t)); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e54045f..a24c6e0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1073,6 +1073,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) v->arch.xcr0 = ctxt->xcr0; v->arch.xcr0_accum = ctxt->xcr0_accum; + if ( ctxt->xcr0_accum & XSTATE_NONLAZY ) + v->arch.nonlazy_xstate_used = 1; memcpy(v->arch.xsave_area, &ctxt->save_area, desc->length - offsetof(struct hvm_hw_cpu_xsave, save_area)); diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 020a781..82b9c72 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -120,11 +120,22 @@ static inline void fpu_frstor(struct vcpu *v) /*******************************/ /* FPU Save Functions */ /*******************************/ + +static inline uint64_t vcpu_xsave_mask(const struct vcpu *v) +{ + if ( v->fpu_dirtied ) + return v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY; + + return v->arch.nonlazy_xstate_used ? XSTATE_NONLAZY : 0; +} + /* Save x87 extended state */ static inline void fpu_xsave(struct vcpu *v) { bool_t ok; + uint64_t mask = vcpu_xsave_mask(v); + ASSERT(mask); ASSERT(v->arch.xsave_area); /* * XCR0 normally represents what guest OS set. In case of Xen itself, @@ -132,7 +143,7 @@ static inline void fpu_xsave(struct vcpu *v) */ ok = set_xcr0(v->arch.xcr0_accum | XSTATE_FP_SSE); ASSERT(ok); - xsave(v, v->arch.nonlazy_xstate_used ? XSTATE_ALL : XSTATE_LAZY); + xsave(v, mask); ok = set_xcr0(v->arch.xcr0 ?: XSTATE_FP_SSE); ASSERT(ok); } @@ -263,7 +274,7 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) */ void vcpu_save_fpu(struct vcpu *v) { - if ( !v->fpu_dirtied ) + if ( !v->fpu_dirtied && !v->arch.nonlazy_xstate_used ) return; ASSERT(!is_idle_vcpu(v)); -- 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 Nov 28 03:44:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:44: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 1VlsWM-0004hI-Ik; Thu, 28 Nov 2013 03:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWL-0004hD-GB for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:05 +0000 Received: from [85.158.143.35:26975] by server-3.bemta-4.messagelabs.com id 0D/6E-32360-40CB6925; Thu, 28 Nov 2013 03:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385610243!1700239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5221 invoked from network); 28 Nov 2013 03:44:04 -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 Nov 2013 03:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWI-000862-Tp for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsWI-0004CK-M8 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:02 +0000 Date: Thu, 28 Nov 2013 03:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d619f1738706224681981b951b5a9cd132adba81 Author: Jan Beulich AuthorDate: Wed Nov 27 09:48:27 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:48:27 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index aa368a6..d5a06fc 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -385,6 +385,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by + * the time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); if ( unlikely(d->is_dying) ) { -- 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 Nov 28 03:44:08 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:44: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 1VlsWM-0004hI-Ik; Thu, 28 Nov 2013 03:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWL-0004hD-GB for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:05 +0000 Received: from [85.158.143.35:26975] by server-3.bemta-4.messagelabs.com id 0D/6E-32360-40CB6925; Thu, 28 Nov 2013 03:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1385610243!1700239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5221 invoked from network); 28 Nov 2013 03:44:04 -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 Nov 2013 03:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWI-000862-Tp for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsWI-0004CK-M8 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:02 +0000 Date: Thu, 28 Nov 2013 03:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d619f1738706224681981b951b5a9cd132adba81 Author: Jan Beulich AuthorDate: Wed Nov 27 09:48:27 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:48:27 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index aa368a6..d5a06fc 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -385,6 +385,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by + * the time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); if ( unlikely(d->is_dying) ) { -- 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 Nov 28 03:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWX-0004i8-La; Thu, 28 Nov 2013 03:44:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWV-0004hz-T2 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:15 +0000 Received: from [85.158.143.35:27248] by server-1.bemta-4.messagelabs.com id 2C/88-02132-F0CB6925; Thu, 28 Nov 2013 03:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385610253!1673630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22424 invoked from network); 28 Nov 2013 03:44:14 -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; 28 Nov 2013 03:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWT-000868-Bn for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsWT-0004Ci-0w for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:13 +0000 Date: Thu, 28 Nov 2013 03:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: only allow ring 0 guest code to make 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 420ff58052d22c6f49fb71949a9989256017caae Author: Jan Beulich AuthorDate: Wed Nov 27 09:49:28 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:49:28 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 f7b3137..28824b7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3292,7 +3292,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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 Nov 28 03:44:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 03:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWX-0004i8-La; Thu, 28 Nov 2013 03:44:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWV-0004hz-T2 for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:15 +0000 Received: from [85.158.143.35:27248] by server-1.bemta-4.messagelabs.com id 2C/88-02132-F0CB6925; Thu, 28 Nov 2013 03:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1385610253!1673630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22424 invoked from network); 28 Nov 2013 03:44:14 -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; 28 Nov 2013 03:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VlsWT-000868-Bn for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1VlsWT-0004Ci-0w for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 03:44:13 +0000 Date: Thu, 28 Nov 2013 03:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: only allow ring 0 guest code to make 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 420ff58052d22c6f49fb71949a9989256017caae Author: Jan Beulich AuthorDate: Wed Nov 27 09:49:28 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:49:28 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 f7b3137..28824b7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3292,7 +3292,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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 Nov 28 08:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 08: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 1Vlwgk-0008EJ-9F; Thu, 28 Nov 2013 08:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgj-0008EE-By for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:05 +0000 Received: from [85.158.143.35:59121] by server-1.bemta-4.messagelabs.com id 83/BC-02132-89AF6925; Thu, 28 Nov 2013 08:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385626263!1747311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15014 invoked from network); 28 Nov 2013 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgh-00037U-0l for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vlwgg-00043Q-TT for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:02 +0000 Date: Thu, 28 Nov 2013 08:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b596d92dbe8504c9c8284c451f3442d8e301af9 Author: Jan Beulich AuthorDate: Wed Nov 27 09:50:43 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:50:43 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9090139..52848ab 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -383,6 +383,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by + * the time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); if ( unlikely(d->is_dying) ) { -- 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 Nov 28 08:11:11 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 08: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 1Vlwgk-0008EJ-9F; Thu, 28 Nov 2013 08:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgj-0008EE-By for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:05 +0000 Received: from [85.158.143.35:59121] by server-1.bemta-4.messagelabs.com id 83/BC-02132-89AF6925; Thu, 28 Nov 2013 08:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1385626263!1747311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15014 invoked from network); 28 Nov 2013 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgh-00037U-0l for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vlwgg-00043Q-TT for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:02 +0000 Date: Thu, 28 Nov 2013 08:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86: restrict XEN_DOMCTL_getmemlist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b596d92dbe8504c9c8284c451f3442d8e301af9 Author: Jan Beulich AuthorDate: Wed Nov 27 09:50:43 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:50:43 2013 +0100 x86: restrict XEN_DOMCTL_getmemlist Coverity ID 1055652 (See the code comment.) This is CVE-2013-4553 / XSA-74. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 19f027cc5daff4a37fd0a28bca2514c721852dd0 master date: 2013-11-27 09:00:41 +0100 --- xen/arch/x86/domctl.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9090139..52848ab 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -383,6 +383,26 @@ long arch_do_domctl( break; } + /* + * XSA-74: This sub-hypercall is broken in several ways: + * - lock order inversion (p2m locks inside page_alloc_lock) + * - no preemption on huge max_pfns input + * - not (re-)checking d->is_dying with page_alloc_lock held + * - not honoring start_pfn input (which libxc also doesn't set) + * Additionally it is rather useless, as the result is stale by + * the time the caller gets to look at it. + * As it only has a single, non-production consumer (xen-mceinj), + * rather than trying to fix it we restrict it for the time being. + */ + if ( /* No nested locks inside copy_to_guest_offset(). */ + paging_mode_external(current->domain) || + /* Arbitrary limit capping processing time. */ + max_pfns > GB(4) / PAGE_SIZE ) + { + ret = -EOPNOTSUPP; + break; + } + spin_lock(&d->page_alloc_lock); if ( unlikely(d->is_dying) ) { -- 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 Nov 28 08:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 08:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgv-0008F1-Bz; Thu, 28 Nov 2013 08:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgu-0008Ep-0R for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:16 +0000 Received: from [85.158.139.211:31551] by server-2.bemta-5.messagelabs.com id 4C/76-29392-3AAF6925; Thu, 28 Nov 2013 08:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1385626273!820497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3566 invoked from network); 28 Nov 2013 08:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 08:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgr-00037X-8J for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vlwgr-00044K-3c for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:13 +0000 Date: Thu, 28 Nov 2013 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: only allow ring 0 guest code to make 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 21c17c15931f1dcb3da5520d8d542e973098297d Author: Jan Beulich AuthorDate: Wed Nov 27 09:52:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:52:08 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 dc24810..9a0a91e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2828,7 +2828,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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 Nov 28 08:11:17 2013 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Nov 2013 08:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgv-0008F1-Bz; Thu, 28 Nov 2013 08:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgu-0008Ep-0R for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:16 +0000 Received: from [85.158.139.211:31551] by server-2.bemta-5.messagelabs.com id 4C/76-29392-3AAF6925; Thu, 28 Nov 2013 08:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1385626273!820497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3566 invoked from network); 28 Nov 2013 08:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Nov 2013 08:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Vlwgr-00037X-8J for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Vlwgr-00044K-3c for xen-changelog@lists.xensource.com; Thu, 28 Nov 2013 08:11:13 +0000 Date: Thu, 28 Nov 2013 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] x86/HVM: only allow ring 0 guest code to make 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 21c17c15931f1dcb3da5520d8d542e973098297d Author: Jan Beulich AuthorDate: Wed Nov 27 09:52:08 2013 +0100 Commit: Jan Beulich CommitDate: Wed Nov 27 09:52:08 2013 +0100 x86/HVM: only allow ring 0 guest code to make hypercalls Anything else would allow for privilege escalation. This is CVE-2013-4554 / XSA-76. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 5c447caaf49192c7b2c057ffbb565ce72aac666d master date: 2013-11-27 09:01:49 +0100 --- 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 dc24810..9a0a91e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2828,7 +2828,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) case 4: case 2: hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( unlikely(sreg.attr.fields.dpl == 3) ) + if ( unlikely(sreg.attr.fields.dpl) ) { default: regs->eax = -EPERM; -- 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